kaliop-uk / ezidentitymanagementbundle

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

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;
 

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);
+            }
         }
     }
 }

Adapter/LDAP/Client.php

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];
                 }

ezpublish_legacy/identitymanagementextension/login_handler/ezremoteuserloginuser.php

Braces +1 added lines, -2 removed lines

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

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

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

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

Braces +1 added lines, -7 removed lines

@@ -1,7 +1,1 @@
-<?php /*
-
-[GeneralSettings]
-# The name of the firewall set in security.yml, connected to the 'remoteuser_login'
-# NB: even if the fw is used for the front sites, we use it to handle log in in the backoffice. No need to rename it or
-# to create a custom firewall
-FirewallName=ezpublish_front
+<?php 
\ No newline at end of file