tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 23:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Let external auth win over session auth and session auth over http auth

Browse Source 
refs #9660
This commit is contained in:
Eric Lippmann 2015-07-30 14:50:05 +02:00
parent 9060e8a034
commit feed927fd2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/Icinga/Authentication/Auth.php
View File

@ -87,14 +87,13 @@ class Auth
*/ */
public function isAuthenticated($ignoreSession = false) public function isAuthenticated($ignoreSession = false)
{ {
if ($this->user === null if ($this->user === null && ! $ignoreSession) {
&& ! $this->authHttp()
&& ! $this->authExternal()
&& ! $ignoreSession
) {
$this->authenticateFromSession(); $this->authenticateFromSession();
} }
return $this->user !== null; if ($this->user === null && ! $this->authExternal()) {
return $this->authHttp();
}
return true;
} }
public function setAuthenticated(User $user, $persist = true) public function setAuthenticated(User $user, $persist = true)