A lot of moa sig stuff

1 files changed, 63 insertions, 7 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
index 6bc6f0b..3c7bf6a 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
@@ -31,6 +31,7 @@ import iaik.pki.revocation.RevocationSourceTypes;
 import iaik.server.modules.xml.BlackListEntry;
 import iaik.server.modules.xml.ExternalReferenceChecker;
 import iaik.server.modules.xml.WhiteListEntry;
+import iaik.util.logging.Log;
 import iaik.utils.RFC2253NameParser;
 import iaik.utils.RFC2253NameParserException;
 import iaik.xml.crypto.utils.URI;
@@ -62,16 +63,16 @@ import org.w3c.dom.Element;
 import org.w3c.dom.traversal.NodeIterator;
 import org.xml.sax.SAXException;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.api.common.TSLConfiguration;
 import at.gv.egovernment.moa.spss.api.impl.TSLConfigurationImpl;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.StringUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.FileUtils;
+import at.gv.egovernment.moaspss.util.StringUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * A class that builds configuration data from a DOM based representation.
@@ -259,6 +260,16 @@ public class ConfigurationPartsBuilder {
 	    ROOT + CONF + "SignatureVerification/" 
 	    + CONF + "PermitFileURIs";
   
+  private static final String CONNECTION_TIMEOUT_XPATH_ =
+		    ROOT + CONF + "SignatureVerification/" 
+		    + CONF + "CertificateValidation/"
+		    + CONF + "ConnectionTimeout";
+		    
+  private static final String READ_TIMEOUT_XPATH_ =
+    ROOT + CONF + "SignatureVerification/" 
+    + CONF + "CertificateValidation/"
+    + CONF + "ReadTimeout";
+  
   private static final String TSL_CONFIGURATION_XPATH = 
 	  ROOT + CONF + "SignatureVerification/"
 	  + CONF + "CertificateValidation/" 
@@ -408,6 +419,51 @@ public class ConfigurationPartsBuilder {
     return pdfasConfiguration;
   }
   
+  /**
+   * Returns the digest method algorithm name.
+   * 
+   * @return The digest method algorithm name from the configuration.
+   */
+  public int getConnectionTimeout() 
+  {
+    String connectionTimeout = getElementValue(getConfigElem(), CONNECTION_TIMEOUT_XPATH_, "30");
+    int defaultConnectionTimeout = 30;
+    
+    if(connectionTimeout != null) {
+    	try {
+    		defaultConnectionTimeout = Integer.parseInt(connectionTimeout);
+    	} catch(NumberFormatException e) {
+    		Log.warn("Configuration value " + CONNECTION_TIMEOUT_XPATH_ + " should be a number defaulting to 30");
+    	}
+    }
+    
+    if(defaultConnectionTimeout < 0) {
+    	defaultConnectionTimeout = 30;
+    }
+    
+    return defaultConnectionTimeout;
+  }
+  
+  public int getReadTimeout() 
+  {
+    String connectionTimeout = getElementValue(getConfigElem(), READ_TIMEOUT_XPATH_, "30");
+    int defaultConnectionTimeout = 30;
+    
+    if(connectionTimeout != null) {
+    	try {
+    		defaultConnectionTimeout = Integer.parseInt(connectionTimeout);
+    	} catch(NumberFormatException e) {
+    		Log.warn("Configuration value " + READ_TIMEOUT_XPATH_ + " should be a number defaulting to 30");
+    	}
+    }
+    
+    if(defaultConnectionTimeout < 0) {
+    	defaultConnectionTimeout = 30;
+    }
+    
+    return defaultConnectionTimeout;
+  }
+  
   public boolean getAdesFormResult()
   {
 	  String enableArchiving = getElementValue(getConfigElem(), FORMRESULT_CONFIGURATION_XPATH, null);