Merge remote-tracking branch 'remotes/origin/ap' into moa2_0_tlenz_bs_3_ar

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java

6 files changed, 21 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 288e71f58..2056ddf08 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
@@ -117,7 +117,7 @@ public class AttributeCollector implements IAction {
         IPersonalAttributeList responseAttributeList = container.getResponse().getPersonalAttributeList();
         List<PersonalAttribute> missingAttributes = new ArrayList<PersonalAttribute>();
         for (PersonalAttribute current : requestAttributeList)
-            if (!responseAttributeList.containsKey(current))
+            if (!responseAttributeList.containsKey(current.getName()))
                 missingAttributes.add(current);
 
         // Try to get all missing attributes
@@ -165,7 +165,9 @@ public class AttributeCollector implements IAction {
                 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);
+                e.getAp().performRedirect(AuthConfigurationProvider.getInstance().getPublicURLPrefix() + "/dispatcher?mod=id_stork2&action=AttributeCollector&" + ARTIFACT_ID + "=" + newArtifactId, container.getRequest().getCitizenCountryCode(), request, response, oaParam);
+
+
 
 
             } catch (Exception e1) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
index 23edf69f9..97bb6f480 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
@@ -19,6 +19,7 @@ public class AttributeProviderFactory {
 		List<String> result = new ArrayList<String>();
 		result.add("StorkAttributeRequestProvider");
 		result.add("EHvdAttributeProvider");
+		result.add("SignedDocAttributeRequestProvider");
 
 		return result;
 	}
@@ -36,7 +37,9 @@ public class AttributeProviderFactory {
 			return new StorkAttributeRequestProvider(url);
 		} else if(shortname.equals("EHvdAttributeProvider")) {
 			return new EHvdAttributeProviderPlugin(url);
-		}       else {
+		} else if(shortname.equals("SignedDocAttributeRequestProvider")) {
+			return new SignedDocAttributeRequestProvider(url);
+		}  else {
 			return null;
 		}
 	}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKAuthnRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKAuthnRequest.java
index cee64e16e..8c9e288e3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKAuthnRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKAuthnRequest.java
@@ -1,5 +1,7 @@
 package at.gv.egovernment.moa.id.protocols.stork2;
 
+import java.io.Serializable;
+
 import at.gv.egovernment.moa.id.moduls.IRequest;
 import eu.stork.peps.auth.commons.STORKAuthnRequest;
 import org.opensaml.common.xml.SAMLConstants;
@@ -9,8 +11,11 @@ import org.opensaml.common.xml.SAMLConstants;
  *         Date: 12/4/13, Time: 6:31 PM
  */
 
-public class MOASTORKAuthnRequest implements IRequest {
-    private String requestID;
+public class MOASTORKAuthnRequest implements IRequest, Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	
+	private String requestID;
     private String target = null;
     String module = null;
     String action = null;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
index 502925a2a..34f953514 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
@@ -135,7 +135,7 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
         }
 
         //Get SAMLEngine instance
-        STORKSAMLEngine engine = STORKSAMLEngine.getInstance("incoming");
+        STORKSAMLEngine engine = STORKSAMLEngine.getInstance("VIDP");
 
         STORKAuthnRequest authnRequest = null;
         Logger.error("decsamltoken" +decSamlToken.toString());
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/SignedDocAttributeRequestProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/SignedDocAttributeRequestProvider.java
index e7cd87e85..6a8e306a1 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/SignedDocAttributeRequestProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/SignedDocAttributeRequestProvider.java
@@ -61,6 +61,10 @@ public class SignedDocAttributeRequestProvider implements AttributeProvider {
 	 */
 	public IPersonalAttributeList acquire(PersonalAttribute attribute, AuthenticationSession moasession) throws UnsupportedAttributeException,
 			ExternalAttributeRequestRequiredException {
+		if(!attribute.getName().equals("signedDoc")){
+			throw new UnsupportedAttributeException();
+		}
+		
 		requestedAttribute = attribute;
 
 		throw new ExternalAttributeRequestRequiredException(this);
@@ -114,6 +118,7 @@ public class SignedDocAttributeRequestProvider implements AttributeProvider {
 			Template template = velocityEngine.getTemplate("/resources/templates/oasis_dss_webform_binding.vm");
 			VelocityContext context = new VelocityContext();
 			context.put("signrequest", Base64.encodeBase64String(requestedAttribute.getValue().get(0).getBytes("UTF8")));
+			context.put("clienturl", url);
 			context.put("action", oasisDssWebFormURL);
 
 			StringWriter writer = new StringWriter();
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
index e485827c8..da6a8ab27 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
@@ -50,13 +50,11 @@ public class CustomAttributeQueryImpl extends SubjectQueryImpl implements Custom
         return Collections.unmodifiableList(children);

     }

 

-	@Override

 	public String getAssertionConsumerServiceURL() {

 		// TODO Auto-generated method stub

 		return this.serviceURL;

 	}

 

-	@Override

 	public void setAssertionConsumerServiceURL(String newServiceUrl) {

 		// TODO Auto-generated method stub

 		this.serviceURL = newServiceUrl;