detached connectors

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

1 files changed, 9 insertions, 2 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
index 7d7220c..72f7c2d 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
@@ -25,7 +25,9 @@ import at.knowcenter.wag.egov.egiz.PdfASID;
 import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;

 import at.knowcenter.wag.egov.egiz.framework.Signator;

 import at.knowcenter.wag.egov.egiz.framework.SignatorFactory;

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

 import at.knowcenter.wag.egov.egiz.sig.SignatureResponse;

+import at.knowcenter.wag.egov.egiz.sig.connectors.ConnectorChooser;

 import at.knowcenter.wag.egov.egiz.sig.connectors.LocalConnector;

 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.BKUPostConnection;

 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.EnvelopedBase64BKUConnector;

@@ -152,7 +154,7 @@ public class DataURLServlet extends HttpServlet
           

           if (si.sign_result == null)

           {

-            LocalConnector c = new LocRefDetachedBKUConnector(si.type, "loc ref content not needed here"); //$NON-NLS-1$

+            LocalConnector c = ConnectorChooser.chooseLocalConnectorForSign(si.connector, si.type, "loc ref content not needed here"); //$NON-NLS-1$

 

             si.iui.signed_signature_object = c.analyzeSignResponse(si.response_properties[0]);

 

@@ -172,7 +174,12 @@ public class DataURLServlet extends HttpServlet
 

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

           {

-            LocalConnector c = new LocRefDetachedBKUConnector(si.type, "loc ref content not needed here"); //$NON-NLS-1$

+            SignatureHolder sh = (SignatureHolder) si.signature_holders.get(i);

+            

+            PdfASID sig_kz = sh.getSignatureObject().getKZ();

+            String sig_id = sh.getSignatureObject().getSignationIds();

+            

+            LocalConnector c = ConnectorChooser.chooseLocalConnectorForVerify(si.connector, sig_kz, sig_id, si.type, "loc ref content not needed here"); //$NON-NLS-1$

 

             SignatureResponse sig_resp = c.analyzeVerifyResponse(si.response_properties[i]);

             results.add(sig_resp);