Serious bug solved. Method storeCertificate tried to fetch a certificate from store before storing it. If not found (within the store resp. via ldap) the certificate was not stored.

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

3 files changed, 67 insertions, 3 deletions

diff --git a/src/main/java/at/gv/egiz/pdfas/commandline/Main.java b/src/main/java/at/gv/egiz/pdfas/commandline/Main.java
index dea19b6..8330238 100644
--- a/src/main/java/at/gv/egiz/pdfas/commandline/Main.java
+++ b/src/main/java/at/gv/egiz/pdfas/commandline/Main.java
@@ -28,7 +28,6 @@ import java.util.List;
 

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

-import org.apache.log4j.PropertyConfigurator;

 

 import at.gv.egiz.pdfas.PdfAsFactory;

 import at.gv.egiz.pdfas.api.PdfAs;

@@ -192,7 +191,7 @@ public abstract class Main
      }

 

     SettingsReader.initializeForCommandLine();

-    PropertyConfigurator.configure(SettingsReader.CONFIG_PATH + "log4j.properties");

+    ConfigUtils.initializeLogger();

 

     // printUsage(System.out);

 

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
index 0450a50..635ef89 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
@@ -46,6 +46,7 @@ import at.gv.egiz.pdfas.impl.api.sign.SignResultImpl;
 import at.gv.egiz.pdfas.impl.api.verify.VerifyResultAdapter;

 import at.gv.egiz.pdfas.impl.api.verify.VerifyResultsImpl;

 import at.gv.egiz.pdfas.impl.vfilter.VerificationFilterParametersImpl;

+import at.gv.egiz.pdfas.utils.ConfigUtils;

 import at.knowcenter.wag.egov.egiz.PdfAS;

 import at.knowcenter.wag.egov.egiz.PdfASID;

 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

@@ -106,7 +107,7 @@ public class PdfAsObject implements PdfAs
    */

   public void reloadConfig() throws PdfAsException

   {

-     PropertyConfigurator.configure(SettingsReader.CONFIG_PATH + "log4j.properties");

+     ConfigUtils.initializeLogger();

     SettingsReader.createInstance();

     SignatureTypes.createInstance();

   }

diff --git a/src/main/java/at/gv/egiz/pdfas/utils/ConfigUtils.java b/src/main/java/at/gv/egiz/pdfas/utils/ConfigUtils.java
index 0e606d7..627e611 100644
--- a/src/main/java/at/gv/egiz/pdfas/utils/ConfigUtils.java
+++ b/src/main/java/at/gv/egiz/pdfas/utils/ConfigUtils.java
@@ -9,11 +9,16 @@ import java.io.OutputStream;
 import java.util.zip.ZipEntry;

 import java.util.zip.ZipInputStream;

 

+import org.apache.commons.lang.StringUtils;

+import org.apache.commons.lang.SystemUtils;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

+import org.apache.log4j.PropertyConfigurator;

 

 import at.gv.egiz.pdfas.api.commons.Constants;

 import at.gv.egiz.pdfas.api.exceptions.ConfigUtilsException;

+import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

+import at.knowcenter.wag.egov.egiz.pdf.Utils;

 

 /**

  * @author <a href="mailto:thomas.knall@egiz.gv.at">Thomas Knall</a>

@@ -179,4 +184,63 @@ public final class ConfigUtils {
       outputStream.flush();

    }

    

+   public static String assertFileSeparator(String path) {

+      if (path == null) {

+         throw new NullPointerException("Path must not be null.");

+      }

+      if (path.endsWith(File.separator) || path.endsWith("/") || path.endsWith("\\")) {

+         return path;

+      } else {

+         return (path + File.separator);

+      }

+   }

+   

+   public static void initializeLogger() {

+      String loggerConfiguration = System.getProperty("log4j.configuration"); 

+      if (loggerConfiguration != null) {

+         logger_.info("No PDF-AS logger configured because a configuration has already been set via system property \"log4j.configuration\" (=\"" + loggerConfiguration + "\").");

+         return;

+      }

+      loggerConfiguration = assertFileSeparator(SettingsReader.CONFIG_PATH) + "log4j.properties";

+      File loggerConfigFile = new File(loggerConfiguration);

+      if (!loggerConfigFile.exists()) {

+         logger_.info("No PDF-AS logger configured because there is no log4j.properties within the pdf-as work dir. Maybe the logger configuration is handled by an outside application (e.g. a web aplication).");

+         return;

+      }

+      logger_.info("Initializing PDF-AS logger (configuration = \"" + loggerConfiguration + "\").");

+      PropertyConfigurator.configure(loggerConfiguration);

+   }

+   

+   public static void printConfigInfo(Log logger) {

+      int length = Utils.max(new int[] { SettingsReader.RESOURCES_PATH.length(), SettingsReader.TMP_PATH.length(), SettingsReader.CONFIG_PATH.length(), SettingsReader.CERT_PATH.length() });

+      

+      String separator = StringUtils.repeat("*", length + 25);

+      String infoResources     = " resources path     = \"" + SettingsReader.RESOURCES_PATH + "\"";

+      String infoConfiguration = " configuration path = \"" + SettingsReader.CONFIG_PATH + "\"";

+      String infoCertStore     = " certstore path     = \"" + SettingsReader.CERT_PATH + "\"";

+      String infoTempPath      = " temporary path     = \"" + SettingsReader.TMP_PATH + "\"";

+ 

+      if (logger != null) {

+         logger.info(separator);

+         logger.info(infoResources);

+         logger.info(infoConfiguration);

+         logger.info(infoCertStore);

+         logger.info(infoTempPath);

+         logger.info(separator);

+      } else {

+         StringBuffer buffer = new StringBuffer();

+         buffer.append(separator).append(SystemUtils.LINE_SEPARATOR);

+         buffer.append(infoResources).append(SystemUtils.LINE_SEPARATOR);

+         buffer.append(infoConfiguration).append(SystemUtils.LINE_SEPARATOR);

+         buffer.append(infoCertStore).append(SystemUtils.LINE_SEPARATOR);

+         buffer.append(infoTempPath).append(SystemUtils.LINE_SEPARATOR);

+         buffer.append(separator);

+         System.out.println(buffer.toString());

+      }

+   }

+   

+   public static void printConfigInfo() {

+      printConfigInfo(null);

+   }

+   

 }