From 700125a4f34db4dfe348b0a350c4220ea34a82b4 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Mon, 19 Jan 2015 11:14:34 +0100
Subject: [PATCH] Add NameID to attributes status page.
---
dictionaries/status.definition.json | 9 +++++++++
modules/core/www/authenticate.php | 2 ++
2 files changed, 11 insertions(+)
diff --git a/dictionaries/status.definition.json b/dictionaries/status.definition.json
index 492f754c5..57030aaab 100644
--- a/dictionaries/status.definition.json
+++ b/dictionaries/status.definition.json
@@ -23,6 +23,15 @@
"sessionsize": {
"en": "Session size: %SIZE%"
},
+ "subject_header": {
+ "en": "SAML Subject"
+ },
+ "subject_notset": {
+ "en": "not set"
+ },
+ "subject_format": {
+ "en": "Format"
+ },
"attributes_header": {
"en": "Your attributes"
},
diff --git a/modules/core/www/authenticate.php b/modules/core/www/authenticate.php
index 50fda636c..0e23193c1 100644
--- a/modules/core/www/authenticate.php
+++ b/modules/core/www/authenticate.php
@@ -51,6 +51,8 @@ $t = new SimpleSAML_XHTML_Template($config, 'status.php', 'attributes');
$t->data['header'] = '{status:header_saml20_sp}';
$t->data['attributes'] = $attributes;
+// if saml:sp:IdP is set, this is SAML auth so we can pass a NameId
+$t->data['nameid'] = !is_null( $as->getAuthData('saml:sp:IdP') ) ? $as->getAuthData('saml:sp:NameID') : FALSE;
$t->data['logouturl'] = SimpleSAML_Utilities::selfURLNoQuery() . '?as=' . urlencode($asId) . '&logout';
$t->show();
--
GitLab