Metadata IDP generation fixes, Auth Response fixes

1 files changed, 39 insertions, 5 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java
index d9129165e..85d5c2a46 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java
@@ -17,13 +17,17 @@ import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.joda.time.DateTime;
 import org.opensaml.Configuration;
 import org.opensaml.common.xml.SAMLConstants;
+import org.opensaml.saml2.core.NameIDType;
 import org.opensaml.saml2.metadata.ArtifactResolutionService;
 import org.opensaml.saml2.metadata.ContactPerson;
+import org.opensaml.saml2.metadata.EntitiesDescriptor;
 import org.opensaml.saml2.metadata.EntityDescriptor;
 import org.opensaml.saml2.metadata.IDPSSODescriptor;
 import org.opensaml.saml2.metadata.KeyDescriptor;
+import org.opensaml.saml2.metadata.NameIDFormat;
 import org.opensaml.saml2.metadata.SingleSignOnService;
 import org.opensaml.xml.io.Marshaller;
 import org.opensaml.xml.io.MarshallingException;
@@ -52,9 +56,20 @@ public class MetadataAction implements IAction {
 			HttpServletResponse httpResp) throws MOAIDException {
 		try {
 
+			EntitiesDescriptor idpEntitiesDescriptor = 
+					SAML2Utils.createSAMLObject(EntitiesDescriptor.class);
+			
+			idpEntitiesDescriptor.setName(PVPConfiguration.getInstance().getIDPIssuerName());
+
+			idpEntitiesDescriptor.setID(SAML2Utils.getSecureIdentifier());
+			
+			idpEntitiesDescriptor.setValidUntil(new DateTime().plusWeeks(4));
+			
 			EntityDescriptor idpEntityDescriptor = SAML2Utils
 					.createSAMLObject(EntityDescriptor.class);
 
+			idpEntitiesDescriptor.getEntityDescriptors().add(idpEntityDescriptor);
+			
 			idpEntityDescriptor
 					.setEntityID("https://localhost:8443/moa-id-auth");
 
@@ -83,13 +98,15 @@ public class MetadataAction implements IAction {
 			Signature signature = CredentialProvider
 					.getIDPSignature(credential);
 			
-			idpEntityDescriptor.setSignature(signature);
+			idpEntitiesDescriptor.setSignature(signature);
 
 			IDPSSODescriptor idpSSODescriptor = SAML2Utils
 					.createSAMLObject(IDPSSODescriptor.class);
 
-			idpSSODescriptor.setWantAuthnRequestsSigned(true);
-
+			idpSSODescriptor.addSupportedProtocol(SAMLConstants.SAML20P_NS);
+			
+			idpSSODescriptor.setWantAuthnRequestsSigned(true);			
+			
 			if (PVPConfiguration.getInstance().getIDPSSOPostService() != null) {
 				SingleSignOnService postSingleSignOnService = SAML2Utils
 						.createSAMLObject(SingleSignOnService.class);
@@ -125,6 +142,8 @@ public class MetadataAction implements IAction {
 				artifactResolutionService.setLocation(PVPConfiguration
 						.getInstance().getIDPResolveSOAPService());
 
+				artifactResolutionService.setIndex(0);
+				
 				idpSSODescriptor.getArtifactResolutionServices().add(
 						artifactResolutionService);
 			}
@@ -133,6 +152,21 @@ public class MetadataAction implements IAction {
 			
 			idpSSODescriptor.getAttributes().addAll(PVPAttributeBuilder.buildSupportedEmptyAttributes());
 			
+			NameIDFormat persistenNameIDFormat = SAML2Utils.createSAMLObject(NameIDFormat.class);
+			persistenNameIDFormat.setFormat(NameIDType.PERSISTENT);
+			
+			idpSSODescriptor.getNameIDFormats().add(persistenNameIDFormat);
+			
+			NameIDFormat transientNameIDFormat = SAML2Utils.createSAMLObject(NameIDFormat.class);
+			transientNameIDFormat.setFormat(NameIDType.TRANSIENT);
+			
+			idpSSODescriptor.getNameIDFormats().add(transientNameIDFormat);
+			
+			NameIDFormat unspecifiedNameIDFormat = SAML2Utils.createSAMLObject(NameIDFormat.class);
+			unspecifiedNameIDFormat.setFormat(NameIDType.UNSPECIFIED);
+			
+			idpSSODescriptor.getNameIDFormats().add(unspecifiedNameIDFormat);
+			
 			idpEntityDescriptor.getRoleDescriptors().add(idpSSODescriptor);
 			
 			DocumentBuilder builder;
@@ -142,8 +176,8 @@ public class MetadataAction implements IAction {
 			builder = factory.newDocumentBuilder();
 			Document document = builder.newDocument();
 			Marshaller out = Configuration.getMarshallerFactory()
-					.getMarshaller(idpEntityDescriptor);
-			out.marshall(idpEntityDescriptor, document);
+					.getMarshaller(idpEntitiesDescriptor);
+			out.marshall(idpEntitiesDescriptor, document);
 
 			Signer.signObject(signature);