mdaniels5757 / waca

includes/Helpers/Interfaces/IOAuthProtocolHelper.php

Indentation +45 added lines, -45 removed lines

@@ -15,53 +15,53 @@
 
 interface IOAuthProtocolHelper
 {
-    /**
-     * @return stdClass
-     *
-     * @throws Exception
-     * @throws CurlException
-     */
-    public function getRequestToken();
+	/**
+	 * @return stdClass
+	 *
+	 * @throws Exception
+	 * @throws CurlException
+	 */
+	public function getRequestToken();
 
-    /**
-     * @param string $requestToken
-     *
-     * @return string
-     */
-    public function getAuthoriseUrl($requestToken);
+	/**
+	 * @param string $requestToken
+	 *
+	 * @return string
+	 */
+	public function getAuthoriseUrl($requestToken);
 
-    /**
-     * @param string $oauthRequestToken
-     * @param string $oauthRequestSecret
-     * @param string $oauthVerifier
-     *
-     * @return stdClass
-     * @throws CurlException
-     * @throws Exception
-     */
-    public function callbackCompleted($oauthRequestToken, $oauthRequestSecret, $oauthVerifier);
+	/**
+	 * @param string $oauthRequestToken
+	 * @param string $oauthRequestSecret
+	 * @param string $oauthVerifier
+	 *
+	 * @return stdClass
+	 * @throws CurlException
+	 * @throws Exception
+	 */
+	public function callbackCompleted($oauthRequestToken, $oauthRequestSecret, $oauthVerifier);
 
-    /**
-     * @param string $oauthAccessToken
-     * @param string $oauthAccessSecret
-     *
-     * @return stdClass
-     * @throws CurlException
-     * @throws Exception
-     * @throws \MediaWiki\OAuthClient\Exception
-     */
-    public function getIdentityTicket($oauthAccessToken, $oauthAccessSecret);
+	/**
+	 * @param string $oauthAccessToken
+	 * @param string $oauthAccessSecret
+	 *
+	 * @return stdClass
+	 * @throws CurlException
+	 * @throws Exception
+	 * @throws \MediaWiki\OAuthClient\Exception
+	 */
+	public function getIdentityTicket($oauthAccessToken, $oauthAccessSecret);
 
-    /**
-     * @param array  $apiParams    array of parameters to send to the API
-     * @param string $accessToken  user's access token
-     * @param string $accessSecret user's secret
-     * @param string $method       HTTP method
-     *
-     * @return stdClass
-     * @throws ApplicationLogicException
-     * @throws CurlException
-     * @throws Exception
-     */
-    public function apiCall($apiParams, $accessToken, $accessSecret, $method = 'GET');
+	/**
+	 * @param array  $apiParams    array of parameters to send to the API
+	 * @param string $accessToken  user's access token
+	 * @param string $accessSecret user's secret
+	 * @param string $method       HTTP method
+	 *
+	 * @return stdClass
+	 * @throws ApplicationLogicException
+	 * @throws CurlException
+	 * @throws Exception
+	 */
+	public function apiCall($apiParams, $accessToken, $accessSecret, $method = 'GET');
 }
\ No newline at end of file

includes/Providers/XffTrustProvider.php

Indentation +152 added lines, -152 removed lines

@@ -22,156 +22,156 @@
  */
 class XffTrustProvider implements IXffTrustProvider
 {
-    /**
-     * Array of IP addresses which are TRUSTED proxies
-     * @var string[]
-     */
-    private $trustedCache;
-    /**
-     * Array of IP addresses which are UNTRUSTED proxies
-     * @var string[]
-     */
-    private $untrustedCache = array();
-    /** @var PDOStatement */
-    private $trustedQuery;
-    /**
-     * @var PdoDatabase
-     */
-    private $database;
-
-    /**
-     * Creates a new instance of the trust provider
-     *
-     * @param string[]    $squidIpList List of IP addresses to pre-approve
-     * @param PdoDatabase $database
-     */
-    public function __construct($squidIpList, PdoDatabase $database)
-    {
-        $this->trustedCache = $squidIpList;
-        $this->database = $database;
-    }
-
-    /**
-     * Returns a value if the IP address is a trusted proxy
-     *
-     * @param string $ip
-     *
-     * @return bool
-     */
-    public function isTrusted($ip)
-    {
-        if (in_array($ip, $this->trustedCache)) {
-            return true;
-        }
-
-        if (in_array($ip, $this->untrustedCache)) {
-            return false;
-        }
-
-        if ($this->trustedQuery === null) {
-            $query = "SELECT COUNT(id) FROM xfftrustcache WHERE ip = :ip;";
-            $this->trustedQuery = $this->database->prepare($query);
-        }
-
-        $this->trustedQuery->execute(array(":ip" => $ip));
-        $result = $this->trustedQuery->fetchColumn();
-        $this->trustedQuery->closeCursor();
-
-        if ($result == 0) {
-            $this->untrustedCache[] = $ip;
-
-            return false;
-        }
-
-        if ($result >= 1) {
-            $this->trustedCache[] = $ip;
-
-            return true;
-        }
-
-        // something weird has happened if we've got here.
-        // default to untrusted.
-        return false;
-    }
-
-    /**
-     * Gets the last trusted IP in the proxy chain.
-     *
-     * @param string $ip      The IP address from REMOTE_ADDR
-     * @param string $proxyIp The contents of the XFF header.
-     *
-     * @return string Trusted source IP address
-     */
-    public function getTrustedClientIp($ip, $proxyIp)
-    {
-        $clientIpAddress = $ip;
-        if ($proxyIp) {
-            $ipList = explode(",", $proxyIp);
-            $ipList[] = $clientIpAddress;
-            $ipList = array_reverse($ipList);
-
-            foreach ($ipList as $ipNumber => $ipAddress) {
-                if ($this->isTrusted(trim($ipAddress)) && $ipNumber < (count($ipList) - 1)) {
-                    continue;
-                }
-
-                $clientIpAddress = $ipAddress;
-                break;
-            }
-        }
-
-        return trim($clientIpAddress);
-    }
-
-    /**
-     * Takes an array( "low" => "high" ) values, and returns true if $needle is in at least one of them.
-     *
-     * @param array  $haystack
-     * @param string $ip
-     *
-     * @return bool
-     */
-    public function ipInRange($haystack, $ip)
-    {
-        $needle = ip2long($ip);
-
-        foreach ($haystack as $low => $high) {
-            if (ip2long($low) <= $needle && ip2long($high) >= $needle) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Explodes a CIDR range into an array of addresses
-     *
-     * @param string $range A CIDR-format range
-     *
-     * @return array An array containing every IP address in the range
-     */
-    public function explodeCidr($range)
-    {
-        $cidrData = explode('/', $range);
-
-        if (!isset($cidrData[1])) {
-            return array($range);
-        }
-
-        $blow = (
-            str_pad(decbin(ip2long($cidrData[0])), 32, "0", STR_PAD_LEFT) &
-            str_pad(str_pad("", $cidrData[1], "1"), 32, "0")
-        );
-        $bhigh = ($blow | str_pad(str_pad("", $cidrData[1], "0"), 32, "1"));
-
-        $list = array();
-
-        $bindecBHigh = bindec($bhigh);
-        for ($x = bindec($blow); $x <= $bindecBHigh; $x++) {
-            $list[] = long2ip($x);
-        }
-
-        return $list;
-    }
+	/**
+	 * Array of IP addresses which are TRUSTED proxies
+	 * @var string[]
+	 */
+	private $trustedCache;
+	/**
+	 * Array of IP addresses which are UNTRUSTED proxies
+	 * @var string[]
+	 */
+	private $untrustedCache = array();
+	/** @var PDOStatement */
+	private $trustedQuery;
+	/**
+	 * @var PdoDatabase
+	 */
+	private $database;
+
+	/**
+	 * Creates a new instance of the trust provider
+	 *
+	 * @param string[]    $squidIpList List of IP addresses to pre-approve
+	 * @param PdoDatabase $database
+	 */
+	public function __construct($squidIpList, PdoDatabase $database)
+	{
+		$this->trustedCache = $squidIpList;
+		$this->database = $database;
+	}
+
+	/**
+	 * Returns a value if the IP address is a trusted proxy
+	 *
+	 * @param string $ip
+	 *
+	 * @return bool
+	 */
+	public function isTrusted($ip)
+	{
+		if (in_array($ip, $this->trustedCache)) {
+			return true;
+		}
+
+		if (in_array($ip, $this->untrustedCache)) {
+			return false;
+		}
+
+		if ($this->trustedQuery === null) {
+			$query = "SELECT COUNT(id) FROM xfftrustcache WHERE ip = :ip;";
+			$this->trustedQuery = $this->database->prepare($query);
+		}
+
+		$this->trustedQuery->execute(array(":ip" => $ip));
+		$result = $this->trustedQuery->fetchColumn();
+		$this->trustedQuery->closeCursor();
+
+		if ($result == 0) {
+			$this->untrustedCache[] = $ip;
+
+			return false;
+		}
+
+		if ($result >= 1) {
+			$this->trustedCache[] = $ip;
+
+			return true;
+		}
+
+		// something weird has happened if we've got here.
+		// default to untrusted.
+		return false;
+	}
+
+	/**
+	 * Gets the last trusted IP in the proxy chain.
+	 *
+	 * @param string $ip      The IP address from REMOTE_ADDR
+	 * @param string $proxyIp The contents of the XFF header.
+	 *
+	 * @return string Trusted source IP address
+	 */
+	public function getTrustedClientIp($ip, $proxyIp)
+	{
+		$clientIpAddress = $ip;
+		if ($proxyIp) {
+			$ipList = explode(",", $proxyIp);
+			$ipList[] = $clientIpAddress;
+			$ipList = array_reverse($ipList);
+
+			foreach ($ipList as $ipNumber => $ipAddress) {
+				if ($this->isTrusted(trim($ipAddress)) && $ipNumber < (count($ipList) - 1)) {
+					continue;
+				}
+
+				$clientIpAddress = $ipAddress;
+				break;
+			}
+		}
+
+		return trim($clientIpAddress);
+	}
+
+	/**
+	 * Takes an array( "low" => "high" ) values, and returns true if $needle is in at least one of them.
+	 *
+	 * @param array  $haystack
+	 * @param string $ip
+	 *
+	 * @return bool
+	 */
+	public function ipInRange($haystack, $ip)
+	{
+		$needle = ip2long($ip);
+
+		foreach ($haystack as $low => $high) {
+			if (ip2long($low) <= $needle && ip2long($high) >= $needle) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Explodes a CIDR range into an array of addresses
+	 *
+	 * @param string $range A CIDR-format range
+	 *
+	 * @return array An array containing every IP address in the range
+	 */
+	public function explodeCidr($range)
+	{
+		$cidrData = explode('/', $range);
+
+		if (!isset($cidrData[1])) {
+			return array($range);
+		}
+
+		$blow = (
+			str_pad(decbin(ip2long($cidrData[0])), 32, "0", STR_PAD_LEFT) &
+			str_pad(str_pad("", $cidrData[1], "1"), 32, "0")
+		);
+		$bhigh = ($blow | str_pad(str_pad("", $cidrData[1], "0"), 32, "1"));
+
+		$list = array();
+
+		$bindecBHigh = bindec($bhigh);
+		for ($x = bindec($blow); $x <= $bindecBHigh; $x++) {
+			$list[] = long2ip($x);
+		}
+
+		return $list;
+	}
 }

smarty-plugins/function.defaultsort.php

Indentation +15 added lines, -15 removed lines

@@ -16,24 +16,24 @@
  */
 function smarty_function_defaultsort($params, Smarty_Internal_Template $template)
 {
-    if (empty($params['id'])) {
-        return "";
-    }
+	if (empty($params['id'])) {
+		return "";
+	}
 
-    $attr = 'data-sortname="' . htmlspecialchars($params['id'], ENT_QUOTES) . '"';
+	$attr = 'data-sortname="' . htmlspecialchars($params['id'], ENT_QUOTES) . '"';
 
-    if (empty($params['req'])) {
-        return $attr;
-    }
+	if (empty($params['req'])) {
+		return $attr;
+	}
 
-    if ($params['dir'] !== 'asc' && $params['dir'] !== 'desc') {
-        $params['dir'] = 'asc';
-    }
+	if ($params['dir'] !== 'asc' && $params['dir'] !== 'desc') {
+		$params['dir'] = 'asc';
+	}
 
-    $sort = '';
-    if ($params['req'] === $params['id']) {
-        $sort = ' data-defaultsort="' . htmlspecialchars($params['dir'], ENT_QUOTES) . '"';
-    }
+	$sort = '';
+	if ($params['req'] === $params['id']) {
+		$sort = ' data-defaultsort="' . htmlspecialchars($params['dir'], ENT_QUOTES) . '"';
+	}
 
-    return $attr . $sort;
+	return $attr . $sort;
 }
\ No newline at end of file

smarty-plugins/modifier.timespan.php

Indentation +55 added lines, -55 removed lines

@@ -16,78 +16,78 @@
  */
 function smarty_modifier_timespan($input)
 {
-    $remaining = abs(floor($input));
+	$remaining = abs(floor($input));
 
-    $seconds = $remaining % 60;
-    $remaining = $remaining - $seconds;
+	$seconds = $remaining % 60;
+	$remaining = $remaining - $seconds;
 
-    $minutes = $remaining % (60 * 60);
-    $remaining = $remaining - $minutes;
-    $minutes /= 60;
+	$minutes = $remaining % (60 * 60);
+	$remaining = $remaining - $minutes;
+	$minutes /= 60;
 
-    $hours = $remaining % (60 * 60 * 24);
-    $remaining = $remaining - $hours;
-    $hours /= (60 * 60);
+	$hours = $remaining % (60 * 60 * 24);
+	$remaining = $remaining - $hours;
+	$hours /= (60 * 60);
 
-    $days = $remaining % (60 * 60 * 24 * 7);
-    $weeks = $remaining - $days;
-    $days /= (60 * 60 * 24);
-    $weeks /= (60 * 60 * 24 * 7);
+	$days = $remaining % (60 * 60 * 24 * 7);
+	$weeks = $remaining - $days;
+	$days /= (60 * 60 * 24);
+	$weeks /= (60 * 60 * 24 * 7);
 
-    $stringval = '';
-    $trip = false;
+	$stringval = '';
+	$trip = false;
 
-    if ($weeks > 0) {
-        $stringval .= "${weeks}w ";
-    }
+	if ($weeks > 0) {
+		$stringval .= "${weeks}w ";
+	}
 
-    if ($days > 0) {
-        if ($stringval !== '') {
-            $trip = true;
-        }
+	if ($days > 0) {
+		if ($stringval !== '') {
+			$trip = true;
+		}
 
-        $stringval .= "${days}d ";
+		$stringval .= "${days}d ";
 
-        if ($trip) {
-            return trim($stringval);
-        }
-    }
+		if ($trip) {
+			return trim($stringval);
+		}
+	}
 
-    if ($hours > 0) {
-        if ($stringval !== '') {
-            $trip = true;
-        }
+	if ($hours > 0) {
+		if ($stringval !== '') {
+			$trip = true;
+		}
 
-        $stringval .= "${hours}h ";
+		$stringval .= "${hours}h ";
 
-        if ($trip) {
-            return trim($stringval);
-        }
-    }
+		if ($trip) {
+			return trim($stringval);
+		}
+	}
 
-    if ($minutes > 0) {
-        if ($stringval !== '') {
-            $trip = true;
-        }
+	if ($minutes > 0) {
+		if ($stringval !== '') {
+			$trip = true;
+		}
 
-        $stringval .= "${minutes}m ";
+		$stringval .= "${minutes}m ";
 
-        if ($trip) {
-            return trim($stringval);
-        }
-    }
+		if ($trip) {
+			return trim($stringval);
+		}
+	}
 
-    if ($seconds > 0) {
-        if ($stringval !== '') {
-            $trip = true;
-        }
+	if ($seconds > 0) {
+		if ($stringval !== '') {
+			$trip = true;
+		}
 
-        $stringval .= "${seconds}s ";
+		$stringval .= "${seconds}s ";
 
-        if ($trip) {
-            return trim($stringval);
-        }
-    }
+		if ($trip) {
+			return trim($stringval);
+		}
+	}
 
-    return trim($stringval);
+	return trim($stringval);
 }
\ No newline at end of file

smarty-plugins/modifier.relativedate.php

Indentation +62 added lines, -62 removed lines

@@ -16,73 +16,73 @@
  */
 function smarty_modifier_relativedate($input)
 {
-    $now = new DateTime();
+	$now = new DateTime();
 
-    if (gettype($input) === 'object'
-        && (get_class($input) === DateTime::class || get_class($input) === DateTimeImmutable::class)
-    ) {
-        $then = $input;
-    }
-    else {
-        try {
-            $then = new DateTime($input);
-        }
-        catch (Exception $ex) {
-            return $input;
-        }
-    }
+	if (gettype($input) === 'object'
+		&& (get_class($input) === DateTime::class || get_class($input) === DateTimeImmutable::class)
+	) {
+		$then = $input;
+	}
+	else {
+		try {
+			$then = new DateTime($input);
+		}
+		catch (Exception $ex) {
+			return $input;
+		}
+	}
 
-    $secs = $now->getTimestamp() - $then->getTimestamp();
+	$secs = $now->getTimestamp() - $then->getTimestamp();
 
-    $second = 1;
-    $minute = 60 * $second;
-    $minuteCut = 60 * $second;
-    $hour = 60 * $minute;
-    $hourCut = 90 * $minute;
-    $day = 24 * $hour;
-    $dayCut = 48 * $hour;
-    $week = 7 * $day;
-    $weekCut = 14 * $day;
-    $month = 30 * $day;
-    $monthCut = 60 * $day;
-    $year = 365 * $day;
-    $yearCut = $year * 2;
+	$second = 1;
+	$minute = 60 * $second;
+	$minuteCut = 60 * $second;
+	$hour = 60 * $minute;
+	$hourCut = 90 * $minute;
+	$day = 24 * $hour;
+	$dayCut = 48 * $hour;
+	$week = 7 * $day;
+	$weekCut = 14 * $day;
+	$month = 30 * $day;
+	$monthCut = 60 * $day;
+	$year = 365 * $day;
+	$yearCut = $year * 2;
 
-    $pluralise = true;
+	$pluralise = true;
 
-    if ($secs <= 10) {
-        $output = "just now";
-        $pluralise = false;
-    }
-    elseif ($secs > 10 && $secs < $minuteCut) {
-        $output = round($secs / $second) . " second";
-    }
-    elseif ($secs >= $minuteCut && $secs < $hourCut) {
-        $output = round($secs / $minute) . " minute";
-    }
-    elseif ($secs >= $hourCut && $secs < $dayCut) {
-        $output = round($secs / $hour) . " hour";
-    }
-    elseif ($secs >= $dayCut && $secs < $weekCut) {
-        $output = round($secs / $day) . " day";
-    }
-    elseif ($secs >= $weekCut && $secs < $monthCut) {
-        $output = round($secs / $week) . " week";
-    }
-    elseif ($secs >= $monthCut && $secs < $yearCut) {
-        $output = round($secs / $month) . " month";
-    }
-    elseif ($secs >= $yearCut && $secs < $year * 10) {
-        $output = round($secs / $year) . " year";
-    }
-    else {
-        $output = "a long time ago";
-        $pluralise = false;
-    }
+	if ($secs <= 10) {
+		$output = "just now";
+		$pluralise = false;
+	}
+	elseif ($secs > 10 && $secs < $minuteCut) {
+		$output = round($secs / $second) . " second";
+	}
+	elseif ($secs >= $minuteCut && $secs < $hourCut) {
+		$output = round($secs / $minute) . " minute";
+	}
+	elseif ($secs >= $hourCut && $secs < $dayCut) {
+		$output = round($secs / $hour) . " hour";
+	}
+	elseif ($secs >= $dayCut && $secs < $weekCut) {
+		$output = round($secs / $day) . " day";
+	}
+	elseif ($secs >= $weekCut && $secs < $monthCut) {
+		$output = round($secs / $week) . " week";
+	}
+	elseif ($secs >= $monthCut && $secs < $yearCut) {
+		$output = round($secs / $month) . " month";
+	}
+	elseif ($secs >= $yearCut && $secs < $year * 10) {
+		$output = round($secs / $year) . " year";
+	}
+	else {
+		$output = "a long time ago";
+		$pluralise = false;
+	}
 
-    if ($pluralise) {
-        $output = (substr($output, 0, 2) <> "1 ") ? $output . "s ago" : $output . " ago";
-    }
+	if ($pluralise) {
+		$output = (substr($output, 0, 2) <> "1 ") ? $output . "s ago" : $output . " ago";
+	}
 
-    return $output;
+	return $output;
 }

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 +425 added lines, -425 removed lines

@@ -31,429 +31,429 @@
  */
 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 = [
-                'Contains unassigned character',
-                'Contains incompatible mixed scripts',
-                'Does not contain any letters',
-                'Usernames must contain one or more characters',
-                'Usernames cannot contain characters from different writing systems',
-                'Usernames cannot contain the character'
-            ];
-
-            $skip = false;
-
-            foreach ($skippable as $s) {
-                if (strpos($ex->getMessage(), 'Encountered error while getting result: ' . $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 = [
+				'Contains unassigned character',
+				'Contains incompatible mixed scripts',
+				'Does not contain any letters',
+				'Usernames must contain one or more characters',
+				'Usernames cannot contain characters from different writing systems',
+				'Usernames cannot contain the character'
+			];
+
+			$skip = false;
+
+			foreach ($skippable as $s) {
+				if (strpos($ex->getMessage(), 'Encountered error while getting result: ' . $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.');
+	}
 }

includes/ConsoleStart.php

Indentation +52 added lines, -52 removed lines

@@ -15,66 +15,66 @@
 
 class ConsoleStart extends ApplicationBase
 {
-    /**
-     * @var ConsoleTaskBase
-     */
-    private $consoleTask;
+	/**
+	 * @var ConsoleTaskBase
+	 */
+	private $consoleTask;
 
-    /**
-     * ConsoleStart constructor.
-     *
-     * @param SiteConfiguration $configuration
-     * @param ConsoleTaskBase   $consoleTask
-     */
-    public function __construct(SiteConfiguration $configuration, ConsoleTaskBase $consoleTask)
-    {
-        parent::__construct($configuration);
-        $this->consoleTask = $consoleTask;
-    }
+	/**
+	 * ConsoleStart constructor.
+	 *
+	 * @param SiteConfiguration $configuration
+	 * @param ConsoleTaskBase   $consoleTask
+	 */
+	public function __construct(SiteConfiguration $configuration, ConsoleTaskBase $consoleTask)
+	{
+		parent::__construct($configuration);
+		$this->consoleTask = $consoleTask;
+	}
 
-    protected function setupEnvironment()
-    {
-        // initialise super-global providers
-        WebRequest::setGlobalStateProvider(new FakeGlobalStateProvider());
+	protected function setupEnvironment()
+	{
+		// initialise super-global providers
+		WebRequest::setGlobalStateProvider(new FakeGlobalStateProvider());
 
-        if (WebRequest::method() !== null) {
-            throw new EnvironmentException('This is a console task, which cannot be executed via the web.');
-        }
+		if (WebRequest::method() !== null) {
+			throw new EnvironmentException('This is a console task, which cannot be executed via the web.');
+		}
 
-        return parent::setupEnvironment();
-    }
+		return parent::setupEnvironment();
+	}
 
-    protected function cleanupEnvironment()
-    {
-    }
+	protected function cleanupEnvironment()
+	{
+	}
 
-    /**
-     * Main application logic
-     */
-    protected function main()
-    {
-        $database = PdoDatabase::getDatabaseConnection('acc');
+	/**
+	 * Main application logic
+	 */
+	protected function main()
+	{
+		$database = PdoDatabase::getDatabaseConnection('acc');
 
-        $this->setupHelpers($this->consoleTask, $this->getConfiguration(), $database);
+		$this->setupHelpers($this->consoleTask, $this->getConfiguration(), $database);
 
-        // initialise a database transaction
-        if (!$database->beginTransaction()) {
-            throw new Exception('Failed to start transaction on primary database.');
-        }
+		// initialise a database transaction
+		if (!$database->beginTransaction()) {
+			throw new Exception('Failed to start transaction on primary database.');
+		}
 
-        try {
-            // run the task
-            $this->consoleTask->execute();
+		try {
+			// run the task
+			$this->consoleTask->execute();
 
-            if ($database->hasActiveTransaction()) {
-                $database->commit();
-            }
-        }
-        finally {
-            // Catch any hanging on transactions
-            if ($database->hasActiveTransaction()) {
-                $database->rollBack();
-            }
-        }
-    }
+			if ($database->hasActiveTransaction()) {
+				$database->commit();
+			}
+		}
+		finally {
+			// Catch any hanging on transactions
+			if ($database->hasActiveTransaction()) {
+				$database->rollBack();
+			}
+		}
+	}
 }
\ No newline at end of file

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, $siteConfiguration));
-                }
-                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, $siteConfiguration));
+				}
+				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;
+	}
 }