Skip to content
Snippets Groups Projects
Commit b622b7b5 authored by Olav Morken's avatar Olav Morken
Browse files

SSOService: Leave exception handling to _include.php.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2124 44740490-163a-0410-bde0-09ae8108e29a
parent 84215918
No related branches found
No related tags found
No related merge requests found
...@@ -13,8 +13,6 @@ require_once('../../../www/_include.php'); ...@@ -13,8 +13,6 @@ require_once('../../../www/_include.php');
SimpleSAML_Logger::info('SAML2.0 - IdP.SSOService: Accessing SAML 2.0 IdP endpoint SSOService'); SimpleSAML_Logger::info('SAML2.0 - IdP.SSOService: Accessing SAML 2.0 IdP endpoint SSOService');
try {
$config = SimpleSAML_Configuration::getInstance(); $config = SimpleSAML_Configuration::getInstance();
if (!$config->getBoolean('enable.saml20-idp', FALSE)) { if (!$config->getBoolean('enable.saml20-idp', FALSE)) {
throw new SimpleSAML_Error_Error('NOACCESS'); throw new SimpleSAML_Error_Error('NOACCESS');
...@@ -25,14 +23,3 @@ try { ...@@ -25,14 +23,3 @@ try {
$idp = SimpleSAML_IdP::getById('saml2:' . $idpEntityId); $idp = SimpleSAML_IdP::getById('saml2:' . $idpEntityId);
sspmod_saml_IdP_SAML2::receiveAuthnRequest($idp); sspmod_saml_IdP_SAML2::receiveAuthnRequest($idp);
assert('FALSE'); assert('FALSE');
} catch(SimpleSAML_Error_Error $e) {
$e->show();
} catch(Exception $e) {
$e = new SimpleSAML_Error_Error('UNHANDLEDEXCEPTION', $e);
$e->show();
}
...@@ -13,7 +13,6 @@ require_once('../../../www/_include.php'); ...@@ -13,7 +13,6 @@ require_once('../../../www/_include.php');
SimpleSAML_Logger::info('Shib1.3 - IdP.SSOService: Accessing Shibboleth 1.3 IdP endpoint SSOService'); SimpleSAML_Logger::info('Shib1.3 - IdP.SSOService: Accessing Shibboleth 1.3 IdP endpoint SSOService');
try {
$config = SimpleSAML_Configuration::getInstance(); $config = SimpleSAML_Configuration::getInstance();
if (!$config->getBoolean('enable.shib13-idp', FALSE)) { if (!$config->getBoolean('enable.shib13-idp', FALSE)) {
throw new SimpleSAML_Error_Error('NOACCESS'); throw new SimpleSAML_Error_Error('NOACCESS');
...@@ -24,14 +23,3 @@ try { ...@@ -24,14 +23,3 @@ try {
$idp = SimpleSAML_IdP::getById('saml1:' . $idpEntityId); $idp = SimpleSAML_IdP::getById('saml1:' . $idpEntityId);
sspmod_saml_IdP_SAML1::receiveAuthnRequest($idp); sspmod_saml_IdP_SAML1::receiveAuthnRequest($idp);
assert('FALSE'); assert('FALSE');
} catch(SimpleSAML_Error_Error $e) {
$e->show();
} catch(Exception $e) {
$e = new SimpleSAML_Error_Error('UNHANDLEDEXCEPTION', $e);
$e->show();
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment