MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: fixes various issues with the certauth

pull/2469/head
iglocska 2017-09-07 00:06:02 +02:00
parent cfd73aec0a
commit 9c9048422a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Plugin/CertAuth/Controller/Component/Auth/CertificateAuthenticate.php
View File

@ -170,7 +170,8 @@ class CertificateAuthenticate extends BaseAuthenticate
self::$user = $this->User->getAuthUser($existingUser['User']['id']); self::$user = $this->User->getAuthUser($existingUser['User']['id']);
if (isset(self::$user['gpgkey'])) unset(self::$user['gpgkey']); if (isset(self::$user['gpgkey'])) unset(self::$user['gpgkey']);
} else if ($sync && !empty(self::$user)) { } else if ($sync && !empty(self::$user)) {
$org=null; $org = isset(self::$client['org']) ? self::$client['org'] : null;
if ($org == null) return false;
if (!isset(self::$user['org_id']) && isset(self::$user['org'])) { if (!isset(self::$user['org_id']) && isset(self::$user['org'])) {
self::$user['org_id'] = $this->User->Organisation->createOrgFromName($org, 0, true); self::$user['org_id'] = $this->User->Organisation->createOrgFromName($org, 0, true);
unset(self::$user['org']); unset(self::$user['org']);
@ -192,7 +193,6 @@ class CertificateAuthenticate extends BaseAuthenticate
} }
} }
} }
return self::$user; return self::$user;
} }