Introduce XAdES 1.4 support for Handy Signatur (TODO: configure ID pattern correctly)

2 files changed, 29 insertions, 0 deletions

diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/signaturelayout/SignatureLayoutHandlerFactory.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/signaturelayout/SignatureLayoutHandlerFactory.java
index 07a7792..283eb85 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/signaturelayout/SignatureLayoutHandlerFactory.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/signaturelayout/SignatureLayoutHandlerFactory.java
@@ -79,6 +79,9 @@ public class SignatureLayoutHandlerFactory {
       if (bkuIdentifier == null) {

          throw new SettingsException(ErrorCode.MISSING_HEADER_SERVER_USER_AGENT, "Unable to determine type of citizen card environment. Response header \"Server\" resp. \"user-agent\" is missing. Refer to security layer specification 1.2.2, section 3.3.2.");

       }

+      

+      log.debug("Trying to get SignatureLayoutHandler for \"" + bkuIdentifier + "\".");

+      

       SignatureLayoutHandler signatureLayoutHandler = (SignatureLayoutHandler) instances.get(bkuIdentifier);

       

       if (signatureLayoutHandler == null) {

@@ -127,6 +130,8 @@ public class SignatureLayoutHandlerFactory {
          log.debug("SignatureLayoutHandler successfully instantiated.");

          instances.put(bkuIdentifier, signatureLayoutHandler);

       } else {

+    	 log.debug("SignatureLayoutHandler has already been instantiated. Class: \"" + 

+    			 signatureLayoutHandler.getClass().getName() + "\"");

          log.trace("SignatureLayoutHandler has already been instantiated. Returning old instance.");

       }

       

diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/signaturelayout/atrust/ATrustXades14SignatureLayoutHandler.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/signaturelayout/atrust/ATrustXades14SignatureLayoutHandler.java
new file mode 100644
index 0000000..2184a5c
--- /dev/null
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/signaturelayout/atrust/ATrustXades14SignatureLayoutHandler.java
@@ -0,0 +1,24 @@
+package at.knowcenter.wag.egov.egiz.sig.signaturelayout.atrust;
+
+import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;
+import at.knowcenter.wag.egov.egiz.sig.connectors.ConnectorEnvironment;
+import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject;
+import at.knowcenter.wag.egov.egiz.sig.connectors.moa.MOAHelper;
+import at.knowcenter.wag.egov.egiz.sig.connectors.mocca.MOCCAHelper;
+import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedMOCIdFormatter;
+import at.knowcenter.wag.egov.egiz.sig.sigid.SimpleIdFormatter;
+import at.knowcenter.wag.egov.egiz.sig.signaturelayout.SignatureLayoutHandler;
+
+public class ATrustXades14SignatureLayoutHandler implements
+		SignatureLayoutHandler {
+
+	public static final String ETSI_BKA_ATRUST_1_2 = "etsi-bka-atrust-1.2";
+
+	public SignSignatureObject parseCreateXMLSignatureResponse(
+			String xmlResponse, ConnectorEnvironment env)
+			throws ConnectorException {
+		return MOCCAHelper.parseCreateXMLResponse(xmlResponse,
+				new DetachedMOCIdFormatter(ETSI_BKA_ATRUST_1_2), env);
+	}
+
+}