use Friendica\DI;
use Friendica\Model\User;
use Friendica\Network\HTTPException;
+use Friendica\Security\TwoFactor\Repository\TrustedBrowser;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
*/
public function withSession(App $a)
{
- $data = $this->cookie->getData();
-
// When the "Friendica" cookie is set, take the value to authenticate and renew the cookie.
- if (isset($data->uid)) {
-
+ if ($this->cookie->get('uid')) {
$user = $this->dba->selectFirst(
'user',
[],
[
- 'uid' => $data->uid,
+ 'uid' => $this->cookie->get('uid'),
'blocked' => false,
'account_expired' => false,
'account_removed' => false,
]
);
if ($this->dba->isResult($user)) {
- if (!$this->cookie->check($data->hash,
+ if (!$this->cookie->comparePrivateDataHash($this->cookie->get('hash'),
$user['password'] ?? '',
- $user['prvkey'] ?? '')) {
- $this->logger->notice("Hash doesn't fit.", ['user' => $data->uid]);
+ $user['prvkey'] ?? '')
+ ) {
+ $this->logger->notice("Hash doesn't fit.", ['user' => $this->cookie->get('uid')]);
$this->session->clear();
$this->cookie->clear();
$this->baseUrl->redirect();
}
// Renew the cookie
- $this->cookie->set($user['uid'], $user['password'], $user['prvkey']);
+ $this->cookie->send();
// Do the authentification if not done by now
if (!$this->session->get('authenticated')) {
$this->setForUser($a, $user);
if ($this->config->get('system', 'paranoia')) {
- $this->session->set('addr', $data->ip);
+ $this->session->set('addr', $this->cookie->get('ip'));
}
}
}
*/
if ($this->session->get('remember')) {
$this->logger->info('Injecting cookie for remembered user ' . $user_record['nickname']);
- $this->cookie->set($user_record['uid'], $user_record['password'], $user_record['prvkey']);
+ $this->cookie->setMultiple([
+ 'uid' => $user_record['uid'],
+ 'hash' => $this->cookie->hashPrivateData($user_record['password'], $user_record['prvkey']),
+ ]);
$this->session->remove('remember');
}
}
- $this->twoFactorCheck($user_record['uid'], $a);
+ $this->redirectForTwoFactorAuthentication($user_record['uid'], $a);
if ($interactive) {
if ($user_record['login_date'] <= DBA::NULL_DATETIME) {
}
/**
+ * Decides whether to redirect the user to two-factor authentication.
+ * All return calls in this method skip two-factor authentication
+ *
* @param int $uid The User Identified
* @param App $a The Friendica Application context
*
* @throws HTTPException\ForbiddenException In case the two factor authentication is forbidden (e.g. for AJAX calls)
+ * @throws HTTPException\InternalServerErrorException
*/
- private function twoFactorCheck(int $uid, App $a)
+ private function redirectForTwoFactorAuthentication(int $uid, App $a)
{
// Check user setting, if 2FA disabled return
if (!$this->pConfig->get($uid, '2fa', 'verified')) {
return;
}
- // Check current path, if 2fa authentication module return
+ // Check current path, if public or 2fa module return
if ($a->argc > 0 && in_array($a->argv[0], ['2fa', 'view', 'help', 'api', 'proxy', 'logout'])) {
return;
}
- // Case 1: 2FA session present and valid: return
+ // Case 1a: 2FA session already present: return
if ($this->session->get('2fa')) {
return;
}
+ // Case 1b: Check for trusted browser
+ if ($this->cookie->get('trusted')) {
+ // Retrieve a trusted_browser model based on cookie hash
+ $trustedBrowserRepository = new TrustedBrowser($this->dba, $this->logger);
+ try {
+ $trustedBrowser = $trustedBrowserRepository->selectOneByHash($this->cookie->get('trusted'));
+ // Verify record ownership
+ if ($trustedBrowser->uid === $uid) {
+ // Update last_used date
+ $trustedBrowser->recordUse();
+
+ // Save it to the database
+ $trustedBrowserRepository->save($trustedBrowser);
+
+ // Set 2fa session key and return
+ $this->session->set('2fa', true);
+
+ return;
+ } else {
+ // Invalid trusted cookie value, removing it
+ $this->cookie->unset('trusted');
+ }
+ } catch (\Throwable $e) {
+ // Local trusted browser record was probably removed by the user, we carry on with 2FA
+ }
+ }
+
// Case 2: No valid 2FA session: redirect to code verification page
if ($this->mode->isAjax()) {
throw new HTTPException\ForbiddenException();