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

1 files changed, 22 insertions, 12 deletions

diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java
index 3fc13406c..a93dff3b3 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java
@@ -21,6 +21,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.opensaml.common.xml.SAMLConstants;
 import org.opensaml.saml2.metadata.ContactPerson;
 import org.opensaml.saml2.metadata.Organization;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,11 +40,11 @@ import at.gv.egovernment.moa.id.data.SLOInformationInterface;
 import at.gv.egovernment.moa.id.moduls.IAction;
 import at.gv.egovernment.moa.id.protocols.pvp2x.config.PVPConfiguration;
 import at.gv.egovernment.moa.logging.Logger;
-import eu.eidas.auth.engine.EIDASSAMLEngine;
+import eu.eidas.auth.engine.ProtocolEngineI;
 import eu.eidas.auth.engine.metadata.Contact;
 import eu.eidas.auth.engine.metadata.MetadataConfigParams;
 import eu.eidas.auth.engine.metadata.MetadataGenerator;
-import eu.eidas.engine.exceptions.SAMLEngineException;
+import eu.eidas.engine.exceptions.EIDASSAMLEngineException;
 
 
 /**
@@ -65,10 +66,10 @@ public class EidasMetaDataRequest implements IAction {
 		try {            
             String pubURLPrefix = req.getAuthURL();
             
-            String metadata_url = pubURLPrefix + Constants.eIDAS_HTTP_ENDPOINT_METADATA;
+            String metadata_url = pubURLPrefix + Constants.eIDAS_HTTP_ENDPOINT_METADATA;            
+            String sp_return_url = pubURLPrefix + Constants.eIDAS_HTTP_ENDPOINT_SP_POST;
             
-            String sp_return_url = pubURLPrefix + Constants.eIDAS_HTTP_ENDPOINT_SP_POST;            
-            String metaData = generateMetadata(metadata_url, sp_return_url);
+            String metaData = generateMetadata(req, metadata_url, sp_return_url);
 
             Logger.trace(metaData);
 
@@ -104,10 +105,10 @@ public class EidasMetaDataRequest implements IAction {
 		
 	}
     
-    public String generateMetadata(String metadata_url, String sp_return_url) throws SAMLEngineException, EIDASEngineException{
+    public String generateMetadata(IRequest pendingReq, String metadata_url, String sp_return_url) throws EIDASSAMLEngineException, EIDASEngineException{
         String metadata="invalid metadata";
 
-		EIDASSAMLEngine engine = SAMLEngineUtils.createSAMLEngine(eIDASMetadataProvider);
+		ProtocolEngineI engine = SAMLEngineUtils.createSAMLEngine(eIDASMetadataProvider);
         
         MetadataGenerator generator = new MetadataGenerator();
         MetadataConfigParams mcp=new MetadataConfigParams();
@@ -116,6 +117,9 @@ public class EidasMetaDataRequest implements IAction {
         
         mcp.setEntityID(metadata_url);        
         mcp.setAssertionConsumerUrl(sp_return_url);
+        mcp.getProtocolBindingLocation().put(
+        		SAMLConstants.SAML2_POST_BINDING_URI, 
+        		pendingReq.getAuthURL() + Constants.eIDAS_HTTP_ENDPOINT_IDP_COLLEAGUEREQUEST);
         
         
         //TODO: make it configurable
@@ -137,11 +141,17 @@ public class EidasMetaDataRequest implements IAction {
 			Contact technicalContact = new Contact();
 			
 			List<ContactPerson> contacts = PVPConfiguration.getInstance().getIDPContacts();
-			if (contacts != null && contacts.size() >= 1) {								
-				technicalContact.setEmail(contacts.get(0).getEmailAddresses().get(0).getAddress());
-				technicalContact.setGivenName(contacts.get(0).getGivenName().getName());
-				technicalContact.setSurName(contacts.get(0).getSurName().getName());
-				technicalContact.setPhone(contacts.get(0).getTelephoneNumbers().get(0).getNumber());
+			if (contacts != null && contacts.size() >= 1) {
+				ContactPerson contact = contacts.get(0);
+				technicalContact.setGivenName(contact.getGivenName().getName());
+				technicalContact.setSurName(contact.getSurName().getName());
+				
+				if (!contact.getEmailAddresses().isEmpty())
+					technicalContact.setEmail(contact.getEmailAddresses().get(0).getAddress());
+								
+				if (!contact.getTelephoneNumbers().isEmpty())
+					technicalContact.setPhone(contact.getTelephoneNumbers().get(0).getNumber());
+				
 				mcp.setTechnicalContact(technicalContact );			
 				
 			}