kaliop-uk / ezidentitymanagementbundle

ezpublish_legacy/identitymanagementextension/login_handler/ezremoteuserloginuser.php

Doc Comments +4 added lines

@@ -30,6 +30,10 @@
         }
     }
 
+    /**
+     * @param string $login
+     * @param string $password
+     */
     protected static function _loginUser( $login, $password, $authenticationMatch = false )
     {
         $fwName = eZINI::instance('identitymanagement.ini')->variable('GeneralSettings', 'FirewallName');

Spacing +8 added lines, -8 removed lines

@@ -14,23 +14,23 @@ 
      * @param bool $authenticationMatch
      * @return bool|mixed
      */
-    static function loginUser( $login, $password, $authenticationMatch = false )
+    static function loginUser($login, $password, $authenticationMatch = false)
     {
-        $user = self::_loginUser( $login, $password, $authenticationMatch );
+        $user = self::_loginUser($login, $password, $authenticationMatch);
 
-        if ( is_object( $user ) )
+        if (is_object($user))
         {
-            self::loginSucceeded( $user );
+            self::loginSucceeded($user);
             return $user;
         }
         else
         {
-            self::loginFailed( $user, $login );
+            self::loginFailed($user, $login);
             return false;
         }
     }
 
-    protected static function _loginUser( $login, $password, $authenticationMatch = false )
+    protected static function _loginUser($login, $password, $authenticationMatch = false)
     {
         $fwName = eZINI::instance('identitymanagement.ini')->variable('GeneralSettings', 'FirewallName');
 
@@ -60,10 +60,10 @@ 
 
             return self::fetch($user->id);
 
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             /// @todo make it easier to tell apart system error from user errors such as bad password...
 
-            eZDebug::writeError($e->getMessage(), __METHOD__ );
+            eZDebug::writeError($e->getMessage(), __METHOD__);
 
             return false;
         }

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
         {
             self::loginSucceeded( $user );
             return $user;
-        }
-        else
+        } else
         {
             self::loginFailed( $user, $login );
             return false;

Security/User/Provider/RemoteUser.php

Unused Use Statements -3 removed lines

@@ -3,15 +3,12 @@
 namespace Kaliop\IdentityManagementBundle\Security\User\Provider;
 
 use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Kaliop\IdentityManagementBundle\Security\User\AMSUser as UserClass;
 use Kaliop\IdentityManagementBundle\Security\User\RemoteUserProviderInterface;
 use Kaliop\IdentityManagementBundle\Security\User\RemoteUser as KaliopRemoteUser;
 use Kaliop\IdentityManagementBundle\Security\User\RemoteUserHandlerInterface;
 use eZ\Publish\Core\MVC\Symfony\Security\User\APIUserProviderInterface;
-use eZ\Publish\Core\MVC\Symfony\Security\User as eZMVCUser;
 use Psr\Log\LoggerInterface;
 
 class RemoteUser implements UserProviderInterface, RemoteUserProviderInterface

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
             }
 
         } catch (\Exception $e) {
-            if ($this->logger) $this->logger->error("Unexpected error while finding/creating/updating repo user from data gotten from remote service: " . $e->getMessage());
+            if ($this->logger) $this->logger->error("Unexpected error while finding/creating/updating repo user from data gotten from remote service: ".$e->getMessage());
             throw $e;
         }
 

Braces +3 added lines, -1 removed lines

@@ -108,7 +108,9 @@
             }
 
         } catch (\Exception $e) {
-            if ($this->logger) $this->logger->error("Unexpected error while finding/creating/updating repo user from data gotten from remote service: " . $e->getMessage());
+            if ($this->logger) {
+                $this->logger->error("Unexpected error while finding/creating/updating repo user from data gotten from remote service: " . $e->getMessage());
+            }
             throw $e;
         }
 

Security/User/RemoteUserHandler.php

Unused Use Statements -2 removed lines

@@ -4,8 +4,6 @@
 
 use Kaliop\IdentityManagementBundle\Adapter\ClientInterface;
 use eZ\Publish\API\Repository\Repository;
-use eZ\Publish\API\Repository\Values\Content\Query;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
 use eZ\Publish\API\Repository\Values\User\User;
 use eZ\Publish\API\Repository\Exceptions\NotFoundException;
 

Spacing +5 added lines, -5 removed lines

@@ -134,7 +134,7 @@ 
                         $newUserGroups = $this->getGroupsFromProfile($profile);
                         $currentUserGroups = $userService->loadUserGroupsOfUser($eZUser);
                         $groupsToRemove = array();
-                        foreach($currentUserGroups as $currentUserGroup) {
+                        foreach ($currentUserGroups as $currentUserGroup) {
                             if (!array_key_exists($currentUserGroup->id, $newUserGroups)) {
                                 $groupsToRemove[] = $currentUserGroup;
                             } else {
@@ -164,7 +164,7 @@ 
 
     protected function getRemoteIdFromProfile($profile)
     {
-        return $this->remoteIdPrefix . $this->profileHash($profile);
+        return $this->remoteIdPrefix.$this->profileHash($profile);
     }
 
     /**
@@ -211,7 +211,7 @@ 
      * @param string $prefix
      * @return string
      */
-    protected function createTempFile($data, $prefix='')
+    protected function createTempFile($data, $prefix = '')
     {
         $imageFileName = trim(tempnam(sys_get_temp_dir(), $prefix), '.');
         file_put_contents($imageFileName, $data);
@@ -226,7 +226,7 @@ 
     protected function cleanUpAfterUserCreation()
     {
         foreach ($this->tempFiles as $fileName) {
-            if (is_file( $fileName))
+            if (is_file($fileName))
                 unlink($fileName);
         }
     }
@@ -237,7 +237,7 @@ 
     protected function cleanUpAfterUserUpdate()
     {
         foreach ($this->tempFiles as $fileName) {
-            if (is_file( $fileName))
+            if (is_file($fileName))
                 unlink($fileName);
         }
     }

Braces +7 added lines, -6 removed lines

@@ -52,8 +52,7 @@ 
         try
         {
             return $this->repository->getUserService()->loadUserByLogin($remoteUser->getUsername());
-        }
-        catch (NotFoundException $e)
+        } catch (NotFoundException $e)
         {
             return false;
         }
@@ -226,8 +225,9 @@ 
     protected function cleanUpAfterUserCreation()
     {
         foreach ($this->tempFiles as $fileName) {
-            if (is_file( $fileName))
-                unlink($fileName);
+            if (is_file( $fileName)) {
+                            unlink($fileName);
+            }
         }
     }
 
@@ -237,8 +237,9 @@ 
     protected function cleanUpAfterUserUpdate()
     {
         foreach ($this->tempFiles as $fileName) {
-            if (is_file( $fileName))
-                unlink($fileName);
+            if (is_file( $fileName)) {
+                            unlink($fileName);
+            }
         }
     }
 }

DependencyInjection/KaliopIdentityManagementExtension.php

Spacing +2 added lines, -2 removed lines

@@ -24,10 +24,10 @@
     {
         $loader = new YamlFileLoader(
             $container,
-            new FileLocator( __DIR__ . '/../Resources/config' )
+            new FileLocator(__DIR__.'/../Resources/config')
         );
 
         // New services
-        $loader->load( 'services.yml' );
+        $loader->load('services.yml');
     }
 }

Adapter/LDAP/RemoteUser.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
      *       Note that the list of attributes gotten from ladp is decided by settings for the client class...
      * @todo store the password salted and encrypted in memory instead of plaintext
      */
-    public function __construct($authUserResult, $emailField, $login, $password='')
+    public function __construct($authUserResult, $emailField, $login, $password = '')
     {
         $this->username = $login;
         $this->password = $password;
@@ -71,7 +71,7 @@ 
      */
     protected function ldap2array($data) {
         //return $data;
-        foreach($data as $key => $value) {
+        foreach ($data as $key => $value) {
             if ($key === 'dn') {
                 continue;
             }

Adapter/LDAP/Client.php

Spacing +2 added lines, -2 removed lines

@@ -91,14 +91,14 @@
             }
 
             if ($search['count'] > 1) {
-                if ($this->logger) $this->logger->warning('More than one ldap account found for ' . $username);
+                if ($this->logger) $this->logger->warning('More than one ldap account found for '.$username);
 
                 throw new AuthenticationServiceException('More than one user found');
             }
 
             // always carry out this check, as the data is needed to log in
             if (!isset($this->settings['ldap_login_attribute']) || !isset($search[0][$this->settings['ldap_login_attribute']][0])) {
-                if ($this->logger) $this->logger->info("Authentication failed for user: '$username', missing attribute used to log in to ldap: " . @$this->settings['ldap_login_attribute']);
+                if ($this->logger) $this->logger->info("Authentication failed for user: '$username', missing attribute used to log in to ldap: ".@$this->settings['ldap_login_attribute']);
 
                 throw new AuthenticationServiceException('Invalid user profile: missing ldap attribute needed for log-in');
             }

Braces +39 added lines, -13 removed lines

@@ -48,7 +48,9 @@ 
      */
     public function authenticateUser($username, $password)
     {
-        if ($this->logger) $this->logger->info("Looking up remote user: '$username'");
+        if ($this->logger) {
+            $this->logger->info("Looking up remote user: '$username'");
+        }
 
         $ldaps = is_array($this->ldap) ? array_values($this->ldap) : array($this->ldap);
         $i = 0;
@@ -69,36 +71,48 @@ 
                 }
 
             } catch (ConnectionException $e) {
-                if ($this->logger) $this->logger->error(sprintf('Connection error "%s"', $e->getMessage()));
+                if ($this->logger) {
+                    $this->logger->error(sprintf('Connection error "%s"', $e->getMessage()));
+                }
 
                 if ($i < count($ldaps)) {
-                    if ($this->logger) $this->logger->error("Connecting to ldap server $i");
+                    if ($this->logger) {
+                        $this->logger->error("Connecting to ldap server $i");
+                    }
                     continue;
                 }
 
                 /// @todo shall we log an error ?
                 throw new AuthenticationServiceException(sprintf('Connection error "%s"', $e->getMessage()), 0, $e);
             } catch (\Exception $e) {
-                if ($this->logger) $this->logger->error(sprintf('Unexpected error "%s"', $e->getMessage()));
+                if ($this->logger) {
+                    $this->logger->error(sprintf('Unexpected error "%s"', $e->getMessage()));
+                }
 
                 throw new AuthenticationServiceException(sprintf('Internal error "%s"', $e->getMessage()), 0, $e);
             }
 
             if (!$search) {
-                if ($this->logger) $this->logger->info("User not found");
+                if ($this->logger) {
+                    $this->logger->info("User not found");
+                }
 
                 throw new BadCredentialsException(sprintf('User "%s" not found.', $username));
             }
 
             if ($search['count'] > 1) {
-                if ($this->logger) $this->logger->warning('More than one ldap account found for ' . $username);
+                if ($this->logger) {
+                    $this->logger->warning('More than one ldap account found for ' . $username);
+                }
 
                 throw new AuthenticationServiceException('More than one user found');
             }
 
             // always carry out this check, as the data is needed to log in
             if (!isset($this->settings['ldap_login_attribute']) || !isset($search[0][$this->settings['ldap_login_attribute']][0])) {
-                if ($this->logger) $this->logger->info("Authentication failed for user: '$username', missing attribute used to log in to ldap: " . @$this->settings['ldap_login_attribute']);
+                if ($this->logger) {
+                    $this->logger->info("Authentication failed for user: '$username', missing attribute used to log in to ldap: " . @$this->settings['ldap_login_attribute']);
+                }
 
                 throw new AuthenticationServiceException('Invalid user profile: missing ldap attribute needed for log-in');
             }
@@ -106,29 +120,41 @@ 
             try {
                 $this->validateLdapResults($search[0]);
             } catch (\Exception $e) {
-                if ($this->logger) $this->logger->warning("Invalid user profile for user: '$username': ".$e->getMessage());
+                if ($this->logger) {
+                    $this->logger->warning("Invalid user profile for user: '$username': ".$e->getMessage());
+                }
 
                 throw new AuthenticationServiceException('Invalid user profile: '.$e->getMessage());
             }
 
-            if ($this->logger) $this->logger->info("Remote user found, attempting authentication for user: '$username'");
+            if ($this->logger) {
+                $this->logger->info("Remote user found, attempting authentication for user: '$username'");
+            }
 
             try {
                 $ldap->bind($search[0][$this->settings['ldap_login_attribute']][0], $password);
             } catch (ConnectionException $e) {
-                if ($this->logger) $this->logger->info("Authentication failed for user: '$username', bind failed: ".$e->getMessage());
+                if ($this->logger) {
+                    $this->logger->info("Authentication failed for user: '$username', bind failed: ".$e->getMessage());
+                }
                 throw new BadCredentialsException('The presented password is invalid.');
             } catch (\Exception $e) {
-                if ($this->logger) $this->logger->info("Authentication failed for user: '$username', unexpected ldap error: ".$e->getMessage());
+                if ($this->logger) {
+                    $this->logger->info("Authentication failed for user: '$username', unexpected ldap error: ".$e->getMessage());
+                }
                 throw new AuthenticationServiceException('Unexpected exception: '.$e->getMessage());
             }
 
-            if ($this->logger) $this->logger->info("Authentication succeeded for user: '$username'");
+            if ($this->logger) {
+                $this->logger->info("Authentication succeeded for user: '$username'");
+            }
 
             // allow ldap to give us back the actual login field to be used in eZ. It might be different because of dashes, spaces, case...
             if (isset($this->settings['login_attribute']) && isset($search[0][$this->settings['login_attribute']][0])) {
                 if ($username != $search[0][$this->settings['login_attribute']][0]) {
-                    if ($this->logger) $this->logger->info("Renamed user '$username' to '{$search[0][$this->settings['login_attribute']][0]}'");
+                    if ($this->logger) {
+                        $this->logger->info("Renamed user '$username' to '{$search[0][$this->settings['login_attribute']][0]}'");
+                    }
 
                     $username = $search[0][$this->settings['login_attribute']][0];
                 }

Traits/User.php

Spacing +4 added lines, -4 removed lines

@@ -9,13 +9,13 @@
     protected $securityToken = null;
 
     protected function isAuthenticated() {
-        if( $this->securityToken == null ) {
-            $securityToken = $this->container->get( 'security.token_storage' )->getToken();
-            if( $securityToken instanceof TokenInterface ) {
+        if ($this->securityToken == null) {
+            $securityToken = $this->container->get('security.token_storage')->getToken();
+            if ($securityToken instanceof TokenInterface) {
                 $this->securityToken = $securityToken;
             }
         }
 
-        return $this->securityToken->isAuthenticated() === true && count( $this->securityToken->getRoles() );
+        return $this->securityToken->isAuthenticated() === true && count($this->securityToken->getRoles());
     }
 }

Security/Authentication/Provider/RemoteUserAuthenticationProvider.php

Spacing +2 added lines, -2 removed lines

@@ -156,10 +156,10 @@
                 //$user = $this->userProvider->loadUserByUsername($username);
                 return $user;
 
-            } catch(AuthenticationException $e) {
+            } catch (AuthenticationException $e) {
                 // let through any exception of the expected authentication type
                 throw $e;
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 // we mask any internal, unexpected error from the Client
                 /// @todo we should log a message here: the Client used an unexpected exception type...
                 /// @tood we should really be using an AuthenticationServiceException here

ezpublish_legacy/identitymanagementextension/settings/site.ini.append.php

Indentation +1 added lines, -5 removed lines

@@ -1,5 +1,1 @@
-<?php /*
-
-[UserSettings]
-ExtensionDirectory[]=identitymanagementextension
-LoginHandler[]=RemoteUserLogin
\ No newline at end of file
+<?php 
\ No newline at end of file

Switch Indentation +1 added lines, -5 removed lines

@@ -1,5 +1,1 @@
-<?php /*
-
-[UserSettings]
-ExtensionDirectory[]=identitymanagementextension
-LoginHandler[]=RemoteUserLogin
\ No newline at end of file
+<?php 
\ No newline at end of file

Spacing +1 added lines, -5 removed lines

@@ -1,5 +1,1 @@
-<?php /*
-
-[UserSettings]
-ExtensionDirectory[]=identitymanagementextension
-LoginHandler[]=RemoteUserLogin
\ No newline at end of file
+<?php 
\ No newline at end of file

Braces +1 added lines, -5 removed lines

@@ -1,5 +1,1 @@
-<?php /*
-
-[UserSettings]
-ExtensionDirectory[]=identitymanagementextension
-LoginHandler[]=RemoteUserLogin
\ No newline at end of file
+<?php 
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -5 removed lines

@@ -1,5 +1,1 @@
-<?php /*
-
-[UserSettings]
-ExtensionDirectory[]=identitymanagementextension
-LoginHandler[]=RemoteUserLogin
\ No newline at end of file
+<?php 
\ No newline at end of file