Merge first STORK 2 changes

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java
	pom.xml

2 files changed, 17 insertions, 11 deletions

diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java
index d9188d4fc..7a98abaff 100644
--- a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java
+++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java
@@ -342,7 +342,7 @@ public class PepsConnectorHandleResponseWithoutSignatureTask extends AbstractPep
 

 			// FIXME: Same here; we do not have the citizen's signature, so this code might be regarded as dead code.

 			try {

-				SZRGInsertion(moaSession, authnResponse.getPersonalAttributeList(), authnResponse.getAssertions()

+				SZRGInsertion(moaSession, attributeList, authnResponse.getAssertions()

 						.get(0).getAuthnStatements().get(0).getAuthnContext().getAuthnContextClassRef()

 						.getAuthnContextClassRef(), citizenSignature);

 			} catch (STORKException e) {

diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java
index 4a12e72ca..9bbd7e46f 100644
--- a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java
+++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java
@@ -297,14 +297,20 @@ public class PepsConnectorTask extends AbstractAuthServletTask {
 			

 			Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID);

 

-

-			// first, try to fetch the attributes from the list of total attributes. Note that this very list is only filled

-			// with ALL attributes when there is more than one assertion in the SAML2 STORK message.  

-			IPersonalAttributeList attributeList = authnResponse.getTotalPersonalAttributeList();

-

-			// if the list is empty, there was just one assertion... probably

-			if(attributeList.isEmpty())

-				attributeList = authnResponse.getPersonalAttributeList();

+			// fetch attribute list from response

+			IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList();

+			if(authnResponse.getAssertions().size() > 1) {

+				for(IPersonalAttributeList currentList : authnResponse.getPersonalAttributeLists()) {

+					for(PersonalAttribute currentAttribute : currentList.values()) {

+						if(!attributeList.containsKey(currentAttribute.getName()))

+							attributeList.add((PersonalAttribute) currentAttribute.clone());

+						else {

+							if(!attributeList.get(currentAttribute.getName()).getValue().equals(currentAttribute.getValue()))

+								throw new TaskExecutionException("data integrity failure", new Exception("data integrity failure: found non-matching values in multiple attributes of type " + currentAttribute.getName()));

+						}

+					}

+				}

+			}

 

 			// //////////// incorporate gender from parameters if not in stork response

 

@@ -505,7 +511,7 @@ public class PepsConnectorTask extends AbstractAuthServletTask {
 					Logger.debug("Starting connecting SZR Gateway");

 				

 					identityLink = STORKResponseProcessor.connectToSZRGateway(

-							authnResponse.getPersonalAttributeList(),

+							attributeList,

 							oaParam.getFriendlyName(), 

 							targetType, 

 							null, 

@@ -559,7 +565,7 @@ public class PepsConnectorTask extends AbstractAuthServletTask {
 			moaSession.setIdentityLink(identityLink);

 

 			Logger.debug("Adding addtional STORK attributes to MOA session");

-			moaSession.setStorkAttributes(authnResponse.getPersonalAttributeList());

+			moaSession.setStorkAttributes(attributeList);

 

 			Logger.debug("Add full STORK AuthnResponse to MOA session");

 			moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));