PSR-12

Author: tvdijen

lib/Auth/Source/Negotiate.php

@@ -2,15 +2,14 @@
 
 namespace SimpleSAML\Module\negotiate\Auth\Source;
 
-use \SimpleSAML\Logger;
+use SimpleSAML\Logger;
 
 /**
  * The Negotiate module. Allows for password-less, secure login by Kerberos and Negotiate.
  *
  * @author Mathias Meisfjordskar, University of Oslo <[email protected]>
  * @package SimpleSAMLphp
  */
-
 class Negotiate extends \SimpleSAML\Auth\Source
 {
     // Constants used in the module
@@ -132,9 +131,10 @@ public function authenticate(&$state)
         $session = \SimpleSAML\Session::getSessionFromRequest();
         $disabled = $session->getData('negotiate:disable', 'session');
 
-        if ($disabled ||
-            (!empty($_COOKIE['NEGOTIATE_AUTOLOGIN_DISABLE_PERMANENT']) &&
-                $_COOKIE['NEGOTIATE_AUTOLOGIN_DISABLE_PERMANENT'] == 'True')
+        if (
+            $disabled
+            || (!empty($_COOKIE['NEGOTIATE_AUTOLOGIN_DISABLE_PERMANENT'])
+                && $_COOKIE['NEGOTIATE_AUTOLOGIN_DISABLE_PERMANENT'] == 'True')
         ) {
             Logger::debug('Negotiate - session disabled. falling back');
             $this->fallBack($state);
@@ -174,22 +174,22 @@ public function authenticate(&$state)
             try {
                 $reply = $auth->doAuthentication();
             } catch (\Exception $e) {
-                Logger::error('Negotiate - authenticate(): doAuthentication() exception: '.$e->getMessage());
+                Logger::error('Negotiate - authenticate(): doAuthentication() exception: ' . $e->getMessage());
                 $reply = null;
             }
 
             if ($reply) {
                 // success! krb TGS received
                 $user = $auth->getAuthenticatedUser();
-                Logger::info('Negotiate - authenticate(): '.$user.' authenticated.');
+                Logger::info('Negotiate - authenticate(): ' . $user . ' authenticated.');
                 $lookup = $this->lookupUserData($user);
                 if ($lookup !== null) {
                     $state['Attributes'] = $lookup;
                     // Override the backend so logout will know what to look for
                     $state['LogoutState'] = [
                         'negotiate:backend' => null,
                     ];
-                    Logger::info('Negotiate - authenticate(): '.$user.' authorized.');
+                    Logger::info('Negotiate - authenticate(): ' . $user . ' authorized.');
                     \SimpleSAML\Auth\Source::completeAuth($state);
                     // Never reached.
                     assert(false);
@@ -202,7 +202,7 @@ public function authenticate(&$state)
             // No auth token. Send it.
             Logger::debug('Negotiate - authenticate(): Sending Negotiate.');
             // Save the $state array, so that we can restore if after a redirect
-            Logger::debug('Negotiate - fallback: '.$state['LogoutState']['negotiate:backend']);
+            Logger::debug('Negotiate - fallback: ' . $state['LogoutState']['negotiate:backend']);
             $id = \SimpleSAML\Auth\State::saveState($state, self::STAGEID);
             $params = ['AuthState' => $id];
 
@@ -255,11 +255,11 @@ public function checkMask()
         foreach ($this->subnet as $cidr) {
             $ret = \SimpleSAML\Utils\Net::ipCIDRcheck($cidr);
             if ($ret) {
-                Logger::debug('Negotiate: Client "'.$ip.'" matched subnet.');
+                Logger::debug('Negotiate: Client "' . $ip . '" matched subnet.');
                 return true;
             }
         }
-        Logger::debug('Negotiate: Client "'.$ip.'" did not match subnet.');
+        Logger::debug('Negotiate: Client "' . $ip . '" did not match subnet.');
         return false;
     }
 
@@ -342,7 +342,7 @@ protected function lookupUserData($user)
             $dn = $this->ldap->searchfordn($this->base, $this->attr, $uid);
             return $this->ldap->getAttributes($dn, $this->attributes);
         } catch (\SimpleSAML\Error\Exception $e) {
-            Logger::debug('Negotiate - ldap lookup failed: '.$e);
+            Logger::debug('Negotiate - ldap lookup failed: ' . $e);
             return null;
         }
     }
@@ -361,11 +361,12 @@ protected function adminBind()
             // no admin user
             return;
         }
-        Logger::debug('Negotiate - authenticate(): Binding as system user '.var_export($this->admin_user, true));
+        Logger::debug('Negotiate - authenticate(): Binding as system user ' . var_export($this->admin_user, true));
 
         if (!$this->ldap->bind($this->admin_user, $this->admin_pw)) {
-            $msg = 'Unable to authenticate system user (LDAP_INVALID_CREDENTIALS) '.var_export($this->admin_user, true);
-            Logger::error('Negotiate - authenticate(): '.$msg);
+            $msg = 'Unable to authenticate system user (LDAP_INVALID_CREDENTIALS) '
+                . var_export($this->admin_user, true);
+            Logger::error('Negotiate - authenticate(): ' . $msg);
             throw new \SimpleSAML\Error\AuthSource('negotiate', $msg);
         }
     }
@@ -385,7 +386,7 @@ public function logout(&$state)
         assert(is_array($state));
         // get the source that was used to authenticate
         $authId = $state['negotiate:backend'];
-        Logger::debug('Negotiate - logout has the following authId: "'.$authId.'"');
+        Logger::debug('Negotiate - logout has the following authId: "' . $authId . '"');
 
         if ($authId === null) {
             $session = \SimpleSAML\Session::getSessionFromRequest();

templates/disable.php

@@ -7,6 +7,7 @@
  *         <[email protected]>
  * @package SimpleSAMLphp
  */
+
 $this->includeAtTemplateBase('includes/header.php');
 ?>
 <h1><?php echo $this->t('{negotiate:negotiate:disable_title}'); ?></h1>

templates/enable.php

@@ -7,6 +7,7 @@
  *         <[email protected]>
  * @package SimpleSAMLphp
  */
+
 $this->includeAtTemplateBase('includes/header.php');
 ?>
 <h1><?php echo $this->t('{negotiate:negotiate:enable_title}'); ?></h1>

tests/bootstrap.php

@@ -1,10 +1,10 @@
 <?php
 
 $projectRoot = dirname(__DIR__);
-require_once($projectRoot.'/vendor/autoload.php');
+require_once($projectRoot . '/vendor/autoload.php');
 
 // Symlink module into ssp vendor lib so that templates and urls can resolve correctly
-$linkPath = $projectRoot.'/vendor/simplesamlphp/simplesamlphp/modules/negotiate';
+$linkPath = $projectRoot . '/vendor/simplesamlphp/simplesamlphp/modules/negotiate';
 if (file_exists($linkPath) === false) {
     echo "Linking '$linkPath' to '$projectRoot'\n";
     symlink($projectRoot, $linkPath);

www/backend.php

@@ -12,7 +12,7 @@
     $_REQUEST['AuthState'],
     \SimpleSAML\Module\negotiate\Auth\Source\Negotiate::STAGEID
 );
-\SimpleSAML\Logger::debug('backend - fallback: '.$state['LogoutState']['negotiate:backend']);
+\SimpleSAML\Logger::debug('backend - fallback: ' . $state['LogoutState']['negotiate:backend']);
 
 \SimpleSAML\Module\negotiate\Auth\Source\Negotiate::fallBack($state);
 

www/disable.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Mathias Meisfjordskar, University of Oslo.
  *         <[email protected]>

www/enable.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Mathias Meisfjordskar, University of Oslo.
  *         <[email protected]>

www/retry.php

@@ -20,7 +20,7 @@
 if (isset($idpmeta['auth'])) {
     $source = \SimpleSAML\Auth\Source::getById($idpmeta['auth']);
     if ($source === null) {
-        throw new \SimpleSAML\Error\BadRequest('Invalid AuthId "'.$idpmeta['auth'].'" - not found.');
+        throw new \SimpleSAML\Error\BadRequest('Invalid AuthId "' . $idpmeta['auth'] . '" - not found.');
     }
 
     $session = \SimpleSAML\Session::getSessionFromRequest();