<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
private $session;
/** @var IManagePersonalConfigValues */
private $pConfig;
+ /** @var string */
+ private $remoteAddress;
/**
* Sets the X-Account-Management-Status header
/**
* Authentication constructor.
*
- * @param IManageConfigValues $config
- * @param App\Mode $mode
- * @param App\BaseURL $baseUrl
- * @param L10n $l10n
- * @param Database $dba
- * @param LoggerInterface $logger
- * @param User\Cookie $cookie
- * @param IHandleSessions $session
- * @param IManagePersonalConfigValues $pConfig
+ * @param IManageConfigValues $config
+ * @param App\Mode $mode
+ * @param App\BaseURL $baseUrl
+ * @param L10n $l10n
+ * @param Database $dba
+ * @param LoggerInterface $logger
+ * @param User\Cookie $cookie
+ * @param IHandleSessions $session
+ * @param IManagePersonalConfigValues $pConfig
+ * @param App\Request $request
*/
- public function __construct(IManageConfigValues $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, IHandleSessions $session, IManagePersonalConfigValues $pConfig)
+ public function __construct(IManageConfigValues $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, IHandleSessions $session, IManagePersonalConfigValues $pConfig, App\Request $request)
{
- $this->config = $config;
- $this->mode = $mode;
- $this->baseUrl = $baseUrl;
- $this->l10n = $l10n;
- $this->dba = $dba;
- $this->logger = $logger;
- $this->cookie = $cookie;
- $this->session = $session;
- $this->pConfig = $pConfig;
+ $this->config = $config;
+ $this->mode = $mode;
+ $this->baseUrl = $baseUrl;
+ $this->l10n = $l10n;
+ $this->dba = $dba;
+ $this->logger = $logger;
+ $this->cookie = $cookie;
+ $this->session = $session;
+ $this->pConfig = $pConfig;
+ $this->remoteAddress = $request->getRemoteAddress();
}
/**
// Renew the cookie
$this->cookie->send();
- // Do the authentification if not done by now
+ // Do the authentication if not done by now
if (!$this->session->get('authenticated')) {
$this->setForUser($a, $user);
// already logged in user returning
$check = $this->config->get('system', 'paranoia');
// extra paranoia - if the IP changed, log them out
- if ($check && ($this->session->get('addr') != $_SERVER['REMOTE_ADDR'])) {
+ if ($check && ($this->session->get('addr') != $this->remoteAddress)) {
$this->logger->notice('Session address changed. Paranoid setting in effect, blocking session. ', [
- 'addr' => $this->session->get('addr'),
- 'remote_addr' => $_SERVER['REMOTE_ADDR']]
+ 'addr' => $this->session->get('addr'),
+ 'remote_addr' => $this->remoteAddress
+ ]
);
$this->session->clear();
$this->baseUrl->redirect();
/**
* Attempts to authenticate using login/password
*
- * @param App $a The Friendica Application context
- * @param string $username User name
- * @param string $password Clear password
- * @param bool $remember Whether to set the session remember flag
+ * @param App $a The Friendica Application context
+ * @param string $username
+ * @param string $password Clear password
+ * @param bool $remember Whether to set the session remember flag
+ * @param string $return_path The relative path to redirect the user to after authentication
*
- * @throws HttpException\InternalServerErrorException In case of Friendica internal exceptions
- * @throws Exception A general Exception (like SQL Grammar exceptions)
+ * @throws HTTPException\ForbiddenException
+ * @throws HTTPException\FoundException
+ * @throws HTTPException\InternalServerErrorException In case of Friendica internal exceptions
+ * @throws HTTPException\MovedPermanentlyException
+ * @throws HTTPException\TemporaryRedirectException
*/
- public function withPassword(App $a, string $username, string $password, bool $remember)
+ public function withPassword(App $a, string $username, string $password, bool $remember, string $return_path = '')
{
$record = null;
['uid' => User::getIdFromPasswordAuthentication($username, $password)]
);
} catch (Exception $e) {
- $this->logger->warning('authenticate: failed login attempt', ['action' => 'login', 'username' => $username, 'ip' => $_SERVER['REMOTE_ADDR']]);
+ $this->logger->warning('authenticate: failed login attempt', ['action' => 'login', 'username' => $username, 'ip' => $this->remoteAddress]);
notice($this->l10n->t('Login failed. Please check your credentials.'));
$this->baseUrl->redirect();
}
if (!$remember) {
+ $trusted = $this->cookie->get('2fa_cookie_hash') ?? null;
$this->cookie->clear();
+ if ($trusted) {
+ $this->cookie->set('2fa_cookie_hash', $trusted);
+ }
}
// if we haven't failed up this point, log them in.
$this->dba->update('user', ['openid' => $openid_identity, 'openidserver' => $openid_server], ['uid' => $record['uid']]);
}
- $this->setForUser($a, $record, true, true);
+ /**
+ * @see User::getPasswordRegExp()
+ */
+ if (PASSWORD_DEFAULT === PASSWORD_BCRYPT && strlen($password) > 72) {
+ $return_path = '/security/password_too_long?' . http_build_query(['return_path' => $return_path]);
+ }
- $return_path = $this->session->get('return_path', '');
- $this->session->remove('return_path');
+ $this->setForUser($a, $record, true, true);
$this->baseUrl->redirect($return_path);
}
* @param bool $interactive
* @param bool $login_refresh
*
+ * @throws HTTPException\FoundException
+ * @throws HTTPException\MovedPermanentlyException
+ * @throws HTTPException\TemporaryRedirectException
+ * @throws HTTPException\ForbiddenException
+
* @throws HTTPException\InternalServerErrorException In case of Friendica specific exceptions
- * @throws Exception In case of general Exceptions (like SQL Grammar exceptions)
+ *
*/
public function setForUser(App $a, array $user_record, bool $login_initial = false, bool $interactive = false, bool $login_refresh = false)
{
'page_flags' => $user_record['page-flags'],
'my_url' => $this->baseUrl->get() . '/profile/' . $user_record['nickname'],
'my_address' => $user_record['nickname'] . '@' . substr($this->baseUrl->get(), strpos($this->baseUrl->get(), '://') + 3),
- 'addr' => ($_SERVER['REMOTE_ADDR'] ?? '') ?: '0.0.0.0'
+ 'addr' => $this->remoteAddress,
]);
Session::setVisitorsContacts();
if ($login_initial) {
Hook::callAll('logged_in', $user_record);
-
- if (DI::module()->getName() !== 'home' && $this->session->exists('return_path')) {
- $this->baseUrl->redirect($this->session->get('return_path'));
- }
}
}
}
// Case 1b: Check for trusted browser
- if ($this->cookie->get('trusted')) {
+ if ($this->cookie->get('2fa_cookie_hash')) {
// Retrieve a trusted_browser model based on cookie hash
$trustedBrowserRepository = new TrustedBrowser($this->dba, $this->logger);
try {
- $trustedBrowser = $trustedBrowserRepository->selectOneByHash($this->cookie->get('trusted'));
+ $trustedBrowser = $trustedBrowserRepository->selectOneByHash($this->cookie->get('2fa_cookie_hash'));
// Verify record ownership
if ($trustedBrowser->uid === $uid) {
// Update last_used date
// Save it to the database
$trustedBrowserRepository->save($trustedBrowser);
- // Set 2fa session key and return
- $this->session->set('2fa', true);
+ // Only use this entry, if its really trusted, otherwise just update the record and proceed
+ if ($trustedBrowser->trusted) {
+ // Set 2fa session key and return
+ $this->session->set('2fa', true);
- return;
+ return;
+ }
} else {
// Invalid trusted cookie value, removing it
$this->cookie->unset('trusted');
projects / friendica.git / blobdiff