mdaniels5757 / waca

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);
 }

includes/Providers/Interfaces/IAntiSpoofProvider.php

Indentation +6 added lines, -6 removed lines

@@ -13,10 +13,10 @@
  */
 interface IAntiSpoofProvider
 {
-    /**
-     * @param string $username
-     *
-     * @return array
-     */
-    public function getSpoofs($username);
+	/**
+	 * @param string $username
+	 *
+	 * @return array
+	 */
+	public function getSpoofs($username);
 }

includes/Providers/CachedRDnsLookupProvider.php

Indentation +27 added lines, -27 removed lines

@@ -20,40 +20,40 @@
  */
 class CachedRDnsLookupProvider implements IRDnsProvider
 {
-    private $database;
+	private $database;
 
-    public function __construct(PdoDatabase $database)
-    {
-        $this->database = $database;
-    }
+	public function __construct(PdoDatabase $database)
+	{
+		$this->database = $database;
+	}
 
-    public function getReverseDNS($address)
-    {
-        $address = trim($address);
+	public function getReverseDNS($address)
+	{
+		$address = trim($address);
 
-        // lets look in our cache database first.
-        $rDns = RDnsCache::getByAddress($address, $this->database);
+		// lets look in our cache database first.
+		$rDns = RDnsCache::getByAddress($address, $this->database);
 
-        if ($rDns instanceof RDnsCache) {
-            // touch cache timer
-            $rDns->save();
+		if ($rDns instanceof RDnsCache) {
+			// touch cache timer
+			$rDns->save();
 
-            return $rDns->getData();
-        }
+			return $rDns->getData();
+		}
 
-        // OK, it's not there, let's do an rDNS lookup.
-        $result = @ gethostbyaddr($address);
+		// OK, it's not there, let's do an rDNS lookup.
+		$result = @ gethostbyaddr($address);
 
-        if ($result !== false) {
-            $rDns = new RDnsCache();
-            $rDns->setDatabase($this->database);
-            $rDns->setAddress($address);
-            $rDns->setData($result);
-            $rDns->save();
+		if ($result !== false) {
+			$rDns = new RDnsCache();
+			$rDns->setDatabase($this->database);
+			$rDns->setAddress($address);
+			$rDns->setData($result);
+			$rDns->save();
 
-            return $result;
-        }
+			return $result;
+		}
 
-        return null;
-    }
+		return null;
+	}
 }

includes/Providers/TorExitProvider.php

Indentation +75 added lines, -75 removed lines

@@ -13,96 +13,96 @@
 
 class TorExitProvider
 {
-    /** @var PdoDatabase */
-    private $database;
-
-    /**
-     * TorExitProvider constructor.
-     *
-     * @param PdoDatabase $database
-     */
-    public function __construct(PdoDatabase $database)
-    {
-        $this->database = $database;
-    }
-
-    /**
-     * Checks whether an IP address is a Tor exit node for one of the pre-cached IP addresses.
-     *
-     * @param string $ip IP Address
-     *
-     * @return bool
-     */
-    public function isTorExit($ip)
-    {
-        $statement = $this->database->prepare('SELECT COUNT(1) FROM tornodecache WHERE ipaddr = :ip');
-
-        $statement->execute(array(':ip' => $ip));
-
-        $count = $statement->fetchColumn();
-        $statement->closeCursor();
-
-        if ($count > 0) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    public static function regenerate(PdoDatabase $database, HttpHelper $httpHelper, $destinationIps)
-    {
-        $query = <<<SQL
+	/** @var PdoDatabase */
+	private $database;
+
+	/**
+	 * TorExitProvider constructor.
+	 *
+	 * @param PdoDatabase $database
+	 */
+	public function __construct(PdoDatabase $database)
+	{
+		$this->database = $database;
+	}
+
+	/**
+	 * Checks whether an IP address is a Tor exit node for one of the pre-cached IP addresses.
+	 *
+	 * @param string $ip IP Address
+	 *
+	 * @return bool
+	 */
+	public function isTorExit($ip)
+	{
+		$statement = $this->database->prepare('SELECT COUNT(1) FROM tornodecache WHERE ipaddr = :ip');
+
+		$statement->execute(array(':ip' => $ip));
+
+		$count = $statement->fetchColumn();
+		$statement->closeCursor();
+
+		if ($count > 0) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+
+	public static function regenerate(PdoDatabase $database, HttpHelper $httpHelper, $destinationIps)
+	{
+		$query = <<<SQL
 INSERT INTO tornodecache (ipaddr, exitaddr, exitport)
 VALUES (:ipaddr, :exitaddr, :exitport)
 ON DUPLICATE KEY
 UPDATE touched = CURRENT_TIMESTAMP, updateversion = updateversion + 1
 SQL;
 
-        $statement = $database->prepare($query);
+		$statement = $database->prepare($query);
 
-        foreach ($destinationIps as $ip) {
-            echo 'Fetching data for ' . $ip . PHP_EOL;
+		foreach ($destinationIps as $ip) {
+			echo 'Fetching data for ' . $ip . PHP_EOL;
 
-            $statement->bindValue(':exitaddr', $ip);
+			$statement->bindValue(':exitaddr', $ip);
 
-            $http = $httpHelper->get(
-                'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
-                array(
-                    'ip'   => $ip,
-                    'port' => 80,
-                ));
+			$http = $httpHelper->get(
+				'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
+				array(
+					'ip'   => $ip,
+					'port' => 80,
+				));
 
-            $https = $httpHelper->get(
-                'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
-                array(
-                    'ip'   => $ip,
-                    'port' => 443,
-                ));
+			$https = $httpHelper->get(
+				'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
+				array(
+					'ip'   => $ip,
+					'port' => 443,
+				));
 
-            foreach (array(80 => $http, 443 => $https) as $port => $response) {
-                echo '  Running for port ' . $ip . ':' . $port . PHP_EOL;
+			foreach (array(80 => $http, 443 => $https) as $port => $response) {
+				echo '  Running for port ' . $ip . ':' . $port . PHP_EOL;
 
-                $statement->bindValue(':exitport', $port);
+				$statement->bindValue(':exitport', $port);
 
-                $lines = explode("\n", $response);
+				$lines = explode("\n", $response);
 
-                foreach ($lines as $line) {
-                    // line contains a comment char, just skip the line.
-                    // This is OK as of 2016-04-06  --stw
-                    if (strpos($line, '#') !== false) {
-                        continue;
-                    }
+				foreach ($lines as $line) {
+					// line contains a comment char, just skip the line.
+					// This is OK as of 2016-04-06  --stw
+					if (strpos($line, '#') !== false) {
+						continue;
+					}
 
-                    $statement->bindValue(':ipaddr', $line);
-                    $statement->execute();
-                }
-            }
+					$statement->bindValue(':ipaddr', $line);
+					$statement->execute();
+				}
+			}
 
-            echo 'Done for ' . $ip . PHP_EOL;
-        }
+			echo 'Done for ' . $ip . PHP_EOL;
+		}
 
-        // kill old cached entries
-        $database->exec('DELETE FROM tornodecache WHERE touched < DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 DAY)');
-    }
+		// kill old cached entries
+		$database->exec('DELETE FROM tornodecache WHERE touched < DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 DAY)');
+	}
 }
\ No newline at end of file

includes/Providers/CachedApiAntispoofProvider.php

Indentation +61 added lines, -61 removed lines

@@ -22,77 +22,77 @@
  */
 class CachedApiAntispoofProvider implements IAntiSpoofProvider
 {
-    /**
-     * @var PdoDatabase
-     */
-    private $database;
-    /**
-     * @var string
-     */
-    private $mediawikiWebServiceEndpoint;
-    /**
-     * @var HttpHelper
-     */
-    private $httpHelper;
+	/**
+	 * @var PdoDatabase
+	 */
+	private $database;
+	/**
+	 * @var string
+	 */
+	private $mediawikiWebServiceEndpoint;
+	/**
+	 * @var HttpHelper
+	 */
+	private $httpHelper;
 
-    public function __construct(PdoDatabase $database, $mediawikiWebServiceEndpoint, HttpHelper $httpHelper)
-    {
-        $this->database = $database;
-        $this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
-        $this->httpHelper = $httpHelper;
-    }
+	public function __construct(PdoDatabase $database, $mediawikiWebServiceEndpoint, HttpHelper $httpHelper)
+	{
+		$this->database = $database;
+		$this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
+		$this->httpHelper = $httpHelper;
+	}
 
-    public function getSpoofs($username)
-    {
-        /** @var AntiSpoofCache $cacheResult */
-        $cacheResult = AntiSpoofCache::getByUsername($username, $this->database);
-        if ($cacheResult == false) {
-            // get the data from the API
-            $data = $this->httpHelper->get($this->mediawikiWebServiceEndpoint, array(
-                'action'   => 'antispoof',
-                'format'   => 'php',
-                'username' => $username,
-            ));
+	public function getSpoofs($username)
+	{
+		/** @var AntiSpoofCache $cacheResult */
+		$cacheResult = AntiSpoofCache::getByUsername($username, $this->database);
+		if ($cacheResult == false) {
+			// get the data from the API
+			$data = $this->httpHelper->get($this->mediawikiWebServiceEndpoint, array(
+				'action'   => 'antispoof',
+				'format'   => 'php',
+				'username' => $username,
+			));
 
-            $cacheEntry = new AntiSpoofCache();
-            $cacheEntry->setDatabase($this->database);
-            $cacheEntry->setUsername($username);
-            $cacheEntry->setData($data);
-            $cacheEntry->save();
+			$cacheEntry = new AntiSpoofCache();
+			$cacheEntry->setDatabase($this->database);
+			$cacheEntry->setUsername($username);
+			$cacheEntry->setData($data);
+			$cacheEntry->save();
 
-            $cacheResult = $cacheEntry;
-        }
-        else {
-            $data = $cacheResult->getData();
-        }
+			$cacheResult = $cacheEntry;
+		}
+		else {
+			$data = $cacheResult->getData();
+		}
 
-        $result = unserialize($data);
+		$result = unserialize($data);
 
-        if (!isset($result['antispoof']) || !isset($result['antispoof']['result'])) {
-            $cacheResult->delete();
+		if (!isset($result['antispoof']) || !isset($result['antispoof']['result'])) {
+			$cacheResult->delete();
 
-            if (isset($result['error']['info'])) {
-                throw new Exception("Unrecognised API response to query: " . $result['error']['info']);
-            }
+			if (isset($result['error']['info'])) {
+				throw new Exception("Unrecognised API response to query: " . $result['error']['info']);
+			}
 
-            throw new Exception("Unrecognised API response to query.");
-        }
+			throw new Exception("Unrecognised API response to query.");
+		}
 
-        if ($result['antispoof']['result'] == "pass") {
-            // All good here!
-            return array();
-        }
+		if ($result['antispoof']['result'] == "pass") {
+			// All good here!
+			return array();
+		}
 
-        if ($result['antispoof']['result'] == "conflict") {
-            // we've got conflicts, let's do something with them.
-            return $result['antispoof']['users'];
-        }
+		if ($result['antispoof']['result'] == "conflict") {
+			// we've got conflicts, let's do something with them.
+			return $result['antispoof']['users'];
+		}
 
-        if ($result['antispoof']['result'] == "error") {
-            // we've got conflicts, let's do something with them.
-            throw new Exception("Encountered error while getting result: " . $result['antispoof']['error']);
-        }
+		if ($result['antispoof']['result'] == "error") {
+			// we've got conflicts, let's do something with them.
+			throw new Exception("Encountered error while getting result: " . $result['antispoof']['error']);
+		}
 
-        throw new Exception("Unrecognised API response to query.");
-    }
+		throw new Exception("Unrecognised API response to query.");
+	}
 }

includes/ConsoleTasks/ClearOldDataTask.php

Indentation +13 added lines, -13 removed lines

@@ -13,25 +13,25 @@
 
 class ClearOldDataTask extends ConsoleTaskBase
 {
-    public function execute()
-    {
-        $dataClearInterval = $this->getSiteConfiguration()->getDataClearInterval();
+	public function execute()
+	{
+		$dataClearInterval = $this->getSiteConfiguration()->getDataClearInterval();
 
-        $query = $this->getDatabase()->prepare(<<<SQL
+		$query = $this->getDatabase()->prepare(<<<SQL
 UPDATE request
 SET ip = :ip, forwardedip = null, email = :mail, useragent = ''
 WHERE date < DATE_SUB(curdate(), INTERVAL {$dataClearInterval})
 AND status = 'Closed';
 SQL
-        );
+		);
 
-        $success = $query->execute(array(
-            ":ip"   => $this->getSiteConfiguration()->getDataClearIp(),
-            ":mail" => $this->getSiteConfiguration()->getDataClearEmail(),
-        ));
+		$success = $query->execute(array(
+			":ip"   => $this->getSiteConfiguration()->getDataClearIp(),
+			":mail" => $this->getSiteConfiguration()->getDataClearEmail(),
+		));
 
-        if (!$success) {
-            throw new Exception("Error in transaction: Could not clear data.");
-        }
-    }
+		if (!$success) {
+			throw new Exception("Error in transaction: Could not clear data.");
+		}
+	}
 }
\ No newline at end of file

includes/ConsoleTasks/ClearExpiredIdentificationData.php

Indentation +7 added lines, -7 removed lines

@@ -13,11 +13,11 @@
 
 class ClearExpiredIdentificationData extends ConsoleTaskBase
 {
-    /**
-     * @return void
-     */
-    public function execute()
-    {
-        IdentificationVerifier::clearExpiredCacheEntries($this->getSiteConfiguration(), $this->getDatabase());
-    }
+	/**
+	 * @return void
+	 */
+	public function execute()
+	{
+		IdentificationVerifier::clearExpiredCacheEntries($this->getSiteConfiguration(), $this->getDatabase());
+	}
 }