From fdac05cb3d19e86867130d87992a825fd85e19f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Wed, 30 Jan 2008 10:21:53 +0000
Subject: [PATCH] At the shibboleth 1.3 idp, move base64attributes option from
idphosted to spremote
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@220 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/XML/Shib13/AuthnResponse.php | 2 +-
metadata-templates/saml20-sp-remote.php | 2 +-
metadata-templates/shib13-idp-hosted.php | 2 --
metadata-templates/shib13-sp-remote.php | 12 ++++++++----
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/lib/SimpleSAML/XML/Shib13/AuthnResponse.php b/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
index 00e4f75b0..83c783a7a 100644
--- a/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
+++ b/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
@@ -296,7 +296,7 @@ class SimpleSAML_XML_Shib13_AuthnResponse extends SimpleSAML_XML_AuthnResponse {
$shire = $spmd['shire'];
$audience = $spmd['audience'];
- $base64 = $idpmd['base64'];
+ $base64 = $spmd['base64attributes'];
$encodedattributes = '';
diff --git a/metadata-templates/saml20-sp-remote.php b/metadata-templates/saml20-sp-remote.php
index 20d943523..eee631f75 100644
--- a/metadata-templates/saml20-sp-remote.php
+++ b/metadata-templates/saml20-sp-remote.php
@@ -34,7 +34,7 @@ $metadata = array(
'base64attributes' => false,
'simplesaml.attributes' => true,
//'attributemap' => 'test',
- //'attributes' => array('mail')
+ //'attributes' => array('mail'),
/*
diff --git a/metadata-templates/shib13-idp-hosted.php b/metadata-templates/shib13-idp-hosted.php
index 80c1c6b91..10a5f190b 100644
--- a/metadata-templates/shib13-idp-hosted.php
+++ b/metadata-templates/shib13-idp-hosted.php
@@ -12,8 +12,6 @@ $metadata = array(
'issuer' => 'dev3.andreas.feide.no',
'host' => 'dev3.andreas.feide.no',
'audience' => 'urn:mace:feide:shiblab',
-
- 'base64' => false,
// X.509 key and certificate. Relative to the cert directory.
'privatekey' => 'server.pem',
diff --git a/metadata-templates/shib13-sp-remote.php b/metadata-templates/shib13-sp-remote.php
index 62f4e2bc8..0c8c1a70b 100644
--- a/metadata-templates/shib13-sp-remote.php
+++ b/metadata-templates/shib13-sp-remote.php
@@ -12,19 +12,23 @@ $metadata = array(
'https://sp.shiblab.feide.no' => array(
'AssertionConsumerService' => 'http://sp.shiblab.feide.no/Shibboleth.sso/SAML/POST',
- 'audience' => 'urn:mace:feide:shiblab'
+ 'audience' => 'urn:mace:feide:shiblab',
+ 'base64attributes' => false
),
'urn:geant:edugain:component:be:switchaai-test:central' => array(
'AssertionConsumerService' => 'https://edugain-login.switch.ch/ShiBE-R/WebSSOResponseListener',
- 'audience' => 'urn:geant:edugain:component:be:switchaai-test:central'
+ 'audience' => 'urn:geant:edugain:component:be:switchaai-test:central',
+ 'base64attributes' => false
),
'urn:geant:edugain:component:be:rediris:rediris.es' => array(
'AssertionConsumerService' => 'http://serrano.rediris.es:8080/PAPIWebSSOResponseListener/request',
- 'audience' => 'urn:geant:edugain:component:be:rediris:rediris.es'
+ 'audience' => 'urn:geant:edugain:component:be:rediris:rediris.es',
+ 'base64attributes' => false
),
'https://skjak.uninett.no/shibboleth/target' => array(
'AssertionConsumerService' => 'https://skjak.uninett.no/Shibboleth.shire',
- 'audience' => 'https://skjak.uninett.no/shibboleth/target'
+ 'audience' => 'https://skjak.uninett.no/shibboleth/target',
+ 'base64attributes' => false
)
);
--
GitLab