First untested version of refactor eIDAS module, which uses eIDAS SAMLEngine v1.1 from JoinUp

1 files changed, 72 insertions, 43 deletions

diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/eIDASAuthenticationRequest.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/eIDASAuthenticationRequest.java
index 2beb419fb..9e29c01f3 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/eIDASAuthenticationRequest.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/eIDASAuthenticationRequest.java
@@ -24,7 +24,6 @@ package at.gv.egovernment.moa.id.protocols.eidas;
 
 import java.io.StringWriter;
 import java.text.SimpleDateFormat;
-import java.util.Map.Entry;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -36,13 +35,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 
+import com.google.common.collect.ImmutableSet;
+
 import at.gv.egovernment.moa.id.advancedlogging.MOAReversionLogger;
 import at.gv.egovernment.moa.id.auth.frontend.velocity.VelocityProvider;
 import at.gv.egovernment.moa.id.auth.modules.eidas.Constants;
 import at.gv.egovernment.moa.id.auth.modules.eidas.engine.MOAeIDASChainingMetadataProvider;
-import at.gv.egovernment.moa.id.auth.modules.eidas.engine.MOAeIDASMetadataProviderDecorator;
-import at.gv.egovernment.moa.id.auth.modules.eidas.utils.MOAPersonalAttributeList;
-import at.gv.egovernment.moa.id.auth.modules.eidas.utils.SAMLEngineUtils;
 import at.gv.egovernment.moa.id.commons.api.IRequest;
 import at.gv.egovernment.moa.id.commons.api.exceptions.MOAIDException;
 import at.gv.egovernment.moa.id.data.IAuthData;
@@ -50,12 +48,16 @@ import at.gv.egovernment.moa.id.data.SLOInformationInterface;
 import at.gv.egovernment.moa.id.moduls.IAction;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
-import eu.eidas.auth.commons.EIDASAuthnResponse;
-import eu.eidas.auth.commons.EIDASStatusCode;
-import eu.eidas.auth.commons.EIDASUtil;
-import eu.eidas.auth.commons.PersonalAttribute;
-import eu.eidas.auth.engine.EIDASSAMLEngine;
-import eu.eidas.auth.engine.metadata.MetadataUtil;
+import eu.eidas.auth.commons.EidasStringUtil;
+import eu.eidas.auth.commons.attribute.AttributeDefinition;
+import eu.eidas.auth.commons.attribute.AttributeValue;
+import eu.eidas.auth.commons.attribute.AttributeValueMarshaller;
+import eu.eidas.auth.commons.attribute.AttributeValueMarshallingException;
+import eu.eidas.auth.commons.attribute.ImmutableAttributeMap;
+import eu.eidas.auth.commons.protocol.IResponseMessage;
+import eu.eidas.auth.commons.protocol.impl.AuthenticationResponse;
+import eu.eidas.auth.engine.ProtocolEngineI;
+import eu.eidas.auth.engine.xml.opensaml.SAMLEngineUtils;
 
 
 /**
@@ -80,14 +82,16 @@ public class eIDASAuthenticationRequest implements IAction {
 			throw new MOAIDException("got wrong IRequest type. is: {}, should be: {}", new String[] {req.getClass().toString(), EIDASData.class.toString()});
 		
 		
-		// gather attributes
-		MOAPersonalAttributeList resultingAttributeList = (MOAPersonalAttributeList) eidasRequest.getEidasRequestedAttributes().clone();
+		//gather attributes
+		ImmutableAttributeMap reqAttributeList = (ImmutableAttributeMap) eidasRequest.getEidasRequestedAttributes();
+		
+		ImmutableAttributeMap.Builder attrMapBuilder = ImmutableAttributeMap.builder();
 		
-		for(Entry<String, PersonalAttribute> current : resultingAttributeList.entrySet()) {
+		for(AttributeDefinition<?> attr : reqAttributeList.getDefinitions()) {
 			String newValue = "";
-			
+						
 			// TODO make use of proper builder
-			switch(current.getKey()) {
+			switch(attr.getFriendlyName()) {
 				case Constants.eIDAS_ATTR_DATEOFBIRTH: newValue = new SimpleDateFormat("YYYY-MM-dd").format(authData.getDateOfBirth()); break;
 				case Constants.eIDAS_ATTR_CURRENTFAMILYNAME: newValue = authData.getFamilyName();break;
 				case Constants.eIDAS_ATTR_CURRENTGIVENNAME: newValue = authData.getGivenName();break;			
@@ -95,50 +99,75 @@ public class eIDASAuthenticationRequest implements IAction {
 				
 			}
 			
-			if(MiscUtil.isEmpty(newValue))
-				current.getValue().setStatus(EIDASStatusCode.STATUS_NOT_AVAILABLE.toString());
-			
-			else {
-				current.getValue().getValue().clear();
-				current.getValue().getValue().add(newValue);
-				current.getValue().setStatus(EIDASStatusCode.STATUS_AVAILABLE.toString());
+			if(MiscUtil.isEmpty(newValue)) {
+//				current.getValue().setStatus(EIDASStatusCode.STATUS_NOT_AVAILABLE.toString());
+				Logger.info("eIDAS Attr:" + attr.getNameUri() + " is not available.");
+				
+			} else {
+				AttributeValueMarshaller<?> attributeValueMarshaller = attr.getAttributeValueMarshaller();
+	            ImmutableSet.Builder<AttributeValue<?>> builder = ImmutableSet.builder();
+				
+	            AttributeValue<?> attributeValue = null;
+	            try {
+                    attributeValue = attributeValueMarshaller.unmarshal(newValue, false);
+                    
+                } catch (AttributeValueMarshallingException e) {
+                    throw new IllegalStateException(e);
+                    
+                }
+
+	            //TODO: check for 'isAvailable flag'!
+	            				
+				attrMapBuilder.put((AttributeDefinition)attr, (ImmutableSet) builder.build());
 				
 			}
+			
+
+			
 		}
 		
 		// construct eIDaS response
-		EIDASAuthnResponse response = new EIDASAuthnResponse();
-		response.setPersonalAttributeList(resultingAttributeList);
+		AuthenticationResponse.Builder responseBuilder = new AuthenticationResponse.Builder();
 		
-		// - create metadata url
-        String pubURLPrefix = req.getAuthURL();
+		responseBuilder.id(SAMLEngineUtils.generateNCName());
+		responseBuilder.inResponseTo(eidasRequest.getEidasRequest().getId());
+		
+		String pubURLPrefix = req.getAuthURL();
         String metadata_url = pubURLPrefix + Constants.eIDAS_HTTP_ENDPOINT_METADATA;
-		response.setIssuer(metadata_url);
-
-		response.setAssuranceLevel(authData.getEIDASQAALevel());
+		responseBuilder.issuer(metadata_url);
+		
+		responseBuilder.levelOfAssurance(authData.getEIDASQAALevel());
+		
+		//add attributes
+		responseBuilder.attributes(attrMapBuilder.build());
+		
+		//build response
+		AuthenticationResponse response = responseBuilder.build();
 		
 		String token = null;
 		try {
-			EIDASSAMLEngine engine = SAMLEngineUtils.createSAMLEngine(eIDASMetadataProvider);
+			ProtocolEngineI engine = at.gv.egovernment.moa.id.auth.modules.eidas.utils.SAMLEngineUtils.createSAMLEngine(eIDASMetadataProvider);
 			
 			// encryption is done by the SamlEngine, i.e. by the module we provide in the config
 			// but we need to set the appropriate request issuer
-			engine.setRequestIssuer(eidasRequest.getEidasRequest().getIssuer());
-
-
-			if(null == eidasRequest.getEidasRequest().getAssertionConsumerServiceURL()) {
-				String assertionConsumerUrl = MetadataUtil.getAssertionUrlFromMetadata(
-						new MOAeIDASMetadataProviderDecorator(eIDASMetadataProvider), 
-						engine, 
-						eidasRequest.getEidasRequest());
-				eidasRequest.getEidasRequest().setAssertionConsumerServiceURL(assertionConsumerUrl);
-				
-			}
+			//engine.setRequestIssuer(eidasRequest.getEidasRequest().getIssuer());
+
+			IResponseMessage eIDASRespMsg = engine.generateResponseMessage(eidasRequest.getEidasRequest(), 
+					response, true, eidasRequest.getRemoteAddress());
+
+//			if(null == eidasRequest.getEidasRequest().getAssertionConsumerServiceURL()) {
+//				String assertionConsumerUrl = MetadataUtil.getAssertionUrlFromMetadata(
+//						new MOAeIDASMetadataProviderDecorator(eIDASMetadataProvider), 
+//						engine, 
+//						eidasRequest.getEidasRequest());
+//				eidasRequest.getEidasRequest().setAssertionConsumerServiceURL(assertionConsumerUrl);
+//				
+//			}
 			
-			response = engine.generateEIDASAuthnResponse(eidasRequest.getEidasRequest(), response, eidasRequest.getRemoteAddress(), true);
+//			response = engine.generateEIDASAuthnResponse(eidasRequest.getEidasRequest(), response, eidasRequest.getRemoteAddress(), true);
 
 			
-			token = EIDASUtil.encodeSAMLToken(response.getTokenSaml());
+			token = EidasStringUtil.encodeToBase64(eIDASRespMsg.getMessageBytes());
 			
 		} catch(Exception e) {			
 			e.printStackTrace();