kristuff / abuseipdb

lib/ApiHandler.php

Indentation +10 added lines, -10 removed lines

@@ -133,7 +133,7 @@ 
      */
     public function report(string $ip = '', string $categories = '', string $message = '', bool $returnArray = false)
     {
-         // ip must be set
+            // ip must be set
         if (empty($ip)){
             throw new \InvalidArgumentException('Ip was empty');
         }
@@ -144,7 +144,7 @@ 
         }
 
         // message must be set
-          if (empty($message)){
+            if (empty($message)){
             throw new \InvalidArgumentException('report message was empty');
         }
 
@@ -285,7 +285,7 @@ 
 
         // option
         if ($verbose){
-           $data['verbose'] = true;
+            $data['verbose'] = true;
         }
 
         $response = $this->apiRequest('check', $data, 'GET') ;
@@ -466,7 +466,7 @@ 
      * @access public
      * @param string      $message           The original message 
      *  
-	 * @return string
+     * @return string
      */
     protected function cleanMessage(string $message)
     {
@@ -491,10 +491,10 @@ 
      *
      * @access public
      * @static
-	 * @param string    $filePath       The file's full path
-	 * @param bool      $throwError     Throw error on true or silent process. Default is true
+     * @param string    $filePath       The file's full path
+     * @param bool      $throwError     Throw error on true or silent process. Default is true
      *  
-	 * @return object|null 
+     * @return object|null 
      * @throws \Exception
      * @throws \LogicException
      */
@@ -502,10 +502,10 @@ 
     {
         // check file exists
         if (!file_exists($filePath) || !is_file($filePath)){
-           if ($throwError) {
+            if ($throwError) {
                 throw new \Exception('Config file not found');
-           }
-           return null;  
+            }
+            return null;  
         }
 
         // get and parse content

Spacing +30 added lines, -30 removed lines

@@ -39,7 +39,7 @@ 
      * @access protected
      * @var array $selfIps  
      */
-    protected $selfIps = []; 
+    protected $selfIps = [ ]; 
 
     /**
      * Constructor
@@ -50,7 +50,7 @@ 
      * @param array   $myIps      The Ips/domain name you dont want to display in report messages
      * 
      */
-    public function __construct(string $apiKey, string $userId, array $myIps = [])
+    public function __construct(string $apiKey, string $userId, array $myIps = [ ])
     {
         $this->aipdbApiKey = $apiKey;
         $this->aipdbUserId = $userId;
@@ -88,21 +88,21 @@ 
     {
 
         // check file exists
-        if (!file_exists($configPath) || !is_file($configPath)){
+        if (!file_exists($configPath) || !is_file($configPath)) {
             throw new \InvalidArgumentException('The file [' . $configPath . '] does not exist.');
         }
 
         // check file is readable
-        if (!is_readable($configPath)){
+        if (!is_readable($configPath)) {
             throw new InvalidPermissionException('The file [' . $configPath . '] is not readable.');
         }
 
         $keyConfig = self::loadJsonFile($configPath);
-        $selfIps = [];
+        $selfIps = [ ];
         
         // Look for other optional config files in the same directory 
         $selfIpsConfigPath = pathinfo($configPath, PATHINFO_DIRNAME) . DIRECTORY_SEPARATOR . 'self_ips.json';
-        if (file_exists($selfIpsConfigPath)){
+        if (file_exists($selfIpsConfigPath)) {
             $selfIps = self::loadJsonFile($selfIpsConfigPath)->self_ips;
         }
 
@@ -134,17 +134,17 @@ 
     public function report(string $ip = '', string $categories = '', string $message = '', bool $returnArray = false)
     {
          // ip must be set
-        if (empty($ip)){
+        if (empty($ip)) {
             throw new \InvalidArgumentException('Ip was empty');
         }
 
         // categories must be set
-        if (empty($categories)){
+        if (empty($categories)) {
             throw new \InvalidArgumentException('categories list was empty');
         }
 
         // message must be set
-          if (empty($message)){
+          if (empty($message)) {
             throw new \InvalidArgumentException('report message was empty');
         }
 
@@ -204,17 +204,17 @@ 
     public function bulkReport(string $filePath, bool $returnArray = false)
     {
         // check file exists
-        if (!file_exists($filePath) || !is_file($filePath)){
+        if (!file_exists($filePath) || !is_file($filePath)) {
             throw new \InvalidArgumentException('The file [' . $filePath . '] does not exist.');
         }
 
         // check file is readable
-        if (!is_readable($filePath)){
+        if (!is_readable($filePath)) {
             throw new InvalidPermissionException('The file [' . $filePath . '] is not readable.');
         }
 
         // AbuseIPDB request
-        $response = $this->apiRequest('bulk-report', [], 'POST', $filePath);
+        $response = $this->apiRequest('bulk-report', [ ], 'POST', $filePath);
 
         return json_decode($response, $returnArray);
     }
@@ -240,7 +240,7 @@ 
     public function clear(string $ip = null, bool $returnArray = false)
     {
         // ip must be set
-        if (empty($ip)){
+        if (empty($ip)) {
             throw new \InvalidArgumentException('ip argument must be set (null given)');
         }
 
@@ -249,7 +249,7 @@ 
             'ipAddress'     => $ip, 
         ];
 
-        $response = $this->apiRequest('clear-address', $data, "DELETE") ;
+        $response = $this->apiRequest('clear-address', $data, "DELETE");
         return json_decode($response, $returnArray);
     }
 
@@ -268,12 +268,12 @@ 
     public function check(string $ip = null, int $maxAge = 30, bool $verbose = false, bool $returnArray = false)
     {
         // max age must be less or equal to 365
-        if ($maxAge > 365 || $maxAge < 1){
+        if ($maxAge > 365 || $maxAge < 1) {
             throw new \InvalidArgumentException('maxAge must be at least 1 and less than 365 (' . $maxAge . ' was given)');
         }
 
         // ip must be set
-        if (empty($ip)){
+        if (empty($ip)) {
             throw new \InvalidArgumentException('ip argument must be set (null given)');
         }
 
@@ -284,11 +284,11 @@ 
         ];
 
         // option
-        if ($verbose){
-           $data['verbose'] = true;
+        if ($verbose) {
+           $data[ 'verbose' ] = true;
         }
 
-        $response = $this->apiRequest('check', $data, 'GET') ;
+        $response = $this->apiRequest('check', $data, 'GET');
 
         return json_decode($response, $returnArray);
     }
@@ -339,12 +339,12 @@ 
     public function checkBlock(string $network = null, int $maxAge = 30, bool $returnArray = false)
     {
         // max age must be less or equal to 365
-        if ($maxAge > 365 || $maxAge < 1){
+        if ($maxAge > 365 || $maxAge < 1) {
             throw new \InvalidArgumentException('maxAge must be at least 1 and less than 365 (' . $maxAge . ' was given)');
         }
 
         // ip must be set
-        if (empty($network)){
+        if (empty($network)) {
             throw new \InvalidArgumentException('network argument must be set (null given)');
         }
 
@@ -354,7 +354,7 @@ 
             'maxAgeInDays'  => $maxAge,  
         ];
 
-        $response = $this->apiRequest('check-block', $data, 'GET') ;
+        $response = $this->apiRequest('check-block', $data, 'GET');
 
         return json_decode($response, $returnArray);
     }
@@ -374,7 +374,7 @@ 
     public function getBlacklist(int $limit = 10000, bool $plainText = false, bool $returnArray = false)
     {
 
-        if ($limit < 1){
+        if ($limit < 1) {
             throw new \InvalidArgumentException('limit must be at least 1 (' . $limit . ' was given)');
         }
 
@@ -386,13 +386,13 @@ 
 
         // plaintext paremeter has no value and must be added only when true 
         // (set plaintext=false won't work)
-        if ($plainText){
-            $data['plaintext'] = $plainText;
+        if ($plainText) {
+            $data[ 'plaintext' ] = $plainText;
         }
 
         $response = $this->apiRequest('blacklist', $data, 'GET');
 
-        if ($plainText){
+        if ($plainText) {
             return $response;
         } 
        
@@ -428,8 +428,8 @@ 
         $ch = curl_init(); 
   
         // for csv
-        if (!empty($csvFilePath)){
-            $cfile = new \CurlFile($csvFilePath,  'text/csv', 'csv');
+        if (!empty($csvFilePath)) {
+            $cfile = new \CurlFile($csvFilePath, 'text/csv', 'csv');
             //curl file itself return the realpath with prefix of @
             $data = array('csv' => $cfile);
         }
@@ -474,7 +474,7 @@ 
         $message = str_replace('\\', '', $message);
 
         // Remove self ips
-        foreach ($this->selfIps as $ip){
+        foreach ($this->selfIps as $ip) {
             $message = str_replace($ip, '*', $message);
         }
 
@@ -501,7 +501,7 @@ 
     protected static function loadJsonFile(string $filePath, bool $throwError = true)
     {
         // check file exists
-        if (!file_exists($filePath) || !is_file($filePath)){
+        if (!file_exists($filePath) || !is_file($filePath)) {
            if ($throwError) {
                 throw new \Exception('Config file not found');
            }

lib/CurlTrait.php

Spacing +3 added lines, -3 removed lines

@@ -36,9 +36,9 @@
      * @return void
      * @throws \RuntimeException
      */
-    protected function setCurlOption($ch,int $option,$value){
-        if(!curl_setopt($ch,$option,$value)){
-            throw new \RuntimeException('curl_setopt failed! '.curl_error($ch));
+    protected function setCurlOption($ch, int $option, $value) {
+        if (!curl_setopt($ch, $option, $value)) {
+            throw new \RuntimeException('curl_setopt failed! ' . curl_error($ch));
         }
     }
 }

lib/ApiBase.php

Spacing +37 added lines, -37 removed lines

@@ -60,82 +60,82 @@ 
     protected $aipdbApiCategories = [
         
         // Altering DNS records resulting in improper redirection.        
-        ['dns-c'           , '1', 'DNS Compromise', true],    
+        [ 'dns-c', '1', 'DNS Compromise', true ],    
         
         // Falsifying domain server cache (cache poisoning).
-        ['dns-p'           , '2', 'DNS Poisoning', true],     
+        [ 'dns-p', '2', 'DNS Poisoning', true ],     
         
         // Fraudulent orders.
-        ['fraud-orders'    , '3', 'Fraud Orders', true],      
+        [ 'fraud-orders', '3', 'Fraud Orders', true ],      
 
         // Participating in distributed denial-of-service (usually part of botnet).        
-        ['ddos'            , '4', 'DDoS Attack', true],       
+        [ 'ddos', '4', 'DDoS Attack', true ],       
         
         // 
-        ['ftp-bf'          , '5', 'FTP Brute-Force', true],   
+        [ 'ftp-bf', '5', 'FTP Brute-Force', true ],   
         
         // Oversized IP packet.
-        ['pingdeath'       , '6', 'Ping of Death', true],     
+        [ 'pingdeath', '6', 'Ping of Death', true ],     
 
         // Phishing websites and/or email.
-        ['phishing'        , '7', 'Phishing', true],          
+        [ 'phishing', '7', 'Phishing', true ],          
         
         //
-        ['fraudvoip'       , '8', 'Fraud VoIP', true],        
+        [ 'fraudvoip', '8', 'Fraud VoIP', true ],        
 
         // Open proxy, open relay, or Tor exit node.
-        ['openproxy'       , '9', 'Open Proxy', true],        
+        [ 'openproxy', '9', 'Open Proxy', true ],        
 
          // Comment/forum spam, HTTP referer spam, or other CMS spam.
-         ['webspam'         , '10', 'Web Spam', true],        
+         [ 'webspam', '10', 'Web Spam', true ],        
 
         // Spam email content, infected attachments, and phishing emails. Note: Limit comments to only relevent
         // information (instead of log dumps) and be sure to remove PII if you want to remain anonymous.
-        ['emailspam'       , '11', 'Email Spam', true],                                                   
+        [ 'emailspam', '11', 'Email Spam', true ],                                                   
              
         // CMS blog comment spam.
-        ['blogspam'        , '12', 'Blog Spam', true],      
+        [ 'blogspam', '12', 'Blog Spam', true ],      
         
         // Conjunctive category.
-        ['vpnip'           , '13', 'VPN IP', false], // to check alone ??           
+        [ 'vpnip', '13', 'VPN IP', false ], // to check alone ??           
 
         // Scanning for open ports and vulnerable services.
-        ['scan'            , '14', 'Port Scan', true],        
+        [ 'scan', '14', 'Port Scan', true ],        
        
         // 
-        ['hack'            , '15', 'Hacking', true],           
+        [ 'hack', '15', 'Hacking', true ],           
 
         // Attempts at SQL injection.
-        ['sql'             , '16', 'SQL Injection', true],     
+        [ 'sql', '16', 'SQL Injection', true ],     
         
         // Email sender spoofing.
-        ['spoof'           , '17', 'Spoofing', true],         
+        [ 'spoof', '17', 'Spoofing', true ],         
 
         // Credential brute-force attacks on webpage logins and services like SSH, FTP, SIP, SMTP, RDP, etc. 
         // This category is seperate from DDoS attacks.
-        ['brute'           , '18', 'Brute-Force', true],     
+        [ 'brute', '18', 'Brute-Force', true ],     
 
         // Webpage scraping (for email addresses, content, etc) and crawlers that do not honor robots.txt.                                  
         // Excessive requests and user agent spoofing can also be reported here.                        
-        ['badbot'          , '19', 'Bad Web Bot', true],      
+        [ 'badbot', '19', 'Bad Web Bot', true ],      
                                                          
         // Host is likely infected with malware and being used for other attacks or to host malicious content. 
         // The host owner may not be aware of the compromise. This category is often used in combination 
         // with other attack categories.
-        ['explhost'        , '20', 'Exploited Host', true],
+        [ 'explhost', '20', 'Exploited Host', true ],
         
         // Attempts to probe for or exploit installed web applications such as a CMS 
         // like WordPress/Drupal, e-commerce solutions, forum software, phpMyAdmin and 
         // various other software plugins/solutions.                                                         
-        ['webattack'       , '21', 'Web App Attack', true ],   
+        [ 'webattack', '21', 'Web App Attack', true ],   
         
         // Secure Shell (SSH) abuse. Use this category in combination 
         // with more specific categories.
-        ['ssh'             , '22', 'SSH', false],              
+        [ 'ssh', '22', 'SSH', false ],              
 
         // Abuse was targeted at an "Internet of Things" type device. Include 
         // information about what type of device was targeted in the comments.         
-        ['oit'             , '23', 'IoT Targeted', true],     
+        [ 'oit', '23', 'IoT Targeted', true ],     
     ];
 
     /**
@@ -159,8 +159,8 @@ 
      */
     public function getCategoryIdbyName(string $categoryName)
     {
-        foreach ($this->aipdbApiCategories as $cat){
-            if ($cat[0] === $categoryName) {
+        foreach ($this->aipdbApiCategories as $cat) {
+            if ($cat[ 0 ] === $categoryName) {
                 return $cat;
             }
          }
@@ -179,8 +179,8 @@ 
      */
     public function getCategoryNameById(string $categoryId)
     {
-        foreach ($this->aipdbApiCategories as $cat){
-           if ($cat[1] === $categoryId) {
+        foreach ($this->aipdbApiCategories as $cat) {
+           if ($cat[ 1 ] === $categoryId) {
                return $cat;
            }
         }
@@ -201,8 +201,8 @@ 
     protected function getCategoryIndex(string $value, int $index)
     {
         $i = 0;
-        foreach ($this->aipdbApiCategories as $cat){
-            if ($cat[$index] === $value) {
+        foreach ($this->aipdbApiCategories as $cat) {
+            if ($cat[ $index ] === $value) {
                 return $i;
             }
             $i++;
@@ -236,21 +236,21 @@ 
         foreach ($cats as $cat) {
 
             // get index on our array of categories
-            $catIndex    = is_numeric($cat) ? $this->getCategoryIndex($cat, 1) : $this->getCategoryIndex($cat, 0);
+            $catIndex = is_numeric($cat) ? $this->getCategoryIndex($cat, 1) : $this->getCategoryIndex($cat, 0);
 
             // check if found
-            if ($catIndex === false ){
-                throw new \InvalidArgumentException('Invalid report category was given : ['. $cat .  ']');
+            if ($catIndex === false) {
+                throw new \InvalidArgumentException('Invalid report category was given : [' . $cat . ']');
             }
 
             // get Id
-            $catId = $this->aipdbApiCategories[$catIndex][1];
+            $catId = $this->aipdbApiCategories[ $catIndex ][ 1 ];
 
             // need another ?
-            if ($needAnother !== false){
+            if ($needAnother !== false) {
 
                 // is a standalone cat ?
-                if ($this->aipdbApiCategories[$catIndex][3] === false) {
+                if ($this->aipdbApiCategories[ $catIndex ][ 3 ] === false) {
                     $needAnother = true;
 
                 } else {
@@ -261,10 +261,10 @@ 
             }
 
             // set or add to cats list 
-            $catsString = ($catsString === '') ? $catId : $catsString .','.$catId;
+            $catsString = ($catsString === '') ? $catId : $catsString . ',' . $catId;
         }
 
-        if ($needAnother !== false){
+        if ($needAnother !== false) {
             throw new \InvalidArgumentException('Invalid report category paremeter given: some categories can\'t be used alone');
         }