stwalkerster / waca

includes/Exceptions/AccessDeniedException.php

Indentation +89 added lines, -89 removed lines

@@ -26,93 +26,93 @@
  */
 class AccessDeniedException extends ReadableException
 {
-    use NavigationMenuAccessControl;
-
-    /** @var SecurityManager */
-    private $securityManager;
-    /** @var DomainAccessManager */
-    private $domainAccessManager;
-
-    /**
-     * AccessDeniedException constructor.
-     *
-     * @param SecurityManager     $securityManager
-     * @param DomainAccessManager $domainAccessManager
-     */
-    public function __construct(SecurityManager $securityManager, DomainAccessManager $domainAccessManager)
-    {
-        $this->securityManager = $securityManager;
-        $this->domainAccessManager = $domainAccessManager;
-    }
-
-    public function getReadableError()
-    {
-        if (!headers_sent()) {
-            header("HTTP/1.1 403 Forbidden");
-        }
-
-        $this->setUpSmarty();
-
-        // uck. We should still be able to access the database in this situation though.
-        $database = PdoDatabase::getDatabaseConnection('acc');
-        $currentUser = User::getCurrent($database);
-        $this->assign('currentUser', $currentUser);
-        $this->assign('currentDomain', Domain::getCurrent($database));
-
-        if ($this->securityManager !== null) {
-            $this->setupNavMenuAccess($currentUser);
-        }
-
-        if ($currentUser->isDeclined()) {
-            $this->assign('htmlTitle', 'Account Declined');
-            $this->assign('declineReason', $this->getLogEntry('Declined', $currentUser, $database));
-
-            return $this->fetchTemplate("exception/account-declined.tpl");
-        }
-
-        if ($currentUser->isSuspended()) {
-            $this->assign('htmlTitle', 'Account Suspended');
-            $this->assign('suspendReason', $this->getLogEntry('Suspended', $currentUser, $database));
-
-            return $this->fetchTemplate("exception/account-suspended.tpl");
-        }
-
-        if ($currentUser->isNewUser()) {
-            $this->assign('htmlTitle', 'Account Pending');
-
-            return $this->fetchTemplate("exception/account-new.tpl");
-        }
-
-        return $this->fetchTemplate("exception/access-denied.tpl");
-    }
-
-    /**
-     * @param string      $action
-     * @param User        $user
-     * @param PdoDatabase $database
-     *
-     * @return null|string
-     */
-    private function getLogEntry($action, User $user, PdoDatabase $database)
-    {
-        /** @var Log[] $logs */
-        $logs = LogSearchHelper::get($database)
-            ->byAction($action)
-            ->byObjectType('User')
-            ->byObjectId($user->getId())
-            ->limit(1)
-            ->fetch();
-
-        return $logs[0]->getComment();
-    }
-
-    protected function getSecurityManager(): SecurityManager
-    {
-        return $this->securityManager;
-    }
-
-    public function getDomainAccessManager(): DomainAccessManager
-    {
-        return $this->domainAccessManager;
-    }
+	use NavigationMenuAccessControl;
+
+	/** @var SecurityManager */
+	private $securityManager;
+	/** @var DomainAccessManager */
+	private $domainAccessManager;
+
+	/**
+	 * AccessDeniedException constructor.
+	 *
+	 * @param SecurityManager     $securityManager
+	 * @param DomainAccessManager $domainAccessManager
+	 */
+	public function __construct(SecurityManager $securityManager, DomainAccessManager $domainAccessManager)
+	{
+		$this->securityManager = $securityManager;
+		$this->domainAccessManager = $domainAccessManager;
+	}
+
+	public function getReadableError()
+	{
+		if (!headers_sent()) {
+			header("HTTP/1.1 403 Forbidden");
+		}
+
+		$this->setUpSmarty();
+
+		// uck. We should still be able to access the database in this situation though.
+		$database = PdoDatabase::getDatabaseConnection('acc');
+		$currentUser = User::getCurrent($database);
+		$this->assign('currentUser', $currentUser);
+		$this->assign('currentDomain', Domain::getCurrent($database));
+
+		if ($this->securityManager !== null) {
+			$this->setupNavMenuAccess($currentUser);
+		}
+
+		if ($currentUser->isDeclined()) {
+			$this->assign('htmlTitle', 'Account Declined');
+			$this->assign('declineReason', $this->getLogEntry('Declined', $currentUser, $database));
+
+			return $this->fetchTemplate("exception/account-declined.tpl");
+		}
+
+		if ($currentUser->isSuspended()) {
+			$this->assign('htmlTitle', 'Account Suspended');
+			$this->assign('suspendReason', $this->getLogEntry('Suspended', $currentUser, $database));
+
+			return $this->fetchTemplate("exception/account-suspended.tpl");
+		}
+
+		if ($currentUser->isNewUser()) {
+			$this->assign('htmlTitle', 'Account Pending');
+
+			return $this->fetchTemplate("exception/account-new.tpl");
+		}
+
+		return $this->fetchTemplate("exception/access-denied.tpl");
+	}
+
+	/**
+	 * @param string      $action
+	 * @param User        $user
+	 * @param PdoDatabase $database
+	 *
+	 * @return null|string
+	 */
+	private function getLogEntry($action, User $user, PdoDatabase $database)
+	{
+		/** @var Log[] $logs */
+		$logs = LogSearchHelper::get($database)
+			->byAction($action)
+			->byObjectType('User')
+			->byObjectId($user->getId())
+			->limit(1)
+			->fetch();
+
+		return $logs[0]->getComment();
+	}
+
+	protected function getSecurityManager(): SecurityManager
+	{
+		return $this->securityManager;
+	}
+
+	public function getDomainAccessManager(): DomainAccessManager
+	{
+		return $this->domainAccessManager;
+	}
 }
\ No newline at end of file

includes/Validation/ValidationError.php

Indentation +92 added lines, -92 removed lines

@@ -12,102 +12,102 @@
 
 class ValidationError
 {
-    const NAME_EMPTY = "name_empty";
-    const NAME_TOO_LONG = "name_too_long";
-    const NAME_EXISTS = "name_exists";
-    const NAME_EXISTS_SUL = "name_exists_sul";
-    const NAME_NUMONLY = "name_numonly";
-    const NAME_INVALIDCHAR = "name_invalidchar";
-    const NAME_SANITISED = "name_sanitised";
-    const NAME_IP = "name_ip";
-    const EMAIL_EMPTY = "email_empty";
-    const EMAIL_WIKIMEDIA = "email_wikimedia";
-    const EMAIL_INVALID = "email_invalid";
-    const EMAIL_MISMATCH = "email_mismatch";
-    const OPEN_REQUEST_NAME = "open_request_name";
-    const BANNED = "banned";
-    const BANNED_TOR = "banned_tor";
-    /**
-     * @var array Error text for the above
-     */
-    private static $errorText = array(
-        self::NAME_EMPTY        => 'You\'ve not chosen a username!',
-        self::NAME_TOO_LONG     => 'Your chosen username is too long. Please choose a shorter one.',
-        self::NAME_EXISTS       => 'I\'m sorry, but the username you selected is already taken. Please try another. '
-            . 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore '
-            . '[[User:example]] would become [[User:Example]].',
-        self::NAME_EXISTS_SUL   => 'I\'m sorry, but the username you selected is already taken. Please try another. '
-            . 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore '
-            . '[[User:example]] would become [[User:Example]].',
-        self::NAME_NUMONLY      => 'The username you chose is invalid: it consists entirely of numbers. Please retry '
-            . 'with a valid username.',
-        self::NAME_INVALIDCHAR  => 'There appears to be an invalid character in your username. Please note that the '
-            . 'following characters are not allowed: <code># @ / &lt; &gt; [ ] | { }</code>',
-        self::NAME_SANITISED    => 'Your requested username has been automatically adjusted due to technical '
-            . 'restrictions. Underscores have been replaced with spaces, and the first character has been capitalised.',
-        self::NAME_IP           => 'The username you chose is invalid: it cannot be an IP address',
-        self::EMAIL_EMPTY       => 'You need to supply an email address.',
-        self::EMAIL_WIKIMEDIA   => 'Please provide your email address here.',
-        self::EMAIL_INVALID     => 'Invalid E-mail address supplied. Please check you entered it correctly.',
-        self::EMAIL_MISMATCH    => 'The email addresses you entered do not match. Please try again.',
-        self::OPEN_REQUEST_NAME => 'There is already an open request with this name in this system.',
-        self::BANNED            => 'Sorry, you are currently banned from requesting accounts using this tool.',
-        self::BANNED_TOR        => 'Tor exit nodes are currently banned from using this tool due to excessive abuse. '
-            . 'Please note that Tor is also currently banned from editing Wikipedia.',
-    );
-    /**
-     * Summary of $errorCode
-     * @var string
-     */
-    private $errorCode;
-    /**
-     * Summary of $isError
-     * @var bool
-     */
-    private $isError;
+	const NAME_EMPTY = "name_empty";
+	const NAME_TOO_LONG = "name_too_long";
+	const NAME_EXISTS = "name_exists";
+	const NAME_EXISTS_SUL = "name_exists_sul";
+	const NAME_NUMONLY = "name_numonly";
+	const NAME_INVALIDCHAR = "name_invalidchar";
+	const NAME_SANITISED = "name_sanitised";
+	const NAME_IP = "name_ip";
+	const EMAIL_EMPTY = "email_empty";
+	const EMAIL_WIKIMEDIA = "email_wikimedia";
+	const EMAIL_INVALID = "email_invalid";
+	const EMAIL_MISMATCH = "email_mismatch";
+	const OPEN_REQUEST_NAME = "open_request_name";
+	const BANNED = "banned";
+	const BANNED_TOR = "banned_tor";
+	/**
+	 * @var array Error text for the above
+	 */
+	private static $errorText = array(
+		self::NAME_EMPTY        => 'You\'ve not chosen a username!',
+		self::NAME_TOO_LONG     => 'Your chosen username is too long. Please choose a shorter one.',
+		self::NAME_EXISTS       => 'I\'m sorry, but the username you selected is already taken. Please try another. '
+			. 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore '
+			. '[[User:example]] would become [[User:Example]].',
+		self::NAME_EXISTS_SUL   => 'I\'m sorry, but the username you selected is already taken. Please try another. '
+			. 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore '
+			. '[[User:example]] would become [[User:Example]].',
+		self::NAME_NUMONLY      => 'The username you chose is invalid: it consists entirely of numbers. Please retry '
+			. 'with a valid username.',
+		self::NAME_INVALIDCHAR  => 'There appears to be an invalid character in your username. Please note that the '
+			. 'following characters are not allowed: <code># @ / &lt; &gt; [ ] | { }</code>',
+		self::NAME_SANITISED    => 'Your requested username has been automatically adjusted due to technical '
+			. 'restrictions. Underscores have been replaced with spaces, and the first character has been capitalised.',
+		self::NAME_IP           => 'The username you chose is invalid: it cannot be an IP address',
+		self::EMAIL_EMPTY       => 'You need to supply an email address.',
+		self::EMAIL_WIKIMEDIA   => 'Please provide your email address here.',
+		self::EMAIL_INVALID     => 'Invalid E-mail address supplied. Please check you entered it correctly.',
+		self::EMAIL_MISMATCH    => 'The email addresses you entered do not match. Please try again.',
+		self::OPEN_REQUEST_NAME => 'There is already an open request with this name in this system.',
+		self::BANNED            => 'Sorry, you are currently banned from requesting accounts using this tool.',
+		self::BANNED_TOR        => 'Tor exit nodes are currently banned from using this tool due to excessive abuse. '
+			. 'Please note that Tor is also currently banned from editing Wikipedia.',
+	);
+	/**
+	 * Summary of $errorCode
+	 * @var string
+	 */
+	private $errorCode;
+	/**
+	 * Summary of $isError
+	 * @var bool
+	 */
+	private $isError;
 
-    /**
-     * Summary of __construct
-     *
-     * @param string $errorCode
-     * @param bool   $isError
-     */
-    public function __construct($errorCode, $isError = true)
-    {
-        $this->errorCode = $errorCode;
-        $this->isError = $isError;
-    }
+	/**
+	 * Summary of __construct
+	 *
+	 * @param string $errorCode
+	 * @param bool   $isError
+	 */
+	public function __construct($errorCode, $isError = true)
+	{
+		$this->errorCode = $errorCode;
+		$this->isError = $isError;
+	}
 
-    /**
-     * Summary of getErrorCode
-     * @return string
-     */
-    public function getErrorCode()
-    {
-        return $this->errorCode;
-    }
+	/**
+	 * Summary of getErrorCode
+	 * @return string
+	 */
+	public function getErrorCode()
+	{
+		return $this->errorCode;
+	}
 
-    /**
-     * @return string
-     * @throws Exception
-     */
-    public function getErrorMessage()
-    {
-        $text = self::$errorText[$this->errorCode];
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getErrorMessage()
+	{
+		$text = self::$errorText[$this->errorCode];
 
-        if ($text == null) {
-            throw new Exception('Unknown validation error');
-        }
+		if ($text == null) {
+			throw new Exception('Unknown validation error');
+		}
 
-        return $text;
-    }
+		return $text;
+	}
 
-    /**
-     * Summary of isError
-     * @return bool
-     */
-    public function isError()
-    {
-        return $this->isError;
-    }
+	/**
+	 * Summary of isError
+	 * @return bool
+	 */
+	public function isError()
+	{
+		return $this->isError;
+	}
 }

includes/Validation/RequestValidationHelper.php

Indentation +422 added lines, -422 removed lines

@@ -31,426 +31,426 @@
  */
 class RequestValidationHelper
 {
-    /** @var IBanHelper */
-    private $banHelper;
-    /** @var PdoDatabase */
-    private $database;
-    /** @var IAntiSpoofProvider */
-    private $antiSpoofProvider;
-    /** @var IXffTrustProvider */
-    private $xffTrustProvider;
-    /** @var HttpHelper */
-    private $httpHelper;
-    /**
-     * @var string
-     */
-    private $mediawikiApiEndpoint;
-    private $titleBlacklistEnabled;
-    /**
-     * @var TorExitProvider
-     */
-    private $torExitProvider;
-    /**
-     * @var SiteConfiguration
-     */
-    private $siteConfiguration;
-
-    private $validationRemoteTimeout = 5000;
-
-    /**
-     * Summary of __construct
-     *
-     * @param IBanHelper         $banHelper
-     * @param PdoDatabase        $database
-     * @param IAntiSpoofProvider $antiSpoofProvider
-     * @param IXffTrustProvider  $xffTrustProvider
-     * @param HttpHelper         $httpHelper
-     * @param TorExitProvider    $torExitProvider
-     * @param SiteConfiguration  $siteConfiguration
-     */
-    public function __construct(
-        IBanHelper $banHelper,
-        PdoDatabase $database,
-        IAntiSpoofProvider $antiSpoofProvider,
-        IXffTrustProvider $xffTrustProvider,
-        HttpHelper $httpHelper,
-        TorExitProvider $torExitProvider,
-        SiteConfiguration $siteConfiguration
-    ) {
-        $this->banHelper = $banHelper;
-        $this->database = $database;
-        $this->antiSpoofProvider = $antiSpoofProvider;
-        $this->xffTrustProvider = $xffTrustProvider;
-        $this->httpHelper = $httpHelper;
-
-        // FIXME: domains!
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $database);
-
-        $this->mediawikiApiEndpoint = $domain->getWikiApiPath();
-        $this->titleBlacklistEnabled = $siteConfiguration->getTitleBlacklistEnabled();
-        $this->torExitProvider = $torExitProvider;
-        $this->siteConfiguration = $siteConfiguration;
-    }
-
-    /**
-     * Summary of validateName
-     *
-     * @param Request $request
-     *
-     * @return ValidationError[]
-     */
-    public function validateName(Request $request)
-    {
-        $errorList = array();
-
-        // ERRORS
-        // name is empty
-        if (trim($request->getName()) == "") {
-            $errorList[ValidationError::NAME_EMPTY] = new ValidationError(ValidationError::NAME_EMPTY);
-        }
-
-        // name is too long
-        if (mb_strlen(trim($request->getName())) > 500) {
-            $errorList[ValidationError::NAME_EMPTY] = new ValidationError(ValidationError::NAME_TOO_LONG);
-        }
-
-        // username already exists
-        if ($this->userExists($request)) {
-            $errorList[ValidationError::NAME_EXISTS] = new ValidationError(ValidationError::NAME_EXISTS);
-        }
-
-        // username part of SUL account
-        if ($this->userSulExists($request)) {
-            // using same error slot as name exists - it's the same sort of error, and we probably only want to show one.
-            $errorList[ValidationError::NAME_EXISTS] = new ValidationError(ValidationError::NAME_EXISTS_SUL);
-        }
-
-        // username is numbers
-        if (preg_match("/^[0-9]+$/", $request->getName()) === 1) {
-            $errorList[ValidationError::NAME_NUMONLY] = new ValidationError(ValidationError::NAME_NUMONLY);
-        }
-
-        // username can't contain #@/<>[]|{}
-        if (preg_match("/[" . preg_quote("#@/<>[]|{}", "/") . "]/", $request->getName()) === 1) {
-            $errorList[ValidationError::NAME_INVALIDCHAR] = new ValidationError(ValidationError::NAME_INVALIDCHAR);
-        }
-
-        // username is an IP
-        if (filter_var($request->getName(), FILTER_VALIDATE_IP)) {
-            $errorList[ValidationError::NAME_IP] = new ValidationError(ValidationError::NAME_IP);
-        }
-
-        // existing non-closed request for this name
-        if ($this->nameRequestExists($request)) {
-            $errorList[ValidationError::OPEN_REQUEST_NAME] = new ValidationError(ValidationError::OPEN_REQUEST_NAME);
-        }
-
-        return $errorList;
-    }
-
-    /**
-     * Summary of validateEmail
-     *
-     * @param Request $request
-     * @param string  $emailConfirmation
-     *
-     * @return ValidationError[]
-     */
-    public function validateEmail(Request $request, $emailConfirmation)
-    {
-        $errorList = array();
-
-        // ERRORS
-
-        // email addresses must match
-        if ($request->getEmail() != $emailConfirmation) {
-            $errorList[ValidationError::EMAIL_MISMATCH] = new ValidationError(ValidationError::EMAIL_MISMATCH);
-        }
-
-        // email address must be validly formed
-        if (trim($request->getEmail()) == "") {
-            $errorList[ValidationError::EMAIL_EMPTY] = new ValidationError(ValidationError::EMAIL_EMPTY);
-        }
-
-        // email address must be validly formed
-        if (!filter_var($request->getEmail(), FILTER_VALIDATE_EMAIL)) {
-            if (trim($request->getEmail()) != "") {
-                $errorList[ValidationError::EMAIL_INVALID] = new ValidationError(ValidationError::EMAIL_INVALID);
-            }
-        }
-
-        // email address can't be wikimedia/wikipedia .com/org
-        if (preg_match('/.*@.*wiki(m.dia|p.dia)\.(org|com)/i', $request->getEmail()) === 1) {
-            $errorList[ValidationError::EMAIL_WIKIMEDIA] = new ValidationError(ValidationError::EMAIL_WIKIMEDIA);
-        }
-
-        return $errorList;
-    }
-
-    /**
-     * Summary of validateOther
-     *
-     * @param Request $request
-     *
-     * @return ValidationError[]
-     */
-    public function validateOther(Request $request)
-    {
-        $errorList = array();
-
-        $trustedIp = $this->xffTrustProvider->getTrustedClientIp($request->getIp(),
-            $request->getForwardedIp());
-
-        // ERRORS
-
-        // TOR nodes
-        if ($this->torExitProvider->isTorExit($trustedIp)) {
-            $errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED_TOR);
-        }
-
-        // Bans
-        if ($this->banHelper->isBlockBanned($request)) {
-            $errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED);
-        }
-
-        return $errorList;
-    }
-
-    public function postSaveValidations(Request $request)
-    {
-        // Antispoof check
-        $this->checkAntiSpoof($request);
-
-        // Blacklist check
-        $this->checkTitleBlacklist($request);
-
-        // Add comment for form override
-        $this->formOverride($request);
-
-        $bans = $this->banHelper->getBans($request);
-
-        foreach ($bans as $ban) {
-            if ($ban->getAction() == Ban::ACTION_DROP) {
-                $request->setStatus(RequestStatus::CLOSED);
-                $request->save();
-
-                Logger::closeRequest($request->getDatabase(), $request, 0, null);
-
-                $comment = new Comment();
-                $comment->setDatabase($this->database);
-                $comment->setRequest($request->getId());
-                $comment->setVisibility('user');
-                $comment->setUser(null);
-
-                $comment->setComment('Request dropped automatically due to matching rule.');
-                $comment->save();
-            }
-
-            if ($ban->getAction() == Ban::ACTION_DEFER) {
-                /** @var RequestQueue|false $targetQueue */
-                $targetQueue = RequestQueue::getById($ban->getTargetQueue(), $this->database);
-
-                if ($targetQueue === false ) {
-                    $comment = new Comment();
-                    $comment->setDatabase($this->database);
-                    $comment->setRequest($request->getId());
-                    $comment->setVisibility('user');
-                    $comment->setUser(null);
-
-                    $comment->setComment("This request would have been deferred automatically due to a matching rule, but the queue to defer to could not be found.");
-                    $comment->save();
-                }
-                else {
-                    $this->deferRequest($request, $targetQueue, 'Request deferred automatically due to matching rule.');
-                }
-            }
-        }
-    }
-
-    private function checkAntiSpoof(Request $request)
-    {
-        try {
-            if (count($this->antiSpoofProvider->getSpoofs($request->getName())) > 0) {
-                // If there were spoofs an Admin should handle the request.
-                // FIXME: domains!
-                $defaultQueue = RequestQueue::getDefaultQueue($this->database, 1, RequestQueue::DEFAULT_ANTISPOOF);
-                $this->deferRequest($request, $defaultQueue,
-                    'Request automatically deferred due to AntiSpoof hit');
-            }
-        }
-        catch (Exception $ex) {
-            $skippable = [
-                'Encountered error while getting result: Contains unassigned character',
-                'Encountered error while getting result: Contains incompatible mixed scripts',
-                'Encountered error while getting result: Does not contain any letters'
-            ];
-
-            $skip = false;
-
-            foreach ($skippable as $s) {
-                if (strpos($ex->getMessage(), $s) !== false) {
-                    $skip = true;
-                    break;
-                }
-            }
-
-            // Only log to disk if this *isn't* a "skippable" error.
-            if (!$skip) {
-                ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
-            }
-        }
-    }
-
-    private function checkTitleBlacklist(Request $request)
-    {
-        if ($this->titleBlacklistEnabled == 1) {
-            try {
-                $apiResult = $this->httpHelper->get(
-                    $this->mediawikiApiEndpoint,
-                    array(
-                        'action'       => 'titleblacklist',
-                        'tbtitle'      => $request->getName(),
-                        'tbaction'     => 'new-account',
-                        'tbnooverride' => true,
-                        'format'       => 'php',
-                    ),
-                    [],
-                    $this->validationRemoteTimeout
-                );
-
-                $data = unserialize($apiResult);
-
-                $requestIsOk = $data['titleblacklist']['result'] == "ok";
-            }
-            catch (CurlException $ex) {
-                ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
-
-                // Don't kill the request, just assume it's fine. Humans can deal with it later.
-                return;
-            }
-
-            if (!$requestIsOk) {
-                // FIXME: domains!
-                $defaultQueue = RequestQueue::getDefaultQueue($this->database, 1, RequestQueue::DEFAULT_TITLEBLACKLIST);
-
-                $this->deferRequest($request, $defaultQueue,
-                    'Request automatically deferred due to title blacklist hit');
-            }
-        }
-    }
-
-    private function userExists(Request $request)
-    {
-        try {
-            $userExists = $this->httpHelper->get(
-                $this->mediawikiApiEndpoint,
-                array(
-                    'action'  => 'query',
-                    'list'    => 'users',
-                    'ususers' => $request->getName(),
-                    'format'  => 'php',
-                ),
-                [],
-                $this->validationRemoteTimeout
-            );
-
-            $ue = unserialize($userExists);
-            if (!isset ($ue['query']['users']['0']['missing']) && isset ($ue['query']['users']['0']['userid'])) {
-                return true;
-            }
-        }
-        catch (CurlException $ex) {
-            ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
-
-            // Don't kill the request, just assume it's fine. Humans can deal with it later.
-            return false;
-        }
-
-        return false;
-    }
-
-    private function userSulExists(Request $request)
-    {
-        $requestName = $request->getName();
-
-        try {
-            $userExists = $this->httpHelper->get(
-                $this->mediawikiApiEndpoint,
-                array(
-                    'action'  => 'query',
-                    'meta'    => 'globaluserinfo',
-                    'guiuser' => $requestName,
-                    'format'  => 'php',
-                ),
-                [],
-                $this->validationRemoteTimeout
-            );
-
-            $ue = unserialize($userExists);
-            if (isset ($ue['query']['globaluserinfo']['id'])) {
-                return true;
-            }
-        }
-        catch (CurlException $ex) {
-            ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
-
-            // Don't kill the request, just assume it's fine. Humans can deal with it later.
-            return false;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if a request with this name is currently open
-     *
-     * @param Request $request
-     *
-     * @return bool
-     */
-    private function nameRequestExists(Request $request)
-    {
-        $query = "SELECT COUNT(id) FROM request WHERE status != 'Closed' AND name = :name;";
-        $statement = $this->database->prepare($query);
-        $statement->execute(array(':name' => $request->getName()));
-
-        if (!$statement) {
-            return false;
-        }
-
-        return $statement->fetchColumn() > 0;
-    }
-
-    private function deferRequest(Request $request, RequestQueue $targetQueue, $deferComment): void
-    {
-        $request->setQueue($targetQueue->getId());
-        $request->save();
-
-        $logTarget = $targetQueue->getLogName();
-
-        Logger::deferRequest($this->database, $request, $logTarget);
-
-        $comment = new Comment();
-        $comment->setDatabase($this->database);
-        $comment->setRequest($request->getId());
-        $comment->setVisibility('user');
-        $comment->setUser(null);
-
-        $comment->setComment($deferComment);
-        $comment->save();
-    }
-
-    private function formOverride(Request $request)
-    {
-        $form = $request->getOriginFormObject();
-        if($form === null || $form->getOverrideQueue() === null) {
-            return;
-        }
-
-        /** @var RequestQueue $targetQueue */
-        $targetQueue = RequestQueue::getById($form->getOverrideQueue(), $request->getDatabase());
-
-        $this->deferRequest($request, $targetQueue, 'Request deferred automatically due to request submission through a request form with a default queue set.');
-    }
+	/** @var IBanHelper */
+	private $banHelper;
+	/** @var PdoDatabase */
+	private $database;
+	/** @var IAntiSpoofProvider */
+	private $antiSpoofProvider;
+	/** @var IXffTrustProvider */
+	private $xffTrustProvider;
+	/** @var HttpHelper */
+	private $httpHelper;
+	/**
+	 * @var string
+	 */
+	private $mediawikiApiEndpoint;
+	private $titleBlacklistEnabled;
+	/**
+	 * @var TorExitProvider
+	 */
+	private $torExitProvider;
+	/**
+	 * @var SiteConfiguration
+	 */
+	private $siteConfiguration;
+
+	private $validationRemoteTimeout = 5000;
+
+	/**
+	 * Summary of __construct
+	 *
+	 * @param IBanHelper         $banHelper
+	 * @param PdoDatabase        $database
+	 * @param IAntiSpoofProvider $antiSpoofProvider
+	 * @param IXffTrustProvider  $xffTrustProvider
+	 * @param HttpHelper         $httpHelper
+	 * @param TorExitProvider    $torExitProvider
+	 * @param SiteConfiguration  $siteConfiguration
+	 */
+	public function __construct(
+		IBanHelper $banHelper,
+		PdoDatabase $database,
+		IAntiSpoofProvider $antiSpoofProvider,
+		IXffTrustProvider $xffTrustProvider,
+		HttpHelper $httpHelper,
+		TorExitProvider $torExitProvider,
+		SiteConfiguration $siteConfiguration
+	) {
+		$this->banHelper = $banHelper;
+		$this->database = $database;
+		$this->antiSpoofProvider = $antiSpoofProvider;
+		$this->xffTrustProvider = $xffTrustProvider;
+		$this->httpHelper = $httpHelper;
+
+		// FIXME: domains!
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $database);
+
+		$this->mediawikiApiEndpoint = $domain->getWikiApiPath();
+		$this->titleBlacklistEnabled = $siteConfiguration->getTitleBlacklistEnabled();
+		$this->torExitProvider = $torExitProvider;
+		$this->siteConfiguration = $siteConfiguration;
+	}
+
+	/**
+	 * Summary of validateName
+	 *
+	 * @param Request $request
+	 *
+	 * @return ValidationError[]
+	 */
+	public function validateName(Request $request)
+	{
+		$errorList = array();
+
+		// ERRORS
+		// name is empty
+		if (trim($request->getName()) == "") {
+			$errorList[ValidationError::NAME_EMPTY] = new ValidationError(ValidationError::NAME_EMPTY);
+		}
+
+		// name is too long
+		if (mb_strlen(trim($request->getName())) > 500) {
+			$errorList[ValidationError::NAME_EMPTY] = new ValidationError(ValidationError::NAME_TOO_LONG);
+		}
+
+		// username already exists
+		if ($this->userExists($request)) {
+			$errorList[ValidationError::NAME_EXISTS] = new ValidationError(ValidationError::NAME_EXISTS);
+		}
+
+		// username part of SUL account
+		if ($this->userSulExists($request)) {
+			// using same error slot as name exists - it's the same sort of error, and we probably only want to show one.
+			$errorList[ValidationError::NAME_EXISTS] = new ValidationError(ValidationError::NAME_EXISTS_SUL);
+		}
+
+		// username is numbers
+		if (preg_match("/^[0-9]+$/", $request->getName()) === 1) {
+			$errorList[ValidationError::NAME_NUMONLY] = new ValidationError(ValidationError::NAME_NUMONLY);
+		}
+
+		// username can't contain #@/<>[]|{}
+		if (preg_match("/[" . preg_quote("#@/<>[]|{}", "/") . "]/", $request->getName()) === 1) {
+			$errorList[ValidationError::NAME_INVALIDCHAR] = new ValidationError(ValidationError::NAME_INVALIDCHAR);
+		}
+
+		// username is an IP
+		if (filter_var($request->getName(), FILTER_VALIDATE_IP)) {
+			$errorList[ValidationError::NAME_IP] = new ValidationError(ValidationError::NAME_IP);
+		}
+
+		// existing non-closed request for this name
+		if ($this->nameRequestExists($request)) {
+			$errorList[ValidationError::OPEN_REQUEST_NAME] = new ValidationError(ValidationError::OPEN_REQUEST_NAME);
+		}
+
+		return $errorList;
+	}
+
+	/**
+	 * Summary of validateEmail
+	 *
+	 * @param Request $request
+	 * @param string  $emailConfirmation
+	 *
+	 * @return ValidationError[]
+	 */
+	public function validateEmail(Request $request, $emailConfirmation)
+	{
+		$errorList = array();
+
+		// ERRORS
+
+		// email addresses must match
+		if ($request->getEmail() != $emailConfirmation) {
+			$errorList[ValidationError::EMAIL_MISMATCH] = new ValidationError(ValidationError::EMAIL_MISMATCH);
+		}
+
+		// email address must be validly formed
+		if (trim($request->getEmail()) == "") {
+			$errorList[ValidationError::EMAIL_EMPTY] = new ValidationError(ValidationError::EMAIL_EMPTY);
+		}
+
+		// email address must be validly formed
+		if (!filter_var($request->getEmail(), FILTER_VALIDATE_EMAIL)) {
+			if (trim($request->getEmail()) != "") {
+				$errorList[ValidationError::EMAIL_INVALID] = new ValidationError(ValidationError::EMAIL_INVALID);
+			}
+		}
+
+		// email address can't be wikimedia/wikipedia .com/org
+		if (preg_match('/.*@.*wiki(m.dia|p.dia)\.(org|com)/i', $request->getEmail()) === 1) {
+			$errorList[ValidationError::EMAIL_WIKIMEDIA] = new ValidationError(ValidationError::EMAIL_WIKIMEDIA);
+		}
+
+		return $errorList;
+	}
+
+	/**
+	 * Summary of validateOther
+	 *
+	 * @param Request $request
+	 *
+	 * @return ValidationError[]
+	 */
+	public function validateOther(Request $request)
+	{
+		$errorList = array();
+
+		$trustedIp = $this->xffTrustProvider->getTrustedClientIp($request->getIp(),
+			$request->getForwardedIp());
+
+		// ERRORS
+
+		// TOR nodes
+		if ($this->torExitProvider->isTorExit($trustedIp)) {
+			$errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED_TOR);
+		}
+
+		// Bans
+		if ($this->banHelper->isBlockBanned($request)) {
+			$errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED);
+		}
+
+		return $errorList;
+	}
+
+	public function postSaveValidations(Request $request)
+	{
+		// Antispoof check
+		$this->checkAntiSpoof($request);
+
+		// Blacklist check
+		$this->checkTitleBlacklist($request);
+
+		// Add comment for form override
+		$this->formOverride($request);
+
+		$bans = $this->banHelper->getBans($request);
+
+		foreach ($bans as $ban) {
+			if ($ban->getAction() == Ban::ACTION_DROP) {
+				$request->setStatus(RequestStatus::CLOSED);
+				$request->save();
+
+				Logger::closeRequest($request->getDatabase(), $request, 0, null);
+
+				$comment = new Comment();
+				$comment->setDatabase($this->database);
+				$comment->setRequest($request->getId());
+				$comment->setVisibility('user');
+				$comment->setUser(null);
+
+				$comment->setComment('Request dropped automatically due to matching rule.');
+				$comment->save();
+			}
+
+			if ($ban->getAction() == Ban::ACTION_DEFER) {
+				/** @var RequestQueue|false $targetQueue */
+				$targetQueue = RequestQueue::getById($ban->getTargetQueue(), $this->database);
+
+				if ($targetQueue === false ) {
+					$comment = new Comment();
+					$comment->setDatabase($this->database);
+					$comment->setRequest($request->getId());
+					$comment->setVisibility('user');
+					$comment->setUser(null);
+
+					$comment->setComment("This request would have been deferred automatically due to a matching rule, but the queue to defer to could not be found.");
+					$comment->save();
+				}
+				else {
+					$this->deferRequest($request, $targetQueue, 'Request deferred automatically due to matching rule.');
+				}
+			}
+		}
+	}
+
+	private function checkAntiSpoof(Request $request)
+	{
+		try {
+			if (count($this->antiSpoofProvider->getSpoofs($request->getName())) > 0) {
+				// If there were spoofs an Admin should handle the request.
+				// FIXME: domains!
+				$defaultQueue = RequestQueue::getDefaultQueue($this->database, 1, RequestQueue::DEFAULT_ANTISPOOF);
+				$this->deferRequest($request, $defaultQueue,
+					'Request automatically deferred due to AntiSpoof hit');
+			}
+		}
+		catch (Exception $ex) {
+			$skippable = [
+				'Encountered error while getting result: Contains unassigned character',
+				'Encountered error while getting result: Contains incompatible mixed scripts',
+				'Encountered error while getting result: Does not contain any letters'
+			];
+
+			$skip = false;
+
+			foreach ($skippable as $s) {
+				if (strpos($ex->getMessage(), $s) !== false) {
+					$skip = true;
+					break;
+				}
+			}
+
+			// Only log to disk if this *isn't* a "skippable" error.
+			if (!$skip) {
+				ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
+			}
+		}
+	}
+
+	private function checkTitleBlacklist(Request $request)
+	{
+		if ($this->titleBlacklistEnabled == 1) {
+			try {
+				$apiResult = $this->httpHelper->get(
+					$this->mediawikiApiEndpoint,
+					array(
+						'action'       => 'titleblacklist',
+						'tbtitle'      => $request->getName(),
+						'tbaction'     => 'new-account',
+						'tbnooverride' => true,
+						'format'       => 'php',
+					),
+					[],
+					$this->validationRemoteTimeout
+				);
+
+				$data = unserialize($apiResult);
+
+				$requestIsOk = $data['titleblacklist']['result'] == "ok";
+			}
+			catch (CurlException $ex) {
+				ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
+
+				// Don't kill the request, just assume it's fine. Humans can deal with it later.
+				return;
+			}
+
+			if (!$requestIsOk) {
+				// FIXME: domains!
+				$defaultQueue = RequestQueue::getDefaultQueue($this->database, 1, RequestQueue::DEFAULT_TITLEBLACKLIST);
+
+				$this->deferRequest($request, $defaultQueue,
+					'Request automatically deferred due to title blacklist hit');
+			}
+		}
+	}
+
+	private function userExists(Request $request)
+	{
+		try {
+			$userExists = $this->httpHelper->get(
+				$this->mediawikiApiEndpoint,
+				array(
+					'action'  => 'query',
+					'list'    => 'users',
+					'ususers' => $request->getName(),
+					'format'  => 'php',
+				),
+				[],
+				$this->validationRemoteTimeout
+			);
+
+			$ue = unserialize($userExists);
+			if (!isset ($ue['query']['users']['0']['missing']) && isset ($ue['query']['users']['0']['userid'])) {
+				return true;
+			}
+		}
+		catch (CurlException $ex) {
+			ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
+
+			// Don't kill the request, just assume it's fine. Humans can deal with it later.
+			return false;
+		}
+
+		return false;
+	}
+
+	private function userSulExists(Request $request)
+	{
+		$requestName = $request->getName();
+
+		try {
+			$userExists = $this->httpHelper->get(
+				$this->mediawikiApiEndpoint,
+				array(
+					'action'  => 'query',
+					'meta'    => 'globaluserinfo',
+					'guiuser' => $requestName,
+					'format'  => 'php',
+				),
+				[],
+				$this->validationRemoteTimeout
+			);
+
+			$ue = unserialize($userExists);
+			if (isset ($ue['query']['globaluserinfo']['id'])) {
+				return true;
+			}
+		}
+		catch (CurlException $ex) {
+			ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
+
+			// Don't kill the request, just assume it's fine. Humans can deal with it later.
+			return false;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks if a request with this name is currently open
+	 *
+	 * @param Request $request
+	 *
+	 * @return bool
+	 */
+	private function nameRequestExists(Request $request)
+	{
+		$query = "SELECT COUNT(id) FROM request WHERE status != 'Closed' AND name = :name;";
+		$statement = $this->database->prepare($query);
+		$statement->execute(array(':name' => $request->getName()));
+
+		if (!$statement) {
+			return false;
+		}
+
+		return $statement->fetchColumn() > 0;
+	}
+
+	private function deferRequest(Request $request, RequestQueue $targetQueue, $deferComment): void
+	{
+		$request->setQueue($targetQueue->getId());
+		$request->save();
+
+		$logTarget = $targetQueue->getLogName();
+
+		Logger::deferRequest($this->database, $request, $logTarget);
+
+		$comment = new Comment();
+		$comment->setDatabase($this->database);
+		$comment->setRequest($request->getId());
+		$comment->setVisibility('user');
+		$comment->setUser(null);
+
+		$comment->setComment($deferComment);
+		$comment->save();
+	}
+
+	private function formOverride(Request $request)
+	{
+		$form = $request->getOriginFormObject();
+		if($form === null || $form->getOverrideQueue() === null) {
+			return;
+		}
+
+		/** @var RequestQueue $targetQueue */
+		$targetQueue = RequestQueue::getById($form->getOverrideQueue(), $request->getDatabase());
+
+		$this->deferRequest($request, $targetQueue, 'Request deferred automatically due to request submission through a request form with a default queue set.');
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -251,7 +251,7 @@ 
                 /** @var RequestQueue|false $targetQueue */
                 $targetQueue = RequestQueue::getById($ban->getTargetQueue(), $this->database);
 
-                if ($targetQueue === false ) {
+                if ($targetQueue === false) {
                     $comment = new Comment();
                     $comment->setDatabase($this->database);
                     $comment->setRequest($request->getId());
@@ -444,7 +444,7 @@ 
     private function formOverride(Request $request)
     {
         $form = $request->getOriginFormObject();
-        if($form === null || $form->getOverrideQueue() === null) {
+        if ($form === null || $form->getOverrideQueue() === null) {
             return;
         }
 

includes/WebStart.php

Indentation +202 added lines, -202 removed lines

@@ -33,206 +33,206 @@
  */
 class WebStart extends ApplicationBase
 {
-    /**
-     * @var IRequestRouter $requestRouter The request router to use. Note that different entry points have different
-     *                                    routers and hence different URL mappings
-     */
-    private $requestRouter;
-    /**
-     * @var bool $isPublic Determines whether to use public interface objects or internal interface objects
-     */
-    private $isPublic = false;
-
-    /**
-     * WebStart constructor.
-     *
-     * @param SiteConfiguration $configuration The site configuration
-     * @param IRequestRouter    $router        The request router to use
-     */
-    public function __construct(SiteConfiguration $configuration, IRequestRouter $router)
-    {
-        parent::__construct($configuration);
-
-        $this->requestRouter = $router;
-    }
-
-    /**
-     * @param ITask             $page
-     * @param SiteConfiguration $siteConfiguration
-     * @param PdoDatabase       $database
-     *
-     * @return void
-     */
-    protected function setupHelpers(
-        ITask $page,
-        SiteConfiguration $siteConfiguration,
-        PdoDatabase $database
-    ) {
-        parent::setupHelpers($page, $siteConfiguration, $database);
-
-        if ($page instanceof PageBase) {
-            $page->setTokenManager(new TokenManager());
-            $page->setCspManager(new ContentSecurityPolicyManager($siteConfiguration));
-
-            if ($page instanceof InternalPageBase) {
-                $page->setTypeAheadHelper(new TypeAheadHelper());
-
-                $identificationVerifier = new IdentificationVerifier($page->getHttpHelper(), $siteConfiguration, $database);
-                $page->setSecurityManager(new SecurityManager($identificationVerifier, new RoleConfiguration()));
-
-                if ($siteConfiguration->getTitleBlacklistEnabled()) {
-                    $page->setBlacklistHelper(new BlacklistHelper($page->getHttpHelper(), $database));
-                }
-                else {
-                    $page->setBlacklistHelper(new FakeBlacklistHelper());
-                }
-
-                $page->setDomainAccessManager(new DomainAccessManager($page->getSecurityManager()));
-            }
-        }
-    }
-
-    /**
-     * Application entry point.
-     *
-     * Sets up the environment and runs the application, performing any global cleanup operations when done.
-     */
-    public function run()
-    {
-        try {
-            if ($this->setupEnvironment()) {
-                $this->main();
-            }
-        }
-        catch (EnvironmentException $ex) {
-            ob_end_clean();
-            print Offline::getOfflineMessage($this->isPublic(), $ex->getMessage());
-        }
-            /** @noinspection PhpRedundantCatchClauseInspection */
-        catch (ReadableException $ex) {
-            ob_end_clean();
-            print $ex->getReadableError();
-        }
-        finally {
-            $this->cleanupEnvironment();
-        }
-    }
-
-    /**
-     * Environment setup
-     *
-     * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
-     * and shut down prematurely.
-     *
-     * @return bool
-     * @throws EnvironmentException
-     */
-    protected function setupEnvironment()
-    {
-        // initialise global exception handler
-        set_exception_handler(array(ExceptionHandler::class, 'exceptionHandler'));
-        set_error_handler(array(ExceptionHandler::class, 'errorHandler'), E_RECOVERABLE_ERROR);
-
-        // start output buffering if necessary
-        if (ob_get_level() === 0) {
-            ob_start();
-        }
-
-        // initialise super-global providers
-        WebRequest::setGlobalStateProvider(new GlobalStateProvider());
-
-        if (Offline::isOffline()) {
-            print Offline::getOfflineMessage($this->isPublic());
-            ob_end_flush();
-
-            return false;
-        }
-
-        // Call parent setup
-        if (!parent::setupEnvironment()) {
-            return false;
-        }
-
-        // Start up sessions
-        Session::start();
-
-        // Check the user is allowed to be logged in still. This must be before we call any user-loading functions and
-        // get the current user cached.
-        // I'm not sure if this function call being here is particularly a good thing, but it's part of starting up a
-        // session I suppose.
-        $this->checkForceLogout();
-
-        // environment initialised!
-        return true;
-    }
-
-    /**
-     * Main application logic
-     */
-    protected function main()
-    {
-        // Get the right route for the request
-        $page = $this->requestRouter->route();
-
-        $siteConfiguration = $this->getConfiguration();
-        $database = PdoDatabase::getDatabaseConnection('acc');
-
-        $this->setupHelpers($page, $siteConfiguration, $database);
-
-        // run the route code for the request.
-        $page->execute();
-    }
-
-    /**
-     * Any cleanup tasks should go here
-     *
-     * Note that we need to be very careful here, as exceptions may have been thrown and handled.
-     * This should *only* be for cleaning up, no logic should go here.
-     */
-    protected function cleanupEnvironment()
-    {
-        // Clean up anything we splurged after sending the page.
-        if (ob_get_level() > 0) {
-            for ($i = ob_get_level(); $i > 0; $i--) {
-                ob_end_clean();
-            }
-        }
-    }
-
-    private function checkForceLogout()
-    {
-        $database = PdoDatabase::getDatabaseConnection('acc');
-
-        $sessionUserId = WebRequest::getSessionUserId();
-        iF ($sessionUserId === null) {
-            return;
-        }
-
-        // Note, User::getCurrent() caches it's result, which we *really* don't want to trigger.
-        $currentUser = User::getById($sessionUserId, $database);
-
-        if ($currentUser === false) {
-            // Umm... this user has a session cookie with a userId set, but no user exists...
-            Session::restart();
-
-            $currentUser = User::getCurrent($database);
-        }
-
-        if ($currentUser->getForceLogout()) {
-            Session::restart();
-
-            $currentUser->setForceLogout(false);
-            $currentUser->save();
-        }
-    }
-
-    public function isPublic()
-    {
-        return $this->isPublic;
-    }
-
-    public function setPublic($isPublic)
-    {
-        $this->isPublic = $isPublic;
-    }
+	/**
+	 * @var IRequestRouter $requestRouter The request router to use. Note that different entry points have different
+	 *                                    routers and hence different URL mappings
+	 */
+	private $requestRouter;
+	/**
+	 * @var bool $isPublic Determines whether to use public interface objects or internal interface objects
+	 */
+	private $isPublic = false;
+
+	/**
+	 * WebStart constructor.
+	 *
+	 * @param SiteConfiguration $configuration The site configuration
+	 * @param IRequestRouter    $router        The request router to use
+	 */
+	public function __construct(SiteConfiguration $configuration, IRequestRouter $router)
+	{
+		parent::__construct($configuration);
+
+		$this->requestRouter = $router;
+	}
+
+	/**
+	 * @param ITask             $page
+	 * @param SiteConfiguration $siteConfiguration
+	 * @param PdoDatabase       $database
+	 *
+	 * @return void
+	 */
+	protected function setupHelpers(
+		ITask $page,
+		SiteConfiguration $siteConfiguration,
+		PdoDatabase $database
+	) {
+		parent::setupHelpers($page, $siteConfiguration, $database);
+
+		if ($page instanceof PageBase) {
+			$page->setTokenManager(new TokenManager());
+			$page->setCspManager(new ContentSecurityPolicyManager($siteConfiguration));
+
+			if ($page instanceof InternalPageBase) {
+				$page->setTypeAheadHelper(new TypeAheadHelper());
+
+				$identificationVerifier = new IdentificationVerifier($page->getHttpHelper(), $siteConfiguration, $database);
+				$page->setSecurityManager(new SecurityManager($identificationVerifier, new RoleConfiguration()));
+
+				if ($siteConfiguration->getTitleBlacklistEnabled()) {
+					$page->setBlacklistHelper(new BlacklistHelper($page->getHttpHelper(), $database));
+				}
+				else {
+					$page->setBlacklistHelper(new FakeBlacklistHelper());
+				}
+
+				$page->setDomainAccessManager(new DomainAccessManager($page->getSecurityManager()));
+			}
+		}
+	}
+
+	/**
+	 * Application entry point.
+	 *
+	 * Sets up the environment and runs the application, performing any global cleanup operations when done.
+	 */
+	public function run()
+	{
+		try {
+			if ($this->setupEnvironment()) {
+				$this->main();
+			}
+		}
+		catch (EnvironmentException $ex) {
+			ob_end_clean();
+			print Offline::getOfflineMessage($this->isPublic(), $ex->getMessage());
+		}
+			/** @noinspection PhpRedundantCatchClauseInspection */
+		catch (ReadableException $ex) {
+			ob_end_clean();
+			print $ex->getReadableError();
+		}
+		finally {
+			$this->cleanupEnvironment();
+		}
+	}
+
+	/**
+	 * Environment setup
+	 *
+	 * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
+	 * and shut down prematurely.
+	 *
+	 * @return bool
+	 * @throws EnvironmentException
+	 */
+	protected function setupEnvironment()
+	{
+		// initialise global exception handler
+		set_exception_handler(array(ExceptionHandler::class, 'exceptionHandler'));
+		set_error_handler(array(ExceptionHandler::class, 'errorHandler'), E_RECOVERABLE_ERROR);
+
+		// start output buffering if necessary
+		if (ob_get_level() === 0) {
+			ob_start();
+		}
+
+		// initialise super-global providers
+		WebRequest::setGlobalStateProvider(new GlobalStateProvider());
+
+		if (Offline::isOffline()) {
+			print Offline::getOfflineMessage($this->isPublic());
+			ob_end_flush();
+
+			return false;
+		}
+
+		// Call parent setup
+		if (!parent::setupEnvironment()) {
+			return false;
+		}
+
+		// Start up sessions
+		Session::start();
+
+		// Check the user is allowed to be logged in still. This must be before we call any user-loading functions and
+		// get the current user cached.
+		// I'm not sure if this function call being here is particularly a good thing, but it's part of starting up a
+		// session I suppose.
+		$this->checkForceLogout();
+
+		// environment initialised!
+		return true;
+	}
+
+	/**
+	 * Main application logic
+	 */
+	protected function main()
+	{
+		// Get the right route for the request
+		$page = $this->requestRouter->route();
+
+		$siteConfiguration = $this->getConfiguration();
+		$database = PdoDatabase::getDatabaseConnection('acc');
+
+		$this->setupHelpers($page, $siteConfiguration, $database);
+
+		// run the route code for the request.
+		$page->execute();
+	}
+
+	/**
+	 * Any cleanup tasks should go here
+	 *
+	 * Note that we need to be very careful here, as exceptions may have been thrown and handled.
+	 * This should *only* be for cleaning up, no logic should go here.
+	 */
+	protected function cleanupEnvironment()
+	{
+		// Clean up anything we splurged after sending the page.
+		if (ob_get_level() > 0) {
+			for ($i = ob_get_level(); $i > 0; $i--) {
+				ob_end_clean();
+			}
+		}
+	}
+
+	private function checkForceLogout()
+	{
+		$database = PdoDatabase::getDatabaseConnection('acc');
+
+		$sessionUserId = WebRequest::getSessionUserId();
+		iF ($sessionUserId === null) {
+			return;
+		}
+
+		// Note, User::getCurrent() caches it's result, which we *really* don't want to trigger.
+		$currentUser = User::getById($sessionUserId, $database);
+
+		if ($currentUser === false) {
+			// Umm... this user has a session cookie with a userId set, but no user exists...
+			Session::restart();
+
+			$currentUser = User::getCurrent($database);
+		}
+
+		if ($currentUser->getForceLogout()) {
+			Session::restart();
+
+			$currentUser->setForceLogout(false);
+			$currentUser->save();
+		}
+	}
+
+	public function isPublic()
+	{
+		return $this->isPublic;
+	}
+
+	public function setPublic($isPublic)
+	{
+		$this->isPublic = $isPublic;
+	}
 }

includes/ApplicationBase.php

Indentation +142 added lines, -142 removed lines

@@ -24,146 +24,146 @@
 
 abstract class ApplicationBase
 {
-    private $configuration;
-
-    public function __construct(SiteConfiguration $configuration)
-    {
-        $this->configuration = $configuration;
-    }
-
-    /**
-     * Application entry point.
-     *
-     * Sets up the environment and runs the application, performing any global cleanup operations when done.
-     */
-    public function run()
-    {
-        try {
-            if ($this->setupEnvironment()) {
-                $this->main();
-            }
-        }
-        catch (Exception $ex) {
-            print $ex->getMessage();
-        }
-        finally {
-            $this->cleanupEnvironment();
-        }
-    }
-
-    /**
-     * Environment setup
-     *
-     * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
-     * and shut down prematurely.
-     *
-     * @return bool
-     * @throws EnvironmentException
-     */
-    protected function setupEnvironment()
-    {
-        $this->setupDatabase();
-
-        return true;
-    }
-
-    /**
-     * @return PdoDatabase
-     * @throws EnvironmentException
-     * @throws Exception
-     */
-    protected function setupDatabase()
-    {
-        // check the schema version
-        $database = PdoDatabase::getDatabaseConnection('acc');
-
-        $actualVersion = (int)$database->query('SELECT version FROM schemaversion')->fetchColumn();
-        if ($actualVersion !== $this->getConfiguration()->getSchemaVersion()) {
-            throw new EnvironmentException('Database schema is wrong version! Please either update configuration or database.');
-        }
-
-        return $database;
-    }
-
-    /**
-     * @return SiteConfiguration
-     */
-    public function getConfiguration()
-    {
-        return $this->configuration;
-    }
-
-    /**
-     * Main application logic
-     * @return void
-     */
-    abstract protected function main();
-
-    /**
-     * Any cleanup tasks should go here
-     *
-     * Note that we need to be very careful here, as exceptions may have been thrown and handled.
-     * This should *only* be for cleaning up, no logic should go here.
-     *
-     * @return void
-     */
-    abstract protected function cleanupEnvironment();
-
-    /**
-     * @param ITask             $page
-     * @param SiteConfiguration $siteConfiguration
-     * @param PdoDatabase       $database
-     *
-     * @return void
-     */
-    protected function setupHelpers(
-        ITask $page,
-        SiteConfiguration $siteConfiguration,
-        PdoDatabase $database
-    ) {
-        $page->setSiteConfiguration($siteConfiguration);
-
-        // setup the global database object
-        $page->setDatabase($database);
-
-        // set up helpers and inject them into the page.
-        $httpHelper = new HttpHelper($siteConfiguration);
-
-        $page->setEmailHelper(
-            new EmailHelper($siteConfiguration->getEmailSender(), $siteConfiguration->getIrcNotificationsInstance())
-        );
-
-        $page->setHttpHelper($httpHelper);
-
-        if ($siteConfiguration->getLocationProviderApiKey() === null) {
-            $page->setLocationProvider(new FakeLocationProvider());
-        }
-        else {
-            $page->setLocationProvider(
-                new IpLocationProvider(
-                    $database,
-                    $siteConfiguration->getLocationProviderApiKey(),
-                    $httpHelper
-                ));
-        }
-
-        $page->setXffTrustProvider(new XffTrustProvider($siteConfiguration->getSquidList(), $database));
-
-        $page->setRdnsProvider(new CachedRDnsLookupProvider($database));
-
-        $page->setAntiSpoofProvider(new CachedApiAntispoofProvider($database, $httpHelper));
-
-        $page->setOAuthProtocolHelper(new OAuthProtocolHelper(
-            $siteConfiguration->getOAuthConsumerToken(),
-            $siteConfiguration->getOAuthConsumerSecret(),
-            $database,
-            $siteConfiguration->getUserAgent()
-        ));
-
-        $page->setNotificationHelper(new IrcNotificationHelper(
-            $siteConfiguration,
-            $database));
-
-        $page->setTorExitProvider(new TorExitProvider($database));
-    }
+	private $configuration;
+
+	public function __construct(SiteConfiguration $configuration)
+	{
+		$this->configuration = $configuration;
+	}
+
+	/**
+	 * Application entry point.
+	 *
+	 * Sets up the environment and runs the application, performing any global cleanup operations when done.
+	 */
+	public function run()
+	{
+		try {
+			if ($this->setupEnvironment()) {
+				$this->main();
+			}
+		}
+		catch (Exception $ex) {
+			print $ex->getMessage();
+		}
+		finally {
+			$this->cleanupEnvironment();
+		}
+	}
+
+	/**
+	 * Environment setup
+	 *
+	 * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
+	 * and shut down prematurely.
+	 *
+	 * @return bool
+	 * @throws EnvironmentException
+	 */
+	protected function setupEnvironment()
+	{
+		$this->setupDatabase();
+
+		return true;
+	}
+
+	/**
+	 * @return PdoDatabase
+	 * @throws EnvironmentException
+	 * @throws Exception
+	 */
+	protected function setupDatabase()
+	{
+		// check the schema version
+		$database = PdoDatabase::getDatabaseConnection('acc');
+
+		$actualVersion = (int)$database->query('SELECT version FROM schemaversion')->fetchColumn();
+		if ($actualVersion !== $this->getConfiguration()->getSchemaVersion()) {
+			throw new EnvironmentException('Database schema is wrong version! Please either update configuration or database.');
+		}
+
+		return $database;
+	}
+
+	/**
+	 * @return SiteConfiguration
+	 */
+	public function getConfiguration()
+	{
+		return $this->configuration;
+	}
+
+	/**
+	 * Main application logic
+	 * @return void
+	 */
+	abstract protected function main();
+
+	/**
+	 * Any cleanup tasks should go here
+	 *
+	 * Note that we need to be very careful here, as exceptions may have been thrown and handled.
+	 * This should *only* be for cleaning up, no logic should go here.
+	 *
+	 * @return void
+	 */
+	abstract protected function cleanupEnvironment();
+
+	/**
+	 * @param ITask             $page
+	 * @param SiteConfiguration $siteConfiguration
+	 * @param PdoDatabase       $database
+	 *
+	 * @return void
+	 */
+	protected function setupHelpers(
+		ITask $page,
+		SiteConfiguration $siteConfiguration,
+		PdoDatabase $database
+	) {
+		$page->setSiteConfiguration($siteConfiguration);
+
+		// setup the global database object
+		$page->setDatabase($database);
+
+		// set up helpers and inject them into the page.
+		$httpHelper = new HttpHelper($siteConfiguration);
+
+		$page->setEmailHelper(
+			new EmailHelper($siteConfiguration->getEmailSender(), $siteConfiguration->getIrcNotificationsInstance())
+		);
+
+		$page->setHttpHelper($httpHelper);
+
+		if ($siteConfiguration->getLocationProviderApiKey() === null) {
+			$page->setLocationProvider(new FakeLocationProvider());
+		}
+		else {
+			$page->setLocationProvider(
+				new IpLocationProvider(
+					$database,
+					$siteConfiguration->getLocationProviderApiKey(),
+					$httpHelper
+				));
+		}
+
+		$page->setXffTrustProvider(new XffTrustProvider($siteConfiguration->getSquidList(), $database));
+
+		$page->setRdnsProvider(new CachedRDnsLookupProvider($database));
+
+		$page->setAntiSpoofProvider(new CachedApiAntispoofProvider($database, $httpHelper));
+
+		$page->setOAuthProtocolHelper(new OAuthProtocolHelper(
+			$siteConfiguration->getOAuthConsumerToken(),
+			$siteConfiguration->getOAuthConsumerSecret(),
+			$database,
+			$siteConfiguration->getUserAgent()
+		));
+
+		$page->setNotificationHelper(new IrcNotificationHelper(
+			$siteConfiguration,
+			$database));
+
+		$page->setTorExitProvider(new TorExitProvider($database));
+	}
 }

includes/Helpers/RequestQueueHelper.php

Indentation +61 added lines, -61 removed lines

@@ -15,71 +15,71 @@
 
 class RequestQueueHelper
 {
-    /**
-     * @param RequestQueue $queue
-     * @param bool         $enabled
-     * @param bool         $default
-     * @param bool         $antiSpoof
-     * @param bool         $titleBlacklist
-     */
-    public function configureDefaults(
-        RequestQueue $queue,
-        bool $enabled,
-        bool $default,
-        bool $antiSpoof,
-        bool $titleBlacklist,
-        bool $isTarget
-    ) {
-        // always allow enabling a queue
-        if ($enabled) {
-            $queue->setEnabled($enabled);
-        }
+	/**
+	 * @param RequestQueue $queue
+	 * @param bool         $enabled
+	 * @param bool         $default
+	 * @param bool         $antiSpoof
+	 * @param bool         $titleBlacklist
+	 */
+	public function configureDefaults(
+		RequestQueue $queue,
+		bool $enabled,
+		bool $default,
+		bool $antiSpoof,
+		bool $titleBlacklist,
+		bool $isTarget
+	) {
+		// always allow enabling a queue
+		if ($enabled) {
+			$queue->setEnabled($enabled);
+		}
 
-        // only allow other enable-flag changes if we're not a default
-        if (!($queue->isDefault() || $queue->isDefaultAntispoof() || $queue->isDefaultTitleBlacklist() || $isTarget)) {
-            $queue->setEnabled($enabled);
-        }
+		// only allow other enable-flag changes if we're not a default
+		if (!($queue->isDefault() || $queue->isDefaultAntispoof() || $queue->isDefaultTitleBlacklist() || $isTarget)) {
+			$queue->setEnabled($enabled);
+		}
 
-        // only allow enabling the default flags, and only when we're enabled.
-        $queue->setDefault(($queue->isDefault() || $default) && $queue->isEnabled());
-        $queue->setDefaultAntispoof(($queue->isDefaultAntispoof() || $antiSpoof) && $queue->isEnabled());
-        $queue->setDefaultTitleBlacklist(($queue->isDefaultTitleBlacklist() || $titleBlacklist) && $queue->isEnabled());
-    }
+		// only allow enabling the default flags, and only when we're enabled.
+		$queue->setDefault(($queue->isDefault() || $default) && $queue->isEnabled());
+		$queue->setDefaultAntispoof(($queue->isDefaultAntispoof() || $antiSpoof) && $queue->isEnabled());
+		$queue->setDefaultTitleBlacklist(($queue->isDefaultTitleBlacklist() || $titleBlacklist) && $queue->isEnabled());
+	}
 
-    /**
-     * @param RequestQueue $queue
-     * @param PdoDatabase  $database
-     *
-     * @return bool
-     */
-    public function isEmailTemplateTarget(RequestQueue $queue, PdoDatabase $database): bool
-    {
-        $isTarget = false;
-        /** @var EmailTemplate[] $deferralTemplates */
-        $deferralTemplates = EmailTemplate::getAllActiveTemplates('defer', $database);
-        foreach ($deferralTemplates as $t) {
-            if ($t->getQueue() === $queue->getId()) {
-                $isTarget = true;
-                break;
-            }
-        }
+	/**
+	 * @param RequestQueue $queue
+	 * @param PdoDatabase  $database
+	 *
+	 * @return bool
+	 */
+	public function isEmailTemplateTarget(RequestQueue $queue, PdoDatabase $database): bool
+	{
+		$isTarget = false;
+		/** @var EmailTemplate[] $deferralTemplates */
+		$deferralTemplates = EmailTemplate::getAllActiveTemplates('defer', $database);
+		foreach ($deferralTemplates as $t) {
+			if ($t->getQueue() === $queue->getId()) {
+				$isTarget = true;
+				break;
+			}
+		}
 
-        return $isTarget;
-    }
+		return $isTarget;
+	}
 
-    public function isRequestFormTarget(RequestQueue $queue, PdoDatabase $database): bool
-    {
-        $isTarget = false;
-        $forms = RequestForm::getAllForms($database, 1); // FIXME: domains
-        foreach ($forms as $t) {
-            if ($t->isEnabled()) {
-                if ($t->getOverrideQueue() === $queue->getId()) {
-                    $isTarget = true;
-                    break;
-                }
-            }
-        }
+	public function isRequestFormTarget(RequestQueue $queue, PdoDatabase $database): bool
+	{
+		$isTarget = false;
+		$forms = RequestForm::getAllForms($database, 1); // FIXME: domains
+		foreach ($forms as $t) {
+			if ($t->isEnabled()) {
+				if ($t->getOverrideQueue() === $queue->getId()) {
+					$isTarget = true;
+					break;
+				}
+			}
+		}
 
-        return $isTarget;
-    }
+		return $isTarget;
+	}
 }
\ No newline at end of file

includes/Helpers/RequestEmailHelper.php

Indentation +41 added lines, -41 removed lines

@@ -15,54 +15,54 @@
 
 class RequestEmailHelper
 {
-    /**
-     * @var IEmailHelper
-     */
-    private $emailHelper;
+	/**
+	 * @var IEmailHelper
+	 */
+	private $emailHelper;
 
-    /**
-     * RequestEmailHelper constructor.
-     *
-     * @param IEmailHelper $emailHelper
-     */
-    public function __construct(IEmailHelper $emailHelper)
-    {
-        $this->emailHelper = $emailHelper;
-    }
+	/**
+	 * RequestEmailHelper constructor.
+	 *
+	 * @param IEmailHelper $emailHelper
+	 */
+	public function __construct(IEmailHelper $emailHelper)
+	{
+		$this->emailHelper = $emailHelper;
+	}
 
-    /**
-     * @param Request $request
-     * @param string  $mailText
-     * @param User    $currentUser
-     * @param boolean $ccMailingList
-     */
-    public function sendMail(Request $request, $mailText, User $currentUser, $ccMailingList)
-    {
-        $headers = array(
-            'X-ACC-Request' => $request->getId(),
-            'X-ACC-UserID'  => $currentUser->getId(),
-        );
+	/**
+	 * @param Request $request
+	 * @param string  $mailText
+	 * @param User    $currentUser
+	 * @param boolean $ccMailingList
+	 */
+	public function sendMail(Request $request, $mailText, User $currentUser, $ccMailingList)
+	{
+		$headers = array(
+			'X-ACC-Request' => $request->getId(),
+			'X-ACC-UserID'  => $currentUser->getId(),
+		);
 
-        // FIXME: domains!
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $request->getDatabase());
+		// FIXME: domains!
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $request->getDatabase());
 
-        if ($ccMailingList) {
-            $headers['Cc'] = $domain->getEmailReplyAddress();
-        }
+		if ($ccMailingList) {
+			$headers['Cc'] = $domain->getEmailReplyAddress();
+		}
 
-        $helper = $this->emailHelper;
+		$helper = $this->emailHelper;
 
-        $emailSig = $currentUser->getEmailSig();
-        if ($emailSig !== '' || $emailSig !== null) {
-            $emailSig = "\n\n" . $emailSig;
-        }
+		$emailSig = $currentUser->getEmailSig();
+		if ($emailSig !== '' || $emailSig !== null) {
+			$emailSig = "\n\n" . $emailSig;
+		}
 
-        $subject = "RE: [ACC #{$request->getId()}] English Wikipedia Account Request";
-        $content = $mailText . $emailSig;
+		$subject = "RE: [ACC #{$request->getId()}] English Wikipedia Account Request";
+		$content = $mailText . $emailSig;
 
-        $helper->sendMail($domain->getEmailReplyAddress(), $request->getEmail(), $subject, $content, $headers);
+		$helper->sendMail($domain->getEmailReplyAddress(), $request->getEmail(), $subject, $content, $headers);
 
-        $request->setEmailSent(true);
-    }
+		$request->setEmailSent(true);
+	}
 }

includes/Helpers/BotMediaWikiClient.php

Indentation +132 added lines, -132 removed lines

@@ -17,136 +17,136 @@
 
 class BotMediaWikiClient implements IMediaWikiClient
 {
-    /**
-     * @var HttpHelper
-     */
-    private $httpHelper;
-    /** @var string */
-    private $mediawikiWebServiceEndpoint;
-    /** @var string */
-    private $creationBotUsername;
-    /** @var string */
-    private $creationBotPassword;
-    /** @var bool */
-    private $knownLoggedIn = false;
-
-    /**
-     * BotMediaWikiClient constructor.
-     *
-     * @param SiteConfiguration        $siteConfiguration
-     * @param Domain $domain
-     */
-    public function __construct(SiteConfiguration $siteConfiguration, Domain $domain)
-    {
-        $this->mediawikiWebServiceEndpoint = $domain->getWikiApiPath();
-
-        $this->creationBotUsername = $siteConfiguration->getCreationBotUsername();
-        $this->creationBotPassword = $siteConfiguration->getCreationBotPassword();
-
-        $this->httpHelper = new HttpHelper(
-            $siteConfiguration,
-            $siteConfiguration->getCurlCookieJar()
-        );
-    }
-
-    public function doApiCall($apiParams, $method = 'GET')
-    {
-        $this->ensureLoggedIn();
-        $apiParams['assert'] = 'user';
-
-        return $this->callApi($apiParams, $method);
-    }
-
-    private function ensureLoggedIn()
-    {
-        if ($this->knownLoggedIn) {
-            return;
-        }
-
-        $userinfoResult = $this->callApi(array('action' => 'query', 'meta' => 'userinfo'), 'GET');
-        if (isset($userinfoResult->query->userinfo->anon)) {
-            // not logged in.
-            $this->logIn();
-
-            // retest
-            $userinfoResult = $this->callApi(array('action' => 'query', 'meta' => 'userinfo'), 'GET');
-            if (isset($userinfoResult->query->userinfo->anon)) {
-                throw new MediaWikiApiException('Unable to log in.');
-            }
-            else {
-                $this->knownLoggedIn = true;
-            }
-        }
-        else {
-            $this->knownLoggedIn = true;
-        }
-    }
-
-    /**
-     * @param $apiParams
-     * @param $method
-     *
-     * @return mixed
-     * @throws ApplicationLogicException
-     * @throws CurlException
-     */
-    private function callApi($apiParams, $method)
-    {
-        $apiParams['format'] = 'json';
-
-        if ($method == 'GET') {
-            $data = $this->httpHelper->get($this->mediawikiWebServiceEndpoint, $apiParams);
-        }
-        elseif ($method == 'POST') {
-            $data = $this->httpHelper->post($this->mediawikiWebServiceEndpoint, $apiParams);
-        }
-        else {
-            throw new ApplicationLogicException('Unsupported HTTP Method');
-        }
-
-        if ($data === false) {
-            throw new CurlException('Curl error: ' . $this->httpHelper->getError());
-        }
-
-        $result = json_decode($data);
-
-        return $result;
-    }
-
-    private function logIn()
-    {
-        // get token
-        $tokenParams = array(
-            'action' => 'query',
-            'meta'   => 'tokens',
-            'type'   => 'login',
-        );
-
-        $response = $this->callApi($tokenParams, 'POST');
-
-        if (isset($response->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-        }
-
-        $token = $response->query->tokens->logintoken;
-
-        if ($token === null) {
-            throw new MediaWikiApiException('Edit token could not be acquired');
-        }
-
-        $params = array(
-            'action' => 'login',
-            'lgname' => $this->creationBotUsername,
-            'lgpassword' => $this->creationBotPassword,
-            'lgtoken' => $token,
-        );
-
-        $loginResponse = $this->callApi($params, 'POST');
-
-        if ($loginResponse->login->result == 'Success') {
-            return;
-        }
-
-        throw new ApplicationLogicException(json_encode($loginResponse));
-    }
+	/**
+	 * @var HttpHelper
+	 */
+	private $httpHelper;
+	/** @var string */
+	private $mediawikiWebServiceEndpoint;
+	/** @var string */
+	private $creationBotUsername;
+	/** @var string */
+	private $creationBotPassword;
+	/** @var bool */
+	private $knownLoggedIn = false;
+
+	/**
+	 * BotMediaWikiClient constructor.
+	 *
+	 * @param SiteConfiguration        $siteConfiguration
+	 * @param Domain $domain
+	 */
+	public function __construct(SiteConfiguration $siteConfiguration, Domain $domain)
+	{
+		$this->mediawikiWebServiceEndpoint = $domain->getWikiApiPath();
+
+		$this->creationBotUsername = $siteConfiguration->getCreationBotUsername();
+		$this->creationBotPassword = $siteConfiguration->getCreationBotPassword();
+
+		$this->httpHelper = new HttpHelper(
+			$siteConfiguration,
+			$siteConfiguration->getCurlCookieJar()
+		);
+	}
+
+	public function doApiCall($apiParams, $method = 'GET')
+	{
+		$this->ensureLoggedIn();
+		$apiParams['assert'] = 'user';
+
+		return $this->callApi($apiParams, $method);
+	}
+
+	private function ensureLoggedIn()
+	{
+		if ($this->knownLoggedIn) {
+			return;
+		}
+
+		$userinfoResult = $this->callApi(array('action' => 'query', 'meta' => 'userinfo'), 'GET');
+		if (isset($userinfoResult->query->userinfo->anon)) {
+			// not logged in.
+			$this->logIn();
+
+			// retest
+			$userinfoResult = $this->callApi(array('action' => 'query', 'meta' => 'userinfo'), 'GET');
+			if (isset($userinfoResult->query->userinfo->anon)) {
+				throw new MediaWikiApiException('Unable to log in.');
+			}
+			else {
+				$this->knownLoggedIn = true;
+			}
+		}
+		else {
+			$this->knownLoggedIn = true;
+		}
+	}
+
+	/**
+	 * @param $apiParams
+	 * @param $method
+	 *
+	 * @return mixed
+	 * @throws ApplicationLogicException
+	 * @throws CurlException
+	 */
+	private function callApi($apiParams, $method)
+	{
+		$apiParams['format'] = 'json';
+
+		if ($method == 'GET') {
+			$data = $this->httpHelper->get($this->mediawikiWebServiceEndpoint, $apiParams);
+		}
+		elseif ($method == 'POST') {
+			$data = $this->httpHelper->post($this->mediawikiWebServiceEndpoint, $apiParams);
+		}
+		else {
+			throw new ApplicationLogicException('Unsupported HTTP Method');
+		}
+
+		if ($data === false) {
+			throw new CurlException('Curl error: ' . $this->httpHelper->getError());
+		}
+
+		$result = json_decode($data);
+
+		return $result;
+	}
+
+	private function logIn()
+	{
+		// get token
+		$tokenParams = array(
+			'action' => 'query',
+			'meta'   => 'tokens',
+			'type'   => 'login',
+		);
+
+		$response = $this->callApi($tokenParams, 'POST');
+
+		if (isset($response->error)) {
+			throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+		}
+
+		$token = $response->query->tokens->logintoken;
+
+		if ($token === null) {
+			throw new MediaWikiApiException('Edit token could not be acquired');
+		}
+
+		$params = array(
+			'action' => 'login',
+			'lgname' => $this->creationBotUsername,
+			'lgpassword' => $this->creationBotPassword,
+			'lgtoken' => $token,
+		);
+
+		$loginResponse = $this->callApi($params, 'POST');
+
+		if ($loginResponse->login->result == 'Success') {
+			return;
+		}
+
+		throw new ApplicationLogicException(json_encode($loginResponse));
+	}
 }

includes/Helpers/Interfaces/IEmailHelper.php

Indentation +12 added lines, -12 removed lines

@@ -17,16 +17,16 @@
  */
 interface IEmailHelper
 {
-    /**
-     * Sends an email to the specified email address.
-     *
-     * @param string $replyAddress
-     * @param string $to
-     * @param string $subject
-     * @param string $content
-     * @param array  $headers Extra headers to include
-     *
-     * @return void
-     */
-    public function sendMail(?string $replyAddress, $to, $subject, $content, $headers = array());
+	/**
+	 * Sends an email to the specified email address.
+	 *
+	 * @param string $replyAddress
+	 * @param string $to
+	 * @param string $subject
+	 * @param string $content
+	 * @param array  $headers Extra headers to include
+	 *
+	 * @return void
+	 */
+	public function sendMail(?string $replyAddress, $to, $subject, $content, $headers = array());
 }
\ No newline at end of file