Web-Application: Configuration may be declared via system property "pdf-as.work-dir" or via Servlet-Init-Parameter "work-dir".

Bug fixed in RetrieveSignatureDataServlet: Response header didn't contain a content length attribute. The ITS Mac BKU rejects those requests.
Workaround for ITS Mac BKU integrated. A redirect via response does only work if the response contains a valid SL request (e.g. a NullOperationRequest).
API: The configuration folder may be omitted at instantiating the api. Configuration may be set via system property "pdf-as.work-dir". If no configuration is given at all, the current user's home directory is searched for a folder "PDF-AS". If not found a default configuration is created.
If the configuration is explicitely given than the temporary folder is located within the given directory otherwise within the user's temporary directory.
Declaring the configuration folder, replacements for system properties like "${catalina.base}/conf/pdfas" may be used.
Web-Application: Session is now being invalidated after download of the signed pdf file.
Web-Application: Every hardcoded context "pdf-as" has been replaced.


git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@277 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

3 files changed, 66 insertions, 3 deletions

diff --git a/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java b/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java
index 5752838..93c0aa2 100644
--- a/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java
+++ b/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java
@@ -3,7 +3,6 @@
  */

 package at.gv.egiz.pdfas.web.helper;

 

-import javax.servlet.ServletException;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpSession;

 

diff --git a/src/main/java/at/gv/egiz/pdfas/web/helper/SignServletHelper.java b/src/main/java/at/gv/egiz/pdfas/web/helper/SignServletHelper.java
index 5dbc8b6..341b97c 100644
--- a/src/main/java/at/gv/egiz/pdfas/web/helper/SignServletHelper.java
+++ b/src/main/java/at/gv/egiz/pdfas/web/helper/SignServletHelper.java
@@ -129,7 +129,7 @@ public class SignServletHelper
     

     // TODO TR: Web-Applikation verwendet in Loc-Ref-Variante ext. Referenz, um performanter zu sein;

     // nachfolend auskommentieren, wenn anstatt SwA-Connector LocRef-Connector verwendet wird

-    URL signature_data_URL = new URL(request.getScheme(), host, request.getServerPort(), request.getContextPath() + "/RetrieveSignatureData");

+    URL signature_data_URL = new URL(LocalRequestHelper.getLocalContextAddress(request, response) + "/RetrieveSignatureData");

     String signature_data_url = response.encodeURL(signature_data_URL.toString());

 

     Connector c = ConnectorChooser.chooseWebConnectorForSign(si.connector, si.type, signature_data_url);

diff --git a/src/main/java/at/gv/egiz/pdfas/web/helper/TempDirHelper.java b/src/main/java/at/gv/egiz/pdfas/web/helper/TempDirHelper.java
index e3f10ed..e7ce3ac 100644
--- a/src/main/java/at/gv/egiz/pdfas/web/helper/TempDirHelper.java
+++ b/src/main/java/at/gv/egiz/pdfas/web/helper/TempDirHelper.java
@@ -48,6 +48,69 @@ public class TempDirHelper
 

   protected static long runningIndex = 0;

 

+  /**

+   * Assembles the File of the temporary directory without checking if it really

+   * exists.

+   */

+  public static File assembleTemporaryDirectoryFile()

+  {

+    File temp_dir = new File(SettingsReader.TMP_PATH);

+    return temp_dir;

+  }

+

+  /**

+   * Returns the directory where temporary files should be stored.

+   * 

+   * <p>

+   * If the directory doesn't exist, it is created.

+   * </p>

+   * 

+   * @return Returns the directory where temporary files should be stored.

+   */

+  public static File getTemporaryDirectory()

+  {

+    File temp_dir = assembleTemporaryDirectoryFile();

+    if (!temp_dir.exists())

+    {

+      temp_dir.mkdirs();

+    }

+    return temp_dir;

+  }

+

+  /**

+   * Deletes all files in the temporary directory, if it exists.

+   * 

+   * <p>

+   * This should be used to clear temporary files when the application shuts

+   * down.

+   * </p>

+   */

+  public static void clearTemporaryDirectory()

+  {

+    File temp_dir = assembleTemporaryDirectoryFile();

+    log.debug("Clearing temporary directory: " + temp_dir);

+

+    if (!temp_dir.exists())

+    {

+      return;

+    }

+

+    File[] files = temp_dir.listFiles();

+    for (int i = 0; i < files.length; i++)

+    {

+       // added by tknall: do not try to remove svn-metadata

+       if (files[i].getName().endsWith(".svn")) {

+          continue;

+       }

+       log.debug("  Clearing temporary file: " + files[i]);

+      boolean delete_success = files[i].delete();

+      if (!delete_success)

+      {

+         log.error("Couldn't delete the temporary file: " + files[i]);

+      }

+    }

+  }

+  

   public static void storeTextSignatureHoldersIfApplicable(List shs, String fileNameSuffix) throws IOException

   {

     Iterator it = shs.iterator();

@@ -166,7 +229,8 @@ public class TempDirHelper
   

   protected static File getFileInTempDir (String fileName)

   {

-    File tempDir = new File(new File(SettingsReader.RESOURCES_PATH), "pdfastmp");

+//     File tempDir = new File(new File(SettingsReader.RESOURCES_PATH), "pdfastmp");

+    File tempDir = assembleTemporaryDirectoryFile();

 

     File tmpFile = new File(tempDir, fileName);