Merge pull request #10976 from nupplaphil/feat/api_tests

[friendica.git] / src / Security / Authentication.php

diff --git a/src/Security/Authentication.php b/src/Security/Authentication.php
index ce8bc3e3217e51b28658180d5da8d7457227cdd0..0b2fc9f9cf3d15850b7c88cd053b6608fe98cf3b 100644 (file)
--- a/src/Security/Authentication.php
+++ b/src/Security/Authentication.php
@@ -27,6 +27,7 @@ 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,7 +37,6 @@ 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 Psr\Log\LoggerInterface;
@@ -60,11 +60,23 @@ class Authentication
        private $logger;
        /** @var User\Cookie */
        private $cookie;
-       /** @var \Friendica\Core\Session\Capability\IHandleSessions */
+       /** @var IHandleSessions */
        private $session;
        /** @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.
         *
@@ -75,10 +87,10 @@ class Authentication
         * @param Database                                           $dba
         * @param LoggerInterface                                    $logger
         * @param User\Cookie                                        $cookie
-        * @param \Friendica\Core\Session\Capability\IHandleSessions $session
+        * @param IHandleSessions $session
         * @param IManagePersonalConfigValues                        $pConfig
         */
-       public function __construct(IManageConfigValues $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, Session\Capability\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)
        {
                $this->config  = $config;
                $this->mode    = $mode;
@@ -246,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();
                }
@@ -314,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']]);