add requested attributes to PVP S-profile

10 files changed, 223 insertions, 5 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PVPAttributeBuilder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PVPAttributeBuilder.java
index 41623f3d..e7c136c9 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PVPAttributeBuilder.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PVPAttributeBuilder.java
@@ -21,6 +21,7 @@ import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.AttributeBuilderException;
 import at.gv.egiz.eaaf.core.exceptions.InvalidDateFormatAttributeException;
 import at.gv.egiz.eaaf.core.exceptions.UnavailableAttributeException;
+import at.gv.egiz.eaaf.core.impl.idp.builder.attributes.PVPMETADATA;
 import at.gv.egiz.eaaf.modules.pvp2.exception.InvalidDateFormatException;
 import at.gv.egiz.eaaf.modules.pvp2.exception.PVP2Exception;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.SAML2Utils;
@@ -112,15 +113,25 @@ public class PVPAttributeBuilder {
 	}
 	
 	
-	
+	/**
+	 * Return all attributes that has a {@link PVPMETADATA} annotation
+	 * 
+	 * @return
+	 */
 	public static List<Attribute> buildSupportedEmptyAttributes() {
 		List<Attribute> attributes = new ArrayList<Attribute>();
 		Iterator<IAttributeBuilder> builderIt = builders.values().iterator();
 		while (builderIt.hasNext()) {
 			IAttributeBuilder builder = builderIt.next();
-			Attribute emptyAttribute = builder.buildEmpty(generator);
-			if (emptyAttribute != null) {
-				attributes.add(emptyAttribute);
+			if (builder.getClass().isAnnotationPresent(PVPMETADATA.class)) {
+				Attribute emptyAttribute = builder.buildEmpty(generator);
+				if (emptyAttribute != null) {
+					attributes.add(emptyAttribute);
+				}
+				
+			} else {
+				log.trace(builder.getName() + "is no PVP Metadata attribute");
+				
 			}
 		}
 		return attributes;
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PVPMetadataBuilder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PVPMetadataBuilder.java
index abfac305..e29b3e91 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PVPMetadataBuilder.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PVPMetadataBuilder.java
@@ -4,6 +4,7 @@ package at.gv.egiz.eaaf.modules.pvp2.impl.builder;
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.Collection;
 import java.util.List;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -308,7 +309,7 @@ public class PVPMetadataBuilder {
 		
 		
 		//add required attributes
-		List<RequestedAttribute> reqSPAttr = config.getSPRequiredAttributes();
+		Collection<RequestedAttribute> reqSPAttr = config.getSPRequiredAttributes();
 		AttributeConsumingService attributeService = SAML2Utils.createSAMLObject(AttributeConsumingService.class);		
 			
 		attributeService.setIndex(0);
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFExtensionImplementation.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFExtensionImplementation.java
new file mode 100644
index 00000000..fe4e4123
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFExtensionImplementation.java
@@ -0,0 +1,12 @@
+package at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr;
+
+import org.opensaml.saml2.common.impl.ExtensionsImpl;
+
+public class EAAFExtensionImplementation extends ExtensionsImpl {
+
+	protected EAAFExtensionImplementation(String namespaceURI, String elementLocalName, String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+		
+	}
+
+}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestExtensionBuilder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestExtensionBuilder.java
new file mode 100644
index 00000000..e9aaefb6
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestExtensionBuilder.java
@@ -0,0 +1,21 @@
+package at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr;
+
+import org.opensaml.common.impl.AbstractSAMLObjectBuilder;
+import org.opensaml.common.xml.SAMLConstants;
+import org.opensaml.saml2.common.Extensions;
+
+public class EAAFRequestExtensionBuilder extends AbstractSAMLObjectBuilder<Extensions> {
+
+	@Override
+	public Extensions buildObject() {
+		return buildObject(SAMLConstants.SAML20P_NS, Extensions.LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+		
+	}
+
+	@Override
+	public Extensions buildObject(String namespaceURI, String localName, String namespacePrefix) {
+		 return new EAAFExtensionImplementation(namespaceURI, localName, namespacePrefix);
+		 
+	}
+
+}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeBuilder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeBuilder.java
new file mode 100644
index 00000000..69655450
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeBuilder.java
@@ -0,0 +1,21 @@
+package at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr;
+
+import org.opensaml.common.impl.AbstractSAMLObjectBuilder;
+
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttribute;
+import at.gv.egiz.eaaf.modules.pvp2.impl.reqattr.EAAFRequestedAttributeImpl;
+
+public class EAAFRequestedAttributeBuilder extends AbstractSAMLObjectBuilder<EAAFRequestedAttribute> {
+
+	@Override
+	public EAAFRequestedAttribute buildObject() {
+		return buildObject(EAAFRequestedAttribute.DEFAULT_ELEMENT_NAME);
+	}
+
+	@Override
+	public EAAFRequestedAttribute buildObject(String namespaceURI, String localName, String namespacePrefix) {
+		return new EAAFRequestedAttributeImpl(namespaceURI, localName,
+				namespacePrefix);
+	}
+
+}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeMarshaller.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeMarshaller.java
new file mode 100644
index 00000000..8bfd144a
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeMarshaller.java
@@ -0,0 +1,52 @@
+package at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr;
+
+import java.util.Map.Entry;
+
+import javax.xml.namespace.QName;
+
+import org.opensaml.Configuration;
+import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
+import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.io.MarshallingException;
+import org.opensaml.xml.util.XMLHelper;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttribute;
+
+public class EAAFRequestedAttributeMarshaller extends AbstractSAMLObjectMarshaller {
+    protected final void marshallAttributes(final XMLObject samlElement,
+    	    final Element domElement) throws MarshallingException {
+    	final EAAFRequestedAttribute requestedAttr = (EAAFRequestedAttribute) samlElement;
+
+    	if (requestedAttr.getName() != null) {
+    	    domElement.setAttributeNS(null, EAAFRequestedAttribute.NAME_ATTRIB_NAME, requestedAttr.getName());
+    	}
+
+    	if (requestedAttr.getNameFormat() != null) {
+    	    domElement.setAttributeNS(null, EAAFRequestedAttribute.NAME_FORMAT_ATTR, requestedAttr.getNameFormat());
+    	}
+
+    	if (requestedAttr.getFriendlyName() != null) {
+    	    domElement.setAttributeNS(null, EAAFRequestedAttribute.FRIENDLY_NAME_ATT, requestedAttr.getFriendlyName());
+    	}
+
+    	if (requestedAttr.getIsRequiredXSBoolean() != null) {
+    	    domElement.setAttributeNS(null, EAAFRequestedAttribute.IS_REQUIRED_ATTR, requestedAttr.getIsRequiredXSBoolean());
+    	}
+
+    	Attr attr;
+    	for (Entry<QName, String> entry : requestedAttr.getUnknownAttributes()
+    		.entrySet()) {
+    	    attr = XMLHelper.constructAttribute(domElement.getOwnerDocument(),
+    		    entry.getKey());
+    	    attr.setValue(entry.getValue());
+    	    domElement.setAttributeNodeNS(attr);
+    	    if (Configuration.isIDAttribute(entry.getKey())
+    		    || requestedAttr.getUnknownAttributes().isIDAttribute(
+    			    entry.getKey())) {
+    		attr.getOwnerElement().setIdAttributeNode(attr, true);
+    	    }
+    	}
+        }
+}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeUnmarshaller.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeUnmarshaller.java
new file mode 100644
index 00000000..2754f145
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeUnmarshaller.java
@@ -0,0 +1,51 @@
+package at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr;
+
+import javax.xml.namespace.QName;
+
+import org.opensaml.common.impl.AbstractSAMLObjectUnmarshaller;
+import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.io.UnmarshallingException;
+import org.opensaml.xml.util.XMLHelper;
+import org.w3c.dom.Attr;
+
+import at.gv.egiz.eaaf.modules.pvp2.PVPConstants;
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttribute;
+
+public class EAAFRequestedAttributeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
+    protected final void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject) throws UnmarshallingException {
+    	final EAAFRequestedAttribute requestedAttr = (EAAFRequestedAttribute) parentSAMLObject;
+    	final QName childQName = childSAMLObject.getElementQName();
+    
+    	if ("AttributeValue".equals(childQName.getLocalPart())
+    		&& childQName.getNamespaceURI().equals(PVPConstants.EIDAS10_SAML_NS)) {
+    	    requestedAttr.getAttributeValues().add(childSAMLObject);
+    	
+    	} else
+    	    super.processChildElement(parentSAMLObject, childSAMLObject);
+
+    }
+
+    protected final void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
+    	final EAAFRequestedAttribute requestedAttr = (EAAFRequestedAttribute) samlObject;
+    	if (attribute.getLocalName().equals(EAAFRequestedAttribute.NAME_ATTRIB_NAME)) {
+    	    requestedAttr.setName(attribute.getValue());
+    	
+    	} else if (attribute.getLocalName().equals(EAAFRequestedAttribute.NAME_FORMAT_ATTR)) {
+    	    requestedAttr.setNameFormat(attribute.getValue());
+    	    
+    	} else if (attribute.getLocalName().equals(EAAFRequestedAttribute.FRIENDLY_NAME_ATT)) {
+    	    requestedAttr.setFriendlyName(attribute.getValue());
+    	    
+    	} else if (attribute.getLocalName().equals(EAAFRequestedAttribute.IS_REQUIRED_ATTR)) {
+    	    requestedAttr.setIsRequired(attribute.getValue());
+
+    	} else {
+    	    final QName attribQName = XMLHelper.getNodeQName(attribute);
+    	    if (attribute.isId()) {
+    	    	requestedAttr.getUnknownAttributes().registerID(attribQName);
+    	    }
+    	    requestedAttr.getUnknownAttributes().put(attribQName,
+    		    attribute.getValue());
+    	}
+   }
+}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributesBuilder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributesBuilder.java
new file mode 100644
index 00000000..4d17936a
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributesBuilder.java
@@ -0,0 +1,21 @@
+package at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr;
+
+import org.opensaml.common.impl.AbstractSAMLObjectBuilder;
+
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttributes;
+import at.gv.egiz.eaaf.modules.pvp2.impl.reqattr.EAAFRequestedAttributesImpl;
+
+public class EAAFRequestedAttributesBuilder extends AbstractSAMLObjectBuilder<EAAFRequestedAttributes> {
+
+	@Override
+	public EAAFRequestedAttributes buildObject() {
+		return buildObject(EAAFRequestedAttributes.DEFAULT_ELEMENT_NAME);
+	}
+
+	@Override
+	public EAAFRequestedAttributes buildObject(String namespaceURI, String localName, String namespacePrefix) {
+		return new EAAFRequestedAttributesImpl(namespaceURI, localName,
+				namespacePrefix);
+	}
+
+}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributesMarshaller.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributesMarshaller.java
new file mode 100644
index 00000000..e390ad3e
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributesMarshaller.java
@@ -0,0 +1,7 @@
+package at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr;
+
+import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
+
+public class EAAFRequestedAttributesMarshaller extends AbstractSAMLObjectMarshaller {
+
+}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributesUnmarshaller.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributesUnmarshaller.java
new file mode 100644
index 00000000..96a694fe
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributesUnmarshaller.java
@@ -0,0 +1,21 @@
+package at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr;
+
+import org.opensaml.common.impl.AbstractSAMLObjectUnmarshaller;
+import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.io.UnmarshallingException;
+
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttribute;
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttributes;
+
+public class EAAFRequestedAttributesUnmarshaller extends AbstractSAMLObjectUnmarshaller {
+    protected final void processChildElement(final XMLObject parentObject,
+    	    final XMLObject childObject) throws UnmarshallingException {
+    	final EAAFRequestedAttributes attrStatement = (EAAFRequestedAttributes) parentObject;
+    	if (childObject instanceof EAAFRequestedAttribute) {
+    	    attrStatement.getAttributes().add((EAAFRequestedAttribute) childObject);
+    	    
+    	} else
+    	    super.processChildElement(parentObject, childObject);
+
+    }
+}