mdaniels5757 / waca

includes/Security/Token.php

Indentation +69 added lines, -69 removed lines

@@ -12,80 +12,80 @@
 
 class Token
 {
-    /** @var string */
-    private $tokenData;
-    /** @var string */
-    private $context;
-    /** @var DateTimeImmutable */
-    private $generationTimestamp;
-    /** @var DateTimeImmutable */
-    private $usageTimestamp;
-    /** @var bool */
-    private $used;
+	/** @var string */
+	private $tokenData;
+	/** @var string */
+	private $context;
+	/** @var DateTimeImmutable */
+	private $generationTimestamp;
+	/** @var DateTimeImmutable */
+	private $usageTimestamp;
+	/** @var bool */
+	private $used;
 
-    /**
-     * Token constructor.
-     *
-     * @param string $tokenData
-     * @param string $context
-     */
-    public function __construct($tokenData, $context)
-    {
-        $this->tokenData = $tokenData;
-        $this->context = $context;
-        $this->generationTimestamp = new DateTimeImmutable();
-        $this->usageTimestamp = null;
-        $this->used = false;
-    }
+	/**
+	 * Token constructor.
+	 *
+	 * @param string $tokenData
+	 * @param string $context
+	 */
+	public function __construct($tokenData, $context)
+	{
+		$this->tokenData = $tokenData;
+		$this->context = $context;
+		$this->generationTimestamp = new DateTimeImmutable();
+		$this->usageTimestamp = null;
+		$this->used = false;
+	}
 
-    /**
-     * @return DateTimeImmutable
-     */
-    public function getGenerationTimestamp()
-    {
-        return $this->generationTimestamp;
-    }
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public function getGenerationTimestamp()
+	{
+		return $this->generationTimestamp;
+	}
 
-    /**
-     * @return string
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
+	/**
+	 * @return string
+	 */
+	public function getContext()
+	{
+		return $this->context;
+	}
 
-    /**
-     * @return string
-     */
-    public function getTokenData()
-    {
-        return $this->tokenData;
-    }
+	/**
+	 * @return string
+	 */
+	public function getTokenData()
+	{
+		return $this->tokenData;
+	}
 
-    /**
-     * Returns a value indicating whether the token has already been used or not
-     *
-     * @return boolean
-     */
-    public function isUsed()
-    {
-        return $this->used;
-    }
+	/**
+	 * Returns a value indicating whether the token has already been used or not
+	 *
+	 * @return boolean
+	 */
+	public function isUsed()
+	{
+		return $this->used;
+	}
 
-    /**
-     * Marks the token as used
-     */
-    public function markAsUsed()
-    {
-        $this->used = true;
-        $this->usageTimestamp = new DateTimeImmutable();
-    }
+	/**
+	 * Marks the token as used
+	 */
+	public function markAsUsed()
+	{
+		$this->used = true;
+		$this->usageTimestamp = new DateTimeImmutable();
+	}
 
-    /**
-     * @return DateTimeImmutable
-     */
-    public function getUsageTimestamp()
-    {
-        return $this->usageTimestamp;
-    }
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public function getUsageTimestamp()
+	{
+		return $this->usageTimestamp;
+	}
 }
\ No newline at end of file

includes/Security/TokenManager.php

Indentation +87 added lines, -87 removed lines

@@ -13,91 +13,91 @@
 
 class TokenManager
 {
-    /**
-     * Validates a CSRF token
-     *
-     * @param string      $data    The token data string itself
-     * @param string|null $context Token context for extra validation
-     *
-     * @return bool
-     */
-    public function validateToken($data, $context = null)
-    {
-        if (!is_string($data) || strlen($data) === 0) {
-            // Nothing to validate
-            return false;
-        }
-
-        $tokens = WebRequest::getSessionTokenData();
-
-        // if the token doesn't exist, then it's not valid
-        if (!array_key_exists($data, $tokens)) {
-            return false;
-        }
-
-        /** @var Token $token */
-        $token = unserialize($tokens[$data]);
-
-        if ($token->getTokenData() !== $data) {
-            return false;
-        }
-
-        if ($token->getContext() !== $context) {
-            return false;
-        }
-
-        if ($token->isUsed()) {
-            return false;
-        }
-
-        // mark the token as used, and save it back to the session
-        $token->markAsUsed();
-        $this->storeToken($token);
-
-        return true;
-    }
-
-    /**
-     * @param string|null $context An optional context for extra validation
-     *
-     * @return Token
-     */
-    public function getNewToken($context = null)
-    {
-        $token = new Token($this->generateTokenData(), $context);
-        $this->storeToken($token);
-
-        return $token;
-    }
-
-    /**
-     * Stores a token in the session data
-     *
-     * @param Token $token
-     */
-    private function storeToken(Token $token)
-    {
-        $tokens = WebRequest::getSessionTokenData();
-        $tokens[$token->getTokenData()] = serialize($token);
-        WebRequest::setSessionTokenData($tokens);
-    }
-
-    /**
-     * Generates a security token
-     *
-     * @return string
-     * @throws Exception
-     *
-     * @category Security-Critical
-     */
-    private function generateTokenData()
-    {
-        $genBytes = openssl_random_pseudo_bytes(33);
-
-        if ($genBytes !== false) {
-            return base64_encode($genBytes);
-        }
-
-        throw new Exception('Unable to generate secure token.');
-    }
+	/**
+	 * Validates a CSRF token
+	 *
+	 * @param string      $data    The token data string itself
+	 * @param string|null $context Token context for extra validation
+	 *
+	 * @return bool
+	 */
+	public function validateToken($data, $context = null)
+	{
+		if (!is_string($data) || strlen($data) === 0) {
+			// Nothing to validate
+			return false;
+		}
+
+		$tokens = WebRequest::getSessionTokenData();
+
+		// if the token doesn't exist, then it's not valid
+		if (!array_key_exists($data, $tokens)) {
+			return false;
+		}
+
+		/** @var Token $token */
+		$token = unserialize($tokens[$data]);
+
+		if ($token->getTokenData() !== $data) {
+			return false;
+		}
+
+		if ($token->getContext() !== $context) {
+			return false;
+		}
+
+		if ($token->isUsed()) {
+			return false;
+		}
+
+		// mark the token as used, and save it back to the session
+		$token->markAsUsed();
+		$this->storeToken($token);
+
+		return true;
+	}
+
+	/**
+	 * @param string|null $context An optional context for extra validation
+	 *
+	 * @return Token
+	 */
+	public function getNewToken($context = null)
+	{
+		$token = new Token($this->generateTokenData(), $context);
+		$this->storeToken($token);
+
+		return $token;
+	}
+
+	/**
+	 * Stores a token in the session data
+	 *
+	 * @param Token $token
+	 */
+	private function storeToken(Token $token)
+	{
+		$tokens = WebRequest::getSessionTokenData();
+		$tokens[$token->getTokenData()] = serialize($token);
+		WebRequest::setSessionTokenData($tokens);
+	}
+
+	/**
+	 * Generates a security token
+	 *
+	 * @return string
+	 * @throws Exception
+	 *
+	 * @category Security-Critical
+	 */
+	private function generateTokenData()
+	{
+		$genBytes = openssl_random_pseudo_bytes(33);
+
+		if ($genBytes !== false) {
+			return base64_encode($genBytes);
+		}
+
+		throw new Exception('Unable to generate secure token.');
+	}
 }
\ No newline at end of file

includes/API/Actions/StatsAction.php

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 
         if ($username !== null) {
             $user = User::getByUsername($username, $this->getDatabase());
-        }
-        else {
+        } else {
             $user = User::getByOnWikiUsername($wikiusername, $this->getDatabase());
         }
 

Indentation +40 added lines, -40 removed lines

@@ -23,53 +23,53 @@
  */
 class StatsAction extends XmlApiPageBase implements IXmlApiAction
 {
-    /**
-     * Summary of execute
-     *
-     * @param DOMElement $apiDocument
-     *
-     * @return DOMElement
-     * @throws ApiException
-     * @throws Exception
-     */
-    public function executeApiAction(DOMElement $apiDocument)
-    {
-        $username = WebRequest::getString('user');
-        $wikiusername = WebRequest::getString('wikiuser');
+	/**
+	 * Summary of execute
+	 *
+	 * @param DOMElement $apiDocument
+	 *
+	 * @return DOMElement
+	 * @throws ApiException
+	 * @throws Exception
+	 */
+	public function executeApiAction(DOMElement $apiDocument)
+	{
+		$username = WebRequest::getString('user');
+		$wikiusername = WebRequest::getString('wikiuser');
 
-        if ($username === null && $wikiusername === null) {
-            throw new ApiException("Please specify a username using either user or wikiuser parameters.");
-        }
+		if ($username === null && $wikiusername === null) {
+			throw new ApiException("Please specify a username using either user or wikiuser parameters.");
+		}
 
-        $userElement = $this->document->createElement("user");
-        $apiDocument->appendChild($userElement);
+		$userElement = $this->document->createElement("user");
+		$apiDocument->appendChild($userElement);
 
-        if ($username !== null) {
-            $user = User::getByUsername($username, $this->getDatabase());
-        }
-        else {
-            $user = User::getByOnWikiUsername($wikiusername, $this->getDatabase());
-        }
+		if ($username !== null) {
+			$user = User::getByUsername($username, $this->getDatabase());
+		}
+		else {
+			$user = User::getByOnWikiUsername($wikiusername, $this->getDatabase());
+		}
 
-        if ($user === false) {
-            $userElement->setAttribute("missing", "true");
+		if ($user === false) {
+			$userElement->setAttribute("missing", "true");
 
-            return $apiDocument;
-        }
+			return $apiDocument;
+		}
 
-        $oauth = new OAuthUserHelper($user, $this->getDatabase(), $this->getOAuthProtocolHelper(),
-            $this->getSiteConfiguration());
+		$oauth = new OAuthUserHelper($user, $this->getDatabase(), $this->getOAuthProtocolHelper(),
+			$this->getSiteConfiguration());
 
-        // FIXME: domains
-        $prefs = new PreferenceManager($this->getDatabase(), $user->getId(), 1);
+		// FIXME: domains
+		$prefs = new PreferenceManager($this->getDatabase(), $user->getId(), 1);
 
-        $userElement->setAttribute("username", $user->getUsername());
-        $userElement->setAttribute("status", $user->getStatus());
-        $userElement->setAttribute("lastactive", $user->getLastActive());
-        $userElement->setAttribute("welcome_template", $prefs->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE));
-        $userElement->setAttribute("onwikiname", $user->getOnWikiName());
-        $userElement->setAttribute("oauth", $oauth->isFullyLinked() ? "true" : "false");
+		$userElement->setAttribute("username", $user->getUsername());
+		$userElement->setAttribute("status", $user->getStatus());
+		$userElement->setAttribute("lastactive", $user->getLastActive());
+		$userElement->setAttribute("welcome_template", $prefs->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE));
+		$userElement->setAttribute("onwikiname", $user->getOnWikiName());
+		$userElement->setAttribute("oauth", $oauth->isFullyLinked() ? "true" : "false");
 
-        return $apiDocument;
-    }
+		return $apiDocument;
+	}
 }

includes/API/ApiException.php

Indentation +7 added lines, -7 removed lines

@@ -15,11 +15,11 @@
  */
 class ApiException extends Exception
 {
-    /**
-     * @param string $message
-     */
-    public function __construct($message)
-    {
-        $this->message = $message;
-    }
+	/**
+	 * @param string $message
+	 */
+	public function __construct($message)
+	{
+		$this->message = $message;
+	}
 }

includes/StringFunctions.php

Braces +1 added lines, -2 removed lines

@@ -78,8 +78,7 @@
     {
         if (ord($string) < 128) {
             return ucfirst($string);
-        }
-        else {
+        } else {
             return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1);
         }
     }

Indentation +16 added lines, -16 removed lines

@@ -10,20 +10,20 @@
 
 class StringFunctions
 {
-    /**
-     * Make a string's first character uppercase
-     *
-     * @param string $string
-     *
-     * @return string
-     */
-    public function upperCaseFirst($string)
-    {
-        if (ord($string) < 128) {
-            return ucfirst($string);
-        }
-        else {
-            return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1);
-        }
-    }
+	/**
+	 * Make a string's first character uppercase
+	 *
+	 * @param string $string
+	 *
+	 * @return string
+	 */
+	public function upperCaseFirst($string)
+	{
+		if (ord($string) < 128) {
+			return ucfirst($string);
+		}
+		else {
+			return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1);
+		}
+	}
 }

includes/Providers/FakeLocationProvider.php

Indentation +4 added lines, -4 removed lines

@@ -15,8 +15,8 @@
  */
 class FakeLocationProvider implements ILocationProvider
 {
-    public function getIpLocation($address)
-    {
-        return null;
-    }
+	public function getIpLocation($address)
+	{
+		return null;
+	}
 }

includes/Providers/Interfaces/ILocationProvider.php

Indentation +6 added lines, -6 removed lines

@@ -13,10 +13,10 @@
  */
 interface ILocationProvider
 {
-    /**
-     * @param string $address IP address
-     *
-     * @return array
-     */
-    public function getIpLocation($address);
+	/**
+	 * @param string $address IP address
+	 *
+	 * @return array
+	 */
+	public function getIpLocation($address);
 }

includes/Providers/Interfaces/IXffTrustProvider.php

Indentation +34 added lines, -34 removed lines

@@ -19,41 +19,41 @@
  */
 interface IXffTrustProvider
 {
-    /**
-     * Returns a value if the IP address is a trusted proxy
-     *
-     * @param string $ip
-     *
-     * @return bool
-     */
-    public function isTrusted($ip);
+	/**
+	 * Returns a value if the IP address is a trusted proxy
+	 *
+	 * @param string $ip
+	 *
+	 * @return bool
+	 */
+	public function isTrusted($ip);
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-    /**
-     * 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);
+	/**
+	 * 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);
 }

includes/Providers/Interfaces/IRDnsProvider.php

Indentation +8 added lines, -8 removed lines

@@ -13,12 +13,12 @@
  */
 interface IRDnsProvider
 {
-    /**
-     * Gets the reverse DNS address for an IP
-     *
-     * @param string $address
-     *
-     * @return string
-     */
-    public function getReverseDNS($address);
+	/**
+	 * Gets the reverse DNS address for an IP
+	 *
+	 * @param string $address
+	 *
+	 * @return string
+	 */
+	public function getReverseDNS($address);
 }