Cleanup for medals, because it does mater :-)

RiperFr · Apr 10, 2016 · 87b919c · 87b919c
1 parent d69f5bc
commit 87b919c
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 63 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
diff --git a/Exception/ADConnexionException.php b/Exception/ADConnexionException.php
@@ -7,4 +7,4 @@
 class ADConnexionException extends \Exception
 {
 
-}
+}
diff --git a/Exception/WrongTokenException.php b/Exception/WrongTokenException.php
@@ -4,4 +4,4 @@
 class WrongTokenException extends \Exception
 {
 
-}
+}
diff --git a/README.md b/README.md
@@ -4,6 +4,16 @@ Riper/Security/ActiveDirectory
 This package is a bundle for Symfony 2. It uses the standard form_login security model to authenticate user from an Active Directory domain.
 It uses LDAP as communication layer, so you need the LDAP extension installed on your server to make it work.
 
+
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/RiperFr/Security-ActiveDirectoryBundle/badges/quality-score.png?b=v2.x)](https://scrutinizer-ci.com/g/RiperFr/Security-ActiveDirectoryBundle/?branch=v2.x)
+![License CC-BY-4](https://img.shields.io/badge/licence-CC--BY--4.0-blue.svg)
+![php version](https://img.shields.io/badge/php->=5.3.0,%205.4,%205.5,%205.6,%207-blue.svg)
+![symfony version](https://img.shields.io/badge/symfony-2.6,%202.7,%202.8,%203-blue.svg)
+
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/3628b49a-0ab1-4412-94cf-328809040af1/big.png)](https://insight.sensiolabs.com/projects/3628b49a-0ab1-4412-94cf-328809040af1)
+
+
+
 Requirements
 ----------------
 php 5.3.0

diff --git a/Resources/translations/messages.de.yml b/Resources/translations/messages.de.yml
@@ -2,4 +2,4 @@ riper.security.active_directory.invalid_user: "Der Benutzername ist ungültig :
 riper.security.active_directory.wrong_credential: "Benutzername oder Passwort falsch"
 riper.security.active_directory.username_not_matching_rules: "Der Benutzername \"%username%\" entspricht nicht der Benutzernamenrichtlinie"
 riper.security.active_directory.ad.bad_response: "Unerwartete Antwort vom Active Directory Server : %connection_status% - %is_AD%"
-riper.security.active_directory.bad_instance: "Instanz von \"%class_name%\" nicht unterstützt"
+riper.security.active_directory.bad_instance: "Instanz von \"%class_name%\" nicht unterstützt"
diff --git a/Resources/translations/messages.en.yml b/Resources/translations/messages.en.yml
@@ -2,4 +2,4 @@ riper.security.active_directory.invalid_user: "The username is invalid : \"%reas
 riper.security.active_directory.wrong_credential: "Bad credentials"
 riper.security.active_directory.username_not_matching_rules: "The username \"%username%\" does not match the username policy"
 riper.security.active_directory.ad.bad_response: "Bad response from the Active Directory server : %connection_status% - %is_AD%"
-riper.security.active_directory.bad_instance: "Instance of \"%class_name%\" is not suported."
+riper.security.active_directory.bad_instance: "Instance of \"%class_name%\" is not suported."
diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
@@ -2,4 +2,4 @@ riper.security.active_directory.invalid_user: "Le login est invalid : \"%reason%
 riper.security.active_directory.wrong_credential: "Identifiants erronés"
 riper.security.active_directory.username_not_matching_rules: "Le login \"%username%\" ne correspond à aucune règle"
 riper.security.active_directory.ad.bad_response: "L'Active Directory ne repond pas : %connection_status% - %is_AD%"
-riper.security.active_directory.bad_instance: "Les instance \"%class_name%\" ne sont pas suportées"
+riper.security.active_directory.bad_instance: "Les instance \"%class_name%\" ne sont pas suportées"
diff --git a/Security/Factory/AdAuthFactory.php b/Security/Factory/AdAuthFactory.php
@@ -2,13 +2,10 @@
 
 namespace Riper\Security\ActiveDirectoryBundle\Security\Factory;
 
-use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\FormLoginFactory;
-use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 
 class AdAuthFactory extends FormLoginFactory
 {

diff --git a/Security/Factory/AdldapFactory.php b/Security/Factory/AdldapFactory.php
@@ -41,4 +41,4 @@ public function getAuthenticatedAdLdap()
         $adldap->authenticate($token->getUsername(), $token->getCredentials());
     }
 
-}
+}
diff --git a/Security/Token/FaultyToken.php b/Security/Token/FaultyToken.php
@@ -16,4 +16,4 @@ public function eraseCredentials()
     {
 
     }
-}
+}
diff --git a/Security/User/AdUser.php b/Security/User/AdUser.php
@@ -12,10 +12,7 @@ class AdUser implements UserInterface
     /** @var string */
     private $password;
 
-    /** @var string */
-    private $salt;
-
-    /** @var string */
+    /** @var array */
     private $roles;
 
     /** @var string */
@@ -28,7 +25,6 @@ public function __construct($username, $password, array $roles)
     {
         $this->username = $username;
         $this->password = $password;
-        $this->salt = '';
         $this->roles = $roles;
     }
 

diff --git a/Security/User/AdUserProvider.php b/Security/User/AdUserProvider.php
@@ -180,27 +180,9 @@ public function fetchData(AdUser $adUser, TokenInterface $token, adLDAP $adLdap)
         }
         /** @var adLDAPUserCollection $user */
         $user = $adLdap->user()->infoCollection($adUser->getUsername());
-        //$userInfo = $adLdap->user_info($this->username);
 
         if ($user) {
-            $groups = array();
-            //$allGroups = $adLdap->search_groups(ADLDAP_SECURITY_GLOBAL_GROUP,true);
             $groups = $adLdap->user()->groups($adUser->getUsername(), $this->recursiveGrouproles);
-            /*if ($this->recursiveGrouproles == true) {
-                // get recursive groups via adLdap
-                $groups = $adLdap->user()->groups($adUser->getUsername(), true);
-            } else {
-                foreach ($user->memberOf as $k => $group) {
-                    if ($k !== 'count' && $group) {
-                        $reg = '#CN=([^,]*)#';
-                        preg_match_all($reg, $group, $out);
-                        $groups[] = $out[1][0];
-                        /*if(array_key_exists($out[1][0],$allGroups)){
-                             $groups[$out[1][0]] = $allGroups[$out[1][0]];
-                         }*/
-                    /*}
-                }
-            }*/
             /** End Fetching */
             $sfRoles = array();
             $sfRolesTemp = array();
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ @@
     class ADConnexionException extends \Exception
     {
-    }
+    }