X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSecurity%2FAuthentication.php;h=0b2fc9f9cf3d15850b7c88cd053b6608fe98cf3b;hb=d5703e350c6205e6ef2ef0c0e12347201909d35d;hp=c7a74395729a9206be7e37fba6b355f4aeb184c2;hpb=28090bd79376f3a7c0708eeb4e36a25fd782c240;p=friendica.git

diff --git a/src/Security/Authentication.php b/src/Security/Authentication.php
index c7a7439572..0b2fc9f9cf 100644
--- a/src/Security/Authentication.php
+++ b/src/Security/Authentication.php
@@ -23,10 +23,11 @@ namespace Friendica\Security;
 
 use Exception;
 use Friendica\App;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\Session;
+use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -36,10 +37,8 @@ use Friendica\Network\HTTPException;
 use Friendica\Security\TwoFactor\Repository\TrustedBrowser;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Strings;
 use LightOpenID;
 use Friendica\Core\L10n;
-use Friendica\Core\Logger;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -47,7 +46,7 @@ use Psr\Log\LoggerInterface;
  */
 class Authentication
 {
-	/** @var IConfig */
+	/** @var IManageConfigValues */
 	private $config;
 	/** @var App\Mode */
 	private $mode;
@@ -61,25 +60,37 @@ class Authentication
 	private $logger;
 	/** @var User\Cookie */
 	private $cookie;
-	/** @var Session\ISession */
+	/** @var IHandleSessions */
 	private $session;
-	/** @var IPConfig */
+	/** @var IManagePersonalConfigValues */
 	private $pConfig;
 
+	/**
+	 * Sets the X-Account-Management-Status header
+	 *
+	 * mainly extracted to make it overridable for tests
+	 *
+	 * @param array $user_record
+	 */
+	protected function setXAccMgmtStatusHeader(array $user_record)
+	{
+		header('X-Account-Management-Status: active; name="' . $user_record['username'] . '"; id="' . $user_record['nickname'] . '"');
+	}
+
 	/**
 	 * Authentication constructor.
 	 *
-	 * @param IConfig          $config
-	 * @param App\Mode         $mode
-	 * @param App\BaseURL      $baseUrl
-	 * @param L10n             $l10n
-	 * @param Database         $dba
-	 * @param LoggerInterface  $logger
-	 * @param User\Cookie      $cookie
-	 * @param Session\ISession $session
-	 * @param IPConfig         $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
 	 */
-	public function __construct(IConfig $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, Session\ISession $session, IPConfig $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)
 	{
 		$this->config  = $config;
 		$this->mode    = $mode;
@@ -247,7 +258,7 @@ class Authentication
 				['uid' => User::getIdFromPasswordAuthentication($username, $password)]
 			);
 		} catch (Exception $e) {
-			$this->logger->warning('authenticate: failed login attempt', ['action' => 'login', 'username' => Strings::escapeTags($username), 'ip' => $_SERVER['REMOTE_ADDR']]);
+			$this->logger->warning('authenticate: failed login attempt', ['action' => 'login', 'username' => $username, 'ip' => $_SERVER['REMOTE_ADDR']]);
 			notice($this->l10n->t('Login failed. Please check your credentials.'));
 			$this->baseUrl->redirect();
 		}
@@ -306,7 +317,6 @@ class Authentication
 		$this->session->set('new_member', time() < ($member_since + (60 * 60 * 24 * 14)));
 
 		if (strlen($user_record['timezone'])) {
-			date_default_timezone_set($user_record['timezone']);
 			$a->setTimeZone($user_record['timezone']);
 		}
 
@@ -316,7 +326,7 @@ class Authentication
 			$this->session->set('cid', $contact['id']);
 		}
 
-		header('X-Account-Management-Status: active; name="' . $user_record['username'] . '"; id="' . $user_record['nickname'] . '"');
+		$this->setXAccMgmtStatusHeader($user_record);
 
 		if ($login_initial || $login_refresh) {
 			$this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $user_record['uid']]);
@@ -353,8 +363,8 @@ class Authentication
 			}
 		}
 
-		$a->setUserId($user_record['uid']);
-		$a->setNickname($user_record['nickname']);
+		$a->setLoggedInUserId($user_record['uid']);
+		$a->setLoggedInUserNickname($user_record['nickname']);
 
 		if ($login_initial) {
 			Hook::callAll('logged_in', $user_record);