friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #7979 from Quix0r/fixes/prvKey-verus-prvkey 

Fixed prvkey causing 3rd parameter for set() method not set
This commit is contained in:
Hypolite Petovan 2019-12-20 17:23:02 -05:00 committed by GitHub
parent 6e4a428c73 a7c617cae2
commit 564952cf1a
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
src/App/Authentication.php
View File

@ -95,14 +95,14 @@ class Authentication
if ($this->dba->isResult($user)) { if ($this->dba->isResult($user)) {
if (!$this->cookie->check($data->hash, if (!$this->cookie->check($data->hash,
$user['password'] ?? '', $user['password'] ?? '',
$user['prvKey'] ?? '')) { $user['prvkey'] ?? '')) {
$this->logger->notice("Hash doesn't fit.", ['user' => $data->uid]); $this->logger->notice("Hash doesn't fit.", ['user' => $data->uid]);
$this->session->delete(); $this->session->delete();
$this->baseUrl->redirect(); $this->baseUrl->redirect();
} }
// Renew the cookie // Renew the cookie
$this->cookie->set($user['uid'], $user['password'], $user['prvKey']); $this->cookie->set($user['uid'], $user['password'], $user['prvkey']);
// Do the authentification if not done by now // Do the authentification if not done by now
if (!$this->session->get('authenticated')) { if (!$this->session->get('authenticated')) {
@ -352,7 +352,7 @@ class Authentication
*/; */;
if ($this->session->get('remember')) { if ($this->session->get('remember')) {
$a->getLogger()->info('Injecting cookie for remembered user ' . $user_record['nickname']); $a->getLogger()->info('Injecting cookie for remembered user ' . $user_record['nickname']);
$this->cookie->set($user_record['uid'], $user_record['password'], $user_record['prvKey']); $this->cookie->set($user_record['uid'], $user_record['password'], $user_record['prvkey']);
$this->session->remove('remember'); $this->session->remove('remember');
} }
} }