Merge branch 'master' of github.com:simplesamlphp/simplesamlphp

# By Matt Schwager (1) and Nicholas Amon (1)
# Via Jaime Pérez Crespo (2) and Matt Schwager (1)
* 'master' of github.com:simplesamlphp/simplesamlphp:
  Added documentation for AttributeCopy authentication processing filter.
  Bug fix to include the subject nameid in the data returned from a SAML 1.0 SSO authentication.

docs/simplesamlphp-authproc.txt

@@ -128,6 +128,7 @@ The following filters are included in the simpleSAMLphp distribution:
 - [`authorize:Authorize`](./authorize:authorize): Access control based on regular expressions.
 - [`consent:Consent`](./consent:consent): Ask the user for consent before transmitting attributes.
 - [`core:AttributeAdd`](./core:authproc_attributeadd): Add attributes to the response.
+- [`core:AttributeCopy`](./core:authproc_attributecopy): Copy existing attributes to the response.
 - [`core:AttributeAlter`](./core:authproc_attributealter): Do search-and-replace on attributevalues.
 - [`core:AttributeLimit`](./core:authproc_attributelimit): Limit the attributes in the response.
 - [`core:AttributeMap`](./core:authproc_attributemap): Change the name of the attributes.

lib/SimpleSAML/Auth/Default.php

@@ -98,7 +98,7 @@ class SimpleSAML_Auth_Default {
 		}
 
 		/* Add those that should always be included. */
-		foreach (array('Attributes', 'Expire', 'LogoutState', 'AuthnInstant', 'RememberMe') as $a) {
+		foreach (array('Attributes', 'Expire', 'LogoutState', 'AuthnInstant', 'RememberMe', 'saml:sp:NameID') as $a) {
 			if (isset($state[$a])) {
 				$persistentAuthState[$a] = $state[$a];
 			}

modules/core/docs/authproc_attributecopy.txt

+`core:AttributeCopy`
+===================
+
+Filter that renames attributes.
+
+
+Examples
+--------
+
+Copy a single attribute (user's uid will be copied to the user's username):
+
+    'authproc' => array(
+        50 => array(
+            'class' => 'core:AttributeCopy',
+            'uid' => 'username',
+        ),
+    ),
+

modules/saml/www/sp/saml1-acs.php

@@ -81,5 +81,7 @@ $logoutState = array(
 	);
 $state['LogoutState'] = $logoutState;
 
+$state['saml:sp:NameID'] = $response->getNameID();
+
 $source->handleResponse($state, $responseIssuer, $attributes);
 assert('FALSE');