1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
index 723bc90..8fac221 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
@@ -32,6 +32,7 @@ import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;
 import at.knowcenter.wag.egov.egiz.exceptions.SignatureException;
 import at.knowcenter.wag.egov.egiz.pdf.SignatureHolder;
 import at.knowcenter.wag.egov.egiz.sig.ConnectorFactory;
+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.SignatureData;
 import at.knowcenter.wag.egov.egiz.sig.SignatureDataImpl;
@@ -79,7 +80,7 @@ public abstract class LocalRequestHelper
     URL loc_ref_URL = new URL(request.getScheme(), host, request.getServerPort(), request.getContextPath() + "/RetrieveSignatureData");
     String loc_ref_url = response.encodeURL(loc_ref_URL.toString());
 
-    LocalConnector c = new LocRefDetachedBKUConnector(si.type, loc_ref_url);
+    LocalConnector c = ConnectorChooser.chooseLocalConnectorForSign(si.connector, si.type, loc_ref_url);
     String sign_request = c.prepareSignRequest(si.iui.signature_data);
 
     // TODO local URL
@@ -169,8 +170,6 @@ public abstract class LocalRequestHelper
     URL loc_ref_URL = new URL(request.getScheme(), host, request.getServerPort(), request.getContextPath() + "/RetrieveSignatureData");
     String loc_ref_url = response.encodeURL(loc_ref_URL.toString());
 
-    LocalConnector local_conn = new LocRefDetachedBKUConnector(si.type, loc_ref_url);
-
     for (int i = 0; i < si.requests.length; i++)
     {
       SignatureHolder holder = (SignatureHolder) holders_to_verify.get(i);
@@ -197,8 +196,9 @@ public abstract class LocalRequestHelper
       so.issuer = s.getSignationIssuer();
       so.x509Certificate = s.getX509Cert().getX509Certificate();
       so.id = s.getSignationIds();
-      so.kz = s.getKZ().toString();
+      so.kz = s.getKZ() == null ? null : s.getKZ().toString();
 
+      LocalConnector local_conn = ConnectorChooser.chooseLocalConnectorForVerify(si.connector, s.getKZ(), so.id, si.type, loc_ref_url);
       String request_string = local_conn.prepareVerifyRequest(sd, so);
 
       LocalRequest local_request = new LocalRequest("not-needed", request_string);
@@ -206,6 +206,7 @@ public abstract class LocalRequestHelper
       si.response_properties[i] = null;
     }
 
+    // TODO read from config
     String local_request_url = "http://127.0.0.1:3495/http-security-layer-request";
 
     URL data_URL = new URL(request.getScheme(), host, request.getServerPort(), request.getContextPath() + "/DataURL");