attribute collector

2 files changed, 24 insertions, 8 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
index bc5a0c0c6..57c68e94c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
@@ -69,6 +69,7 @@ public class AttributeCollector implements IAction {
             } catch (UnsupportedAttributeException e1) {
                 // the current provider cannot find anything familiar within the
                 // provided httpreq. Try the next one.
+                // TODO check the loop
             }
 
         if (null == newAttributes) {
@@ -89,6 +90,8 @@ public class AttributeCollector implements IAction {
             throw new MOAIDException("stork.11", null);
         }
 
+
+
         // - insert the embedded attribute(s) into the container
         for (PersonalAttribute current : newAttributes)
             container.getResponse().getPersonalAttributeList().add(current);
@@ -117,6 +120,7 @@ public class AttributeCollector implements IAction {
             if (!responseAttributeList.containsKey(current))
                 missingAttributes.add(current);
 
+        // Try to get all missing attributes
         try {
             // for each attribute still missing
             for (PersonalAttribute currentAttribute : missingAttributes) {
@@ -138,6 +142,16 @@ public class AttributeCollector implements IAction {
 
                 }
             }
+
+            // build response
+            generateSTORKResponse();
+
+            // set new http response
+            generateRedirectResponse();
+            response = httpResp;
+
+            return "12345"; // AssertionId
+
         } catch (ExternalAttributeRequestRequiredException e) {
             // the attribute request is ongoing and requires an external service.
             try {
@@ -145,6 +159,13 @@ public class AttributeCollector implements IAction {
                 // - generate new key
                 String newArtifactId = new SecureRandomIdentifierGenerator()
                         .generateIdentifier();
+                // - put container in temporary store.
+                AssertionStorage.getInstance().put(newArtifactId, container);
+
+                // add container-key to redirect embedded within the return URL
+                e.getAp().performRedirect(AuthConfigurationProvider.getInstance().getPublicURLPrefix() + "?" + ARTIFACT_ID + "=" + newArtifactId, container.getRequest().getCitizenCountryCode(), request, response, oaParam);
+
+
             } catch (Exception e1) {
                 // TODO should we return the response as is to the PEPS?
                 Logger.error("Error putting incomplete Stork response into temporary storage", e);
@@ -154,14 +175,7 @@ public class AttributeCollector implements IAction {
             return "12345"; // TODO what to do here?
         }
 
-        // build response
-        generateSTORKResponse();
-
-        // set new http response
-        generateRedirectResponse();
-        response = httpResp;
 
-        return "12345"; // AssertionId
     }
 
 
@@ -171,7 +185,7 @@ public class AttributeCollector implements IAction {
 
         try {
             //Get SAMLEngine instance
-            STORKSAMLEngine engine = STORKSAMLEngine.getInstance("vidp");
+            STORKSAMLEngine engine = STORKSAMLEngine.getInstance("VIDP");
             Logger.debug("Starting generation of SAML response");
             authnResponse = engine.generateSTORKAuthnResponse(authnRequest, authnResponse, container.getRemoteAddress(), false);
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
index b3f009ae2..d4996c26a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
@@ -105,6 +105,8 @@ public class AuthenticationRequest implements IAction {
         // - memorize the target url were we have to return the result
         container.setTarget(((MOASTORKAuthnRequest) req).getStorkAuthnRequest().getAssertionConsumerServiceURL());
 
+        container.setRemoteAddress(httpReq.getRemoteAddr());
+
 
         Logger.debug("Data container prepared");