From e7a9d05e6813d8c4d16e3d7af2d6126070cdb58a Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 22 Dec 2016 16:37:11 +0000 Subject: [PATCH] Removed is session expired from external servlet git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@141388 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/DownloadFolderServlet.java | 23 +++++++++---------- .../workspace/server/DownloadServlet.java | 7 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/DownloadFolderServlet.java b/src/main/java/org/gcube/portlets/user/workspace/server/DownloadFolderServlet.java index 5611460..2271c67 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/DownloadFolderServlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/DownloadFolderServlet.java @@ -18,9 +18,7 @@ import org.apache.commons.io.IOUtils; import org.apache.log4j.Logger; import org.gcube.portlets.user.workspace.client.ConstantsExplorer; import org.gcube.portlets.user.workspace.server.property.PortalUrlGroupGatewayProperty; -import org.gcube.portlets.user.workspace.server.util.WsUtil; import org.gcube.portlets.user.workspace.shared.HandlerResultMessage; -import org.gcube.portlets.user.workspace.shared.SessionExpiredException; /** * @author M. Assante, CNR-ISTI @@ -43,16 +41,17 @@ public class DownloadFolderServlet extends HttpServlet{ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { boolean urlRedirectOnError = req.getParameter(ConstantsExplorer.REDIRECTONERROR)==null?false:req.getParameter(ConstantsExplorer.REDIRECTONERROR).equals("true"); - try { - if(WsUtil.isSessionExpired(req)) - throw new SessionExpiredException(); - } catch (Exception e) { - - if (e instanceof SessionExpiredException){ - sendErrorForStatus(resp, HttpServletResponse.SC_UNAUTHORIZED +": Session expired", HttpServletResponse.SC_UNAUTHORIZED); - return; - } - } + //REMOVED BECAUSE IT DOES NOT WORK. MUST BE CHECK USERID AND CONTEXTID +// try { +// if(WsUtil.isSessionExpired(req)) +// throw new SessionExpiredException(); +// } catch (Exception e) { +// +// if (e instanceof SessionExpiredException){ +// sendErrorForStatus(resp, HttpServletResponse.SC_UNAUTHORIZED +": Session expired", HttpServletResponse.SC_UNAUTHORIZED); +// return; +// } +// } String fileRelativePath = req.getParameter("filepath"); String tmpDir = System.getProperty("java.io.tmpdir"); diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java b/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java index eacde35..de2b2ab 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java @@ -85,9 +85,10 @@ public class DownloadServlet extends HttpServlet{ logger.debug("FILE DOWNLOAD REQUEST "+itemId); Workspace wa = null; try { - //ADDED 13-01-2014 SESSION VALIDATION - if(WsUtil.isSessionExpired(req)) - throw new SessionExpiredException(); + //REMOVED BECAUSE IT DOES NOT WORK. MUST BE CHECK USERID AND CONTEXTID +// //ADDED 13-01-2014 SESSION VALIDATION +// if(WsUtil.isSessionExpired(req)) +// throw new SessionExpiredException(); wa = WsUtil.getWorkspace(req, contextID, userID); } catch (Exception e) {