Revision: 2143
Author: olavmrk
Date: Wed Jan 27 01:29:19 2010
Log: saml2/idp: Deprecate iframe versions of SingleLogoutService endpoints.
http://code.google.com/p/simplesamlphp/source/detail?r=2143
Modified:
/trunk/docs/simplesamlphp-idp-more.txt
/trunk/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
/trunk/www/saml2/idp/SingleLogoutServiceiFrame.php
/trunk/www/saml2/idp/SingleLogoutServiceiFrameResponse.php
/trunk/www/saml2/idp/idpInitSingleLogoutServiceiFrame.php
/trunk/www/saml2/idp/metadata.php
=======================================
--- /trunk/docs/simplesamlphp-idp-more.txt Wed Jul 1 22:47:04 2009
+++ /trunk/docs/simplesamlphp-idp-more.txt Wed Jan 27 01:29:19 2010
@@ -17,7 +17,6 @@
'logouttype' => 'iframe',
-Notice that when setting this option after already having shared metadata
with Service Providers, you need to send new metadata. The automatically
genereated metadata will change.
Attribute Release Consent
-------------------------
=======================================
--- /trunk/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php Fri Oct 23
12:12:57 2009
+++ /trunk/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php Wed Jan 27
01:29:19 2010
@@ -74,7 +74,7 @@
* @param $set The set we the property comes from.
* @return The autogenerated metadata property.
*/
- public function getGenerated($property, $set = 'saml20-sp-hosted',
$options = array() ) {
+ public function getGenerated($property, $set = 'saml20-sp-hosted') {
/* First we check if the user has overridden this property in the
metadata. */
try {
@@ -102,38 +102,13 @@
return $baseurl .
'saml2/sp/SingleLogoutService.php';
}
} elseif($set == 'saml20-idp-hosted') {
-
- $logouttype = 'traditional';
- if (array_key_exists('logouttype', $options)) $logouttype =
$options['logouttype'];
- if (!in_array($logouttype, array('traditional',
'iframe')))
- throw new Exception('Invalid logout type [' . $logouttype . '] in IdP
Hosted Metadata');
switch ($property) {
case 'SingleSignOnService' :
return $baseurl .
'saml2/idp/SSOService.php';
case 'SingleLogoutService' :
-
- switch ($logouttype) {
- case 'iframe' :
- return $baseurl .
'saml2/idp/SingleLogoutServiceiFrame.php';
-
- case 'traditional' :
- default :
- return $baseurl .
'saml2/idp/SingleLogoutService.php';
- }
-
- case 'SingleLogoutServiceResponse' :
-
- switch ($logouttype) {
- case 'iframe' :
- return $baseurl .
'saml2/idp/SingleLogoutServiceiFrameResponse.php';
-
- case 'traditional' :
- default :
- return $baseurl .
'saml2/idp/SingleLogoutService.php';
- }
-
+ return $baseurl .
'saml2/idp/SingleLogoutService.php';
}
} elseif($set == 'shib13-sp-hosted') {
switch ($property) {
=======================================
--- /trunk/www/saml2/idp/SingleLogoutServiceiFrame.php Wed Jan 27 01:26:39
2010
+++ /trunk/www/saml2/idp/SingleLogoutServiceiFrame.php Wed Jan 27 01:29:19
2010
@@ -1,14 +1,11 @@
<?php
-/**
- * This SAML 2.0 endpoint can receive incoming LogoutRequests. It will
also send LogoutResponses,
- * and LogoutRequests and also receive LogoutResponses. It is implemeting
SLO at the SAML 2.0 IdP.
+/*
+ * This endpoint is provided for backwards compatibility,
+ * and should not be used.
*
- * @author Andreas Åkre Solberg, UNINETT AS. <[email protected]>
- * @package simpleSAMLphp
- * @version $Id$
+ * Use SingleLogoutService.php instead.
*/
-
require_once('../../_include.php');
SimpleSAML_Logger::info('SAML2.0 - IdP.SingleLogoutServiceiFrame:
Accessing SAML 2.0 IdP endpoint SingleLogoutService (iFrame version)');
=======================================
--- /trunk/www/saml2/idp/SingleLogoutServiceiFrameResponse.php Wed Jan 27
01:26:39 2010
+++ /trunk/www/saml2/idp/SingleLogoutServiceiFrameResponse.php Wed Jan 27
01:29:19 2010
@@ -1,14 +1,11 @@
<?php
-
-/**
- * This SAML 2.0 endpoint can receive incoming LogoutResponses.
+/*
+ * This endpoint is provided for backwards compatibility,
+ * and should not be used.
*
- * @author Andreas Åkre Solberg, UNINETT AS. <[email protected]>
- * @package simpleSAMLphp
- * @version $Id$
+ * Use SingleLogoutService.php instead.
*/
-
require_once('../../_include.php');
SimpleSAML_Logger::info('SAML2.0 - IdP.SingleLogoutServiceiFrameResponse:
Accessing SAML 2.0 IdP endpoint SingleLogoutServiceResponse (iFrame
version)');
=======================================
--- /trunk/www/saml2/idp/idpInitSingleLogoutServiceiFrame.php Wed Jan 27
01:26:39 2010
+++ /trunk/www/saml2/idp/idpInitSingleLogoutServiceiFrame.php Wed Jan 27
01:29:19 2010
@@ -1,13 +1,11 @@
<?php
-/**
- * IdP Initiated Single Log-Out. Requires one parameter: RelayState.
+/*
+ * This endpoint is provided for backwards compatibility,
+ * and should not be used.
*
- * @author Andreas Åkre Solberg, UNINETT AS. <[email protected]>
- * @package simpleSAMLphp
- * @version $Id$
+ * Use SingleLogoutService.php?ReturnTo=... instead.
*/
-
require_once('../../_include.php');
$metadata =
SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
=======================================
--- /trunk/www/saml2/idp/metadata.php Fri Jan 15 02:10:50 2010
+++ /trunk/www/saml2/idp/metadata.php Wed Jan 27 01:29:19 2010
@@ -27,26 +27,15 @@
/* Only one valid certificate. */
$certFingerprint = $certFingerprint[0];
}
-
- $logouttype = 'traditional';
- if (array_key_exists('logouttype', $idpmeta)) $logouttype =
$idpmeta['logouttype'];
-
- $urlSLO =
$metadata->getGenerated('SingleLogoutService', 'saml20-idp-hosted',
array('logouttype' => $logouttype));
- $urlSLOr =
$metadata->getGenerated('SingleLogoutServiceResponse', 'saml20-idp-hosted',
array('logouttype' => $logouttype));
$metaArray = array(
'metadata-set' => 'saml20-idp-remote',
'entityid' => $idpentityid,
- 'SingleSignOnService' =>
$metadata->getGenerated('SingleSignOnService', 'saml20-idp-hosted',
array()),
- 'SingleLogoutService' =>
$metadata->getGenerated('SingleLogoutService', 'saml20-idp-hosted',
array('logouttype' => $logouttype)),
- 'SingleLogoutServiceResponse' =>
$metadata->getGenerated('SingleLogoutServiceResponse', 'saml20-idp-hosted',
array('logouttype' => $logouttype)),
+ 'SingleSignOnService' =>
$metadata->getGenerated('SingleSignOnService', 'saml20-idp-hosted'),
+ 'SingleLogoutService' =>
$metadata->getGenerated('SingleLogoutService', 'saml20-idp-hosted'),
'certFingerprint' => $certFingerprint,
);
- if ($metaArray['SingleLogoutServiceResponse'] ===
$metaArray['SingleLogoutService']) {
- unset($metaArray['SingleLogoutServiceResponse']);
- }
-
if (isset($idpmeta['saml20.sendartifact']) &&
$idpmeta['saml20.sendartifact'] === TRUE) {
/* Artifact sending enabled. */
$metaArray['ArtifactResolutionService'][] = array(
--
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/simplesamlphp-commits?hl=en.
