703: Implement simple sample application based on current frameworks

Task-Url: https://minfba.de.dariah.eu/mantisbt/view.php?id=703

dariahsp-core/src/main/java/eu/dariah/de/dariahsp/saml/metadata/AttributeMetadataGenerator.java

@@ -18,7 +18,7 @@ public class AttributeMetadataGenerator extends MetadataGenerator implements Ini
 	private String[] attributeNames;
 	private String[] attributeFriendlyNames;
 	private String[] attributeNameFormats;
-	private Boolean[] attributeRequired;
+	private String[] attributeRequired;
 	
 	private List<RequestedAttribute> requestedAttributes;
 	
@@ -32,8 +32,8 @@ public class AttributeMetadataGenerator extends MetadataGenerator implements Ini
 	public String[] getAttributeNameFormats() { return attributeNameFormats; }
 	public void setAttributeNameFormats(String[] attributeNameFormats) { this.attributeNameFormats = attributeNameFormats; }
 	
-	public Boolean[] getAttributeRequired() { return attributeRequired; }
-	public void setAttributeRequired(Boolean[] attributeRequired) { this.attributeRequired = attributeRequired; }
+	public String[] getAttributeRequired() { return attributeRequired; }
+	public void setAttributeRequired(String[] attributeRequired) { this.attributeRequired = attributeRequired; }
 	
 	
 	@Override
@@ -50,10 +50,10 @@ public class AttributeMetadataGenerator extends MetadataGenerator implements Ini
 				RequestedAttribute attr;
 				for (int i=0; i<attributeRequired.length; i++) {
 					attr = attrbuilder.buildObject();
-			        attr.setIsRequired(attributeRequired[i]);
-			        attr.setNameFormat(attributeNameFormats[i]);
-			        attr.setName(attributeNames[i]);
-			        attr.setFriendlyName(attributeFriendlyNames[i]);
+			        attr.setIsRequired(Boolean.parseBoolean(attributeRequired[i].trim()));
+			        attr.setNameFormat(attributeNameFormats[i].trim());
+			        attr.setName(attributeNames[i].trim());
+			        attr.setFriendlyName(attributeFriendlyNames[i].trim());
 			        requestedAttributes.add(attr);
 				}
 			} catch (Exception e) {

dariahsp-sample/src/main/resources/dariahsp.conf

 
 
 
-saml.keystore.path			= /data/_srv/schereg/key/schereg-de-dariah-eu.jks
+saml.keystore.path			= /data/_srv/schereg/key/dfa-de-dariah-eu.jks
+
 # Uncomment if keystore is protected by password
 #saml.keystore.pass			= somepass
 
-saml.keystore.alias			= schereg.de.dariah.eu
+saml.keystore.alias			= dfa.de.dariah.eu
 
 # Alias pass is required, leave empty if no alias password is set in keystore
 saml.keystore.aliaspass		= 
@@ -38,14 +39,13 @@ saml.sp.ecpEnabled			= true
 #saml.sp.allowedNameIds		= EMAIL, PERSISTENT, X509_SUBJECT
 saml.sp.allowedNameIds		= EMAIL, TRANSIENT, PERSISTENT, UNSPECIFIED, X509_SUBJECT
 
-saml.sp.signingKey			= schereg.de.dariah.eu
-saml.sp.encryptionKey		= schereg.de.dariah.eu
-saml.sp.tlsKey				= schereg.de.dariah.eu
-
-saml.sp.attr.names = urn:oid:1.3.6.1.4.1.5923.1.1.1.7
-saml.sp.attr.nameformats = urn:oasis:names:tc:SAML:2.0:attrname-format:uri
-saml.sp.attr.friendlyNames = eduPersonEntitlement
-saml.sp.attr.required = true
+saml.sp.signingKey			= dfa.de.dariah.eu
+saml.sp.encryptionKey		= dfa.de.dariah.eu
+saml.sp.tlsKey				= dfa.de.dariah.eu
 
+saml.sp.attr.names 			= urn:oid:1.3.6.1.4.1.5923.1.1.1.6, urn:oid:0.9.2342.19200300.100.1.3, urn:oid:1.3.6.1.4.1.5923.1.1.1.7, urn:oid:1.3.6.1.4.1.5923.1.1.1.9, urn:oid:2.16.840.1.113730.3.1.241 
+saml.sp.attr.nameFormats 	= urn:oasis:names:tc:SAML:2.0:attrname-format:uri, urn:oasis:names:tc:SAML:2.0:attrname-format:uri, urn:oasis:names:tc:SAML:2.0:attrname-format:uri, urn:oasis:names:tc:SAML:2.0:attrname-format:uri, urn:oasis:names:tc:SAML:2.0:attrname-format:uri
+saml.sp.attr.friendlyNames 	= eduPersonPrincipalName, mail, eduPersonEntitlement, eduPersonScopedAffiliation, displayName
+saml.sp.attr.required 		= true, true, false, false, false
 
 #saml.sp.externalMetadata	= /home/tobias/Downloads/spring_saml_metadata.xml
\ No newline at end of file