Revision: 2124
Author: olavmrk
Date: Fri Jan 22 01:13:40 2010
Log: SSOService: Leave exception handling to _include.php.
http://code.google.com/p/simplesamlphp/source/detail?r=2124
Modified:
/trunk/www/saml2/idp/SSOService.php
/trunk/www/shib13/idp/SSOService.php
=======================================
--- /trunk/www/saml2/idp/SSOService.php Tue Jan 5 02:19:08 2010
+++ /trunk/www/saml2/idp/SSOService.php Fri Jan 22 01:13:40 2010
@@ -13,26 +13,13 @@
SimpleSAML_Logger::info('SAML2.0 - IdP.SSOService: Accessing SAML 2.0 IdP
endpoint SSOService');
-try {
-
- $config = SimpleSAML_Configuration::getInstance();
- if (!$config->getBoolean('enable.saml20-idp', FALSE)) {
- throw new SimpleSAML_Error_Error('NOACCESS');
- }
-
- $metadata =
SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
- $idpEntityId =
$metadata->getMetaDataCurrentEntityID('saml20-idp-hosted');
- $idp = SimpleSAML_IdP::getById('saml2:' . $idpEntityId);
- sspmod_saml_IdP_SAML2::receiveAuthnRequest($idp);
- assert('FALSE');
-
-} catch(SimpleSAML_Error_Error $e) {
-
- $e->show();
-
-} catch(Exception $e) {
-
- $e = new SimpleSAML_Error_Error('UNHANDLEDEXCEPTION', $e);
- $e->show();
-
-}
+$config = SimpleSAML_Configuration::getInstance();
+if (!$config->getBoolean('enable.saml20-idp', FALSE)) {
+ throw new SimpleSAML_Error_Error('NOACCESS');
+}
+
+$metadata =
SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
+$idpEntityId = $metadata->getMetaDataCurrentEntityID('saml20-idp-hosted');
+$idp = SimpleSAML_IdP::getById('saml2:' . $idpEntityId);
+sspmod_saml_IdP_SAML2::receiveAuthnRequest($idp);
+assert('FALSE');
=======================================
--- /trunk/www/shib13/idp/SSOService.php Tue Jan 5 02:19:19 2010
+++ /trunk/www/shib13/idp/SSOService.php Fri Jan 22 01:13:40 2010
@@ -13,25 +13,13 @@
SimpleSAML_Logger::info('Shib1.3 - IdP.SSOService: Accessing Shibboleth
1.3 IdP endpoint SSOService');
-try {
- $config = SimpleSAML_Configuration::getInstance();
- if (!$config->getBoolean('enable.shib13-idp', FALSE)) {
- throw new SimpleSAML_Error_Error('NOACCESS');
- }
-
- $metadata =
SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
- $idpEntityId =
$metadata->getMetaDataCurrentEntityID('shib13-idp-hosted');
- $idp = SimpleSAML_IdP::getById('saml1:' . $idpEntityId);
- sspmod_saml_IdP_SAML1::receiveAuthnRequest($idp);
- assert('FALSE');
-
-} catch(SimpleSAML_Error_Error $e) {
-
- $e->show();
-
-} catch(Exception $e) {
-
- $e = new SimpleSAML_Error_Error('UNHANDLEDEXCEPTION', $e);
- $e->show();
-
-}
+$config = SimpleSAML_Configuration::getInstance();
+if (!$config->getBoolean('enable.shib13-idp', FALSE)) {
+ throw new SimpleSAML_Error_Error('NOACCESS');
+}
+
+$metadata =
SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
+$idpEntityId = $metadata->getMetaDataCurrentEntityID('shib13-idp-hosted');
+$idp = SimpleSAML_IdP::getById('saml1:' . $idpEntityId);
+sspmod_saml_IdP_SAML1::receiveAuthnRequest($idp);
+assert('FALSE');
--
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.
