mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23925 from nextcloud/backport/23920/stable19 

[stable19] Bearer must be in the start of the auth header
This commit is contained in:
Roeland Jago Douma 2020-11-06 13:05:17 +01:00 committed by GitHub
parent ae99412cba d24ca17168
commit 848170bee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/User/Session.php
View File

@ -807,15 +807,15 @@ class Session implements IUserSession, Emitter {
*/ */
public function tryTokenLogin(IRequest $request) { public function tryTokenLogin(IRequest $request) {
$authHeader = $request->getHeader('Authorization'); $authHeader = $request->getHeader('Authorization');
if (strpos($authHeader, 'Bearer ') === false) { if (strpos($authHeader, 'Bearer ') === 0) {
$token = substr($authHeader, 7);
} else {
// No auth header, let's try session id // No auth header, let's try session id
try { try {
$token = $this->session->getId(); $token = $this->session->getId();
} catch (SessionNotAvailableException $ex) { } catch (SessionNotAvailableException $ex) {
return false; return false;
} }
} else {
$token = substr($authHeader, 7);
} }
if (!$this->loginWithToken($token)) { if (!$this->loginWithToken($token)) {