From c44ff1acb6d7ae56574db8963dbc268b92d5fe9f Mon Sep 17 00:00:00 2001
From: Jaime Perez <jaime.perez@uninett.no>
Date: Tue, 12 Aug 2014 14:29:21 +0200
Subject: [PATCH] aselect: reformat code in www/credentials.php.
---
modules/aselect/www/credentials.php | 97 ++++++++++++++++-------------
1 file changed, 52 insertions(+), 45 deletions(-)
diff --git a/modules/aselect/www/credentials.php b/modules/aselect/www/credentials.php
index 5b77b8384..2a17c4286 100644
--- a/modules/aselect/www/credentials.php
+++ b/modules/aselect/www/credentials.php
@@ -6,48 +6,55 @@
*
* @author Wessel Dankers, Tilburg University
*/
- if (!array_key_exists('ssp_state', $_REQUEST))
- throw new SimpleSAML_Error_Exception("Missing ssp_state parameter");
- $id = $_REQUEST['ssp_state'];
-
- // sanitize the input
- $sid = SimpleSAML_Utilities::parseStateID($id);
- if (!is_null($sid['url'])) {
- SimpleSAML_Utilities::checkURLAllowed($sid['url']);
- }
-
- $state = SimpleSAML_Auth_State::loadState($id, 'aselect:login');
-
- if(!array_key_exists('a-select-server', $_REQUEST))
- SimpleSAML_Auth_State::throwException($state, new SimpleSAML_Error_Exception("Missing a-select-server parameter"));
- $server_id = $_REQUEST['a-select-server'];
-
- if(!array_key_exists('aselect_credentials', $_REQUEST))
- SimpleSAML_Auth_State::throwException($state, new SimpleSAML_Error_Exception("Missing aselect_credentials parameter"));
- $credentials = $_REQUEST['aselect_credentials'];
-
- if(!array_key_exists('rid', $_REQUEST))
- SimpleSAML_Auth_State::throwException($state, new SimpleSAML_Error_Exception("Missing rid parameter"));
- $rid = $_REQUEST['rid'];
-
- try {
- if(!array_key_exists('aselect::authid', $state))
- throw new SimpleSAML_Error_Exception("ASelect authentication source missing in state");
- $authid = $state['aselect::authid'];
- $aselect = SimpleSAML_Auth_Source::getById($authid);
- if(is_null($aselect))
- throw new SimpleSAML_Error_Exception("Could not find authentication source with id $authid");
- $creds = $aselect->verify_credentials($server_id, $credentials, $rid);
-
- if(array_key_exists('attributes', $creds)) {
- $state['Attributes'] = $creds['attributes'];
- } else {
- $res = $creds['res'];
- $state['Attributes'] = array('uid' => array($res['uid']), 'organization' => array($res['organization']));
- }
- } catch(Exception $e) {
- SimpleSAML_Auth_State::throwException($state, $e);
- }
-
- SimpleSAML_Auth_Source::completeAuth($state);
- SimpleSAML_Auth_State::throwException($state, new SimpleSAML_Error_Exception("Internal error in A-Select component"));
+if (!array_key_exists('ssp_state', $_REQUEST)) {
+ throw new SimpleSAML_Error_Exception("Missing ssp_state parameter");
+}
+$id = $_REQUEST['ssp_state'];
+
+// sanitize the input
+$sid = SimpleSAML_Utilities::parseStateID($id);
+if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
+}
+
+$state = SimpleSAML_Auth_State::loadState($id, 'aselect:login');
+
+if (!array_key_exists('a-select-server', $_REQUEST)) {
+ SimpleSAML_Auth_State::throwException($state, new SimpleSAML_Error_Exception("Missing a-select-server parameter"));
+}
+$server_id = $_REQUEST['a-select-server'];
+
+if (!array_key_exists('aselect_credentials', $_REQUEST)) {
+ SimpleSAML_Auth_State::throwException($state,
+ new SimpleSAML_Error_Exception("Missing aselect_credentials parameter"));
+}
+$credentials = $_REQUEST['aselect_credentials'];
+
+if (!array_key_exists('rid', $_REQUEST)) {
+ SimpleSAML_Auth_State::throwException($state, new SimpleSAML_Error_Exception("Missing rid parameter"));
+}
+$rid = $_REQUEST['rid'];
+
+try {
+ if (!array_key_exists('aselect::authid', $state)) {
+ throw new SimpleSAML_Error_Exception("ASelect authentication source missing in state");
+ }
+ $authid = $state['aselect::authid'];
+ $aselect = SimpleSAML_Auth_Source::getById($authid);
+ if (is_null($aselect)) {
+ throw new SimpleSAML_Error_Exception("Could not find authentication source with id $authid");
+ }
+ $creds = $aselect->verify_credentials($server_id, $credentials, $rid);
+
+ if (array_key_exists('attributes', $creds)) {
+ $state['Attributes'] = $creds['attributes'];
+ } else {
+ $res = $creds['res'];
+ $state['Attributes'] = array('uid' => array($res['uid']), 'organization' => array($res['organization']));
+ }
+} catch (Exception $e) {
+ SimpleSAML_Auth_State::throwException($state, $e);
+}
+
+SimpleSAML_Auth_Source::completeAuth($state);
+SimpleSAML_Auth_State::throwException($state, new SimpleSAML_Error_Exception("Internal error in A-Select component"));
--
GitLab