modules/saml2: Add NameIDFormat to SP metadata.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1018 44740490-163a-0410-bde0-09ae8108e29a

modules/saml2/lib/Auth/Source/SP.php

@@ -127,6 +127,24 @@ class sspmod_saml2_Auth_Source_SP extends SimpleSAML_Auth_Source {
 	}
 
 
+	/**
+	 * Retrieve the NameIDFormat used by this SP.
+	 *
+	 * @return string  NameIDFormat used by this SP.
+	 */
+	public function getNameIDFormat() {
+
+		$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
+		$spmeta = $metadata->getMetadata($this->entityID, 'saml20-sp-hosted');
+
+		if (array_key_exists('NameIDFormat', $spmeta)) {
+			return $spmeta['NameIDFormat'];
+		} else {
+			return 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient';
+		}
+	}
+
+
 	/**
 	 * Check if the IdP entity id is allowed to authenticate users for this authentication source.
 	 *

modules/saml2/www/sp/metadata.php

@@ -19,8 +19,10 @@ $entityId = $source->getEntityId();
 $metaArray = array(
 	'AssertionConsumerService' => SimpleSAML_Module::getModuleURL('saml2/sp/acs.php'),
 	'SingleLogoutService' => SimpleSAML_Module::getModuleURL('saml2/sp/logout.php/' . $sourceId),
+	'NameIDFormat' => $source->getNameIDFormat(),
 	);
 
+
 $metaBuilder = new SimpleSAML_Metadata_SAMLBuilder($entityId);
 $metaBuilder->addMetadataSP20($metaArray);