fix vulnerabilities and fix import ldap group

Probesys · Jun 9, 2023 · 4d21eb3 · 4d21eb3
1 parent f76d57f
commit 4d21eb3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/src/Command/LDAPImportCommand.php b/app/src/Command/LDAPImportCommand.php
@@ -146,7 +146,7 @@ private function importUsers() {
     private function importGroups(): void {
 
         $mailAttribute = $this->connector->getLdapEmailField();
-        $realNameAttribute = $this->connector->getLdapRealNameField();
+        $realNameAttribute = $this->connector->getLdapGroupNameField();
         $groupMemberAttribute = $this->connector->getLdapGroupMemberField();
 
         if ($this->connector->getLdapGroupFilter()) {
@@ -177,6 +177,8 @@ private function importGroups(): void {
                     $isNew = true;
                     $priorityMax++;
                 }
+//                dump($realNameAttribute);
+//                dd($ldapGroup);
                 $group->setName($ldapGroup->getAttribute($realNameAttribute)[0]);
                 $group->setOriginConnector($this->connector);
                 $this->em->persist($group);

diff --git a/app/src/Entity/User.php b/app/src/Entity/User.php
@@ -230,7 +230,7 @@ public function setPassword(string $password): self
         return $this;
     }
 
-    public function getRoles()
+    public function getRoles(): array
     {
         $roles = json_decode($this->roles);
 

diff --git a/app/src/Security/LoginFormAuthenticator.php b/app/src/Security/LoginFormAuthenticator.php
@@ -1,6 +1,8 @@
 <?php
 
 namespace App\Security;
+//use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface;
+
 
 use App\Entity\User;
 use App\Service\LdapService;
@@ -22,7 +24,6 @@
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\Credentials\PasswordCredentials;
 use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
-use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport;
 use Symfony\Component\Security\Http\Util\TargetPathTrait;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -63,7 +64,7 @@ public function __construct(
         $this->ldapService = $ldapService;
     }
 
-    public function authenticate(Request $request): PassportInterface {
+    public function authenticate(Request $request): Passport {
 
         $username = $request->request->get('username', '');
         $csrf_token = $request->request->get('_csrf_token', '');