Passed
Push — master ( fa238f...bca209 )
by Kris
02:21
created
lib/ApiDefintion.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -28,10 +28,10 @@  discard block
 block discarded – undo
28 28
  */
29 29
 abstract class ApiDefintion
30 30
 {
31
-     /**
32
-     * AbuseIPDB API v2 Endpoint
33
-     * @var string $api_endpoint  
34
-     */
31
+        /**
32
+         * AbuseIPDB API v2 Endpoint
33
+         * @var string $api_endpoint  
34
+         */
35 35
     protected $aipdbApiEndpoint = 'https://api.abuseipdb.com/api/v2/'; 
36 36
 
37 37
     /**
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
         // Open proxy, open relay, or Tor exit node.
68 68
         ['openproxy'       , '9', 'Open Proxy', true],        
69 69
 
70
-         // Comment/forum spam, HTTP referer spam, or other CMS spam.
71
-         ['webspam'         , '10', 'Web Spam', true],        
70
+            // Comment/forum spam, HTTP referer spam, or other CMS spam.
71
+            ['webspam'         , '10', 'Web Spam', true],        
72 72
 
73 73
         // Spam email content, infected attachments, and phishing emails. Note: Limit comments to only relevent
74 74
         // information (instead of log dumps) and be sure to remove PII if you want to remain anonymous.
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
         // Abuse was targeted at an "Internet of Things" type device. Include 
118 118
         // information about what type of device was targeted in the comments.         
119 119
         ['oit'             , '23', 'IoT Targeted', true],     
120
-      ];
120
+        ];
121 121
 
122 122
     /**
123 123
      * Get the category id corresponding to given name
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
             if ($cat[0] === $categoryName) {
134 134
                 return $cat;
135 135
             }
136
-         }
136
+            }
137 137
 
138 138
         // not found
139 139
         return false;
@@ -150,9 +150,9 @@  discard block
 block discarded – undo
150 150
     public function getCategoryNameById(string $categoryId)
151 151
     {
152 152
         foreach ($this->aipdbApiCategories as $cat){
153
-           if ($cat[1] === $categoryId) {
154
-               return $cat;
155
-           }
153
+            if ($cat[1] === $categoryId) {
154
+                return $cat;
155
+            }
156 156
         }
157 157
 
158 158
         // not found
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
                 return $i;
177 177
             }
178 178
             $i++;
179
-         }
179
+            }
180 180
 
181 181
         // not found
182 182
         return false;
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -41,82 +41,82 @@  discard block
 block discarded – undo
41 41
     protected $aipdbApiCategories = [
42 42
         
43 43
         // Altering DNS records resulting in improper redirection.        
44
-        ['dns-c'           , '1', 'DNS Compromise', true],    
44
+        [ 'dns-c', '1', 'DNS Compromise', true ],    
45 45
         
46 46
         // Falsifying domain server cache (cache poisoning).
47
-        ['dns-p'           , '2', 'DNS Poisoning', true],     
47
+        [ 'dns-p', '2', 'DNS Poisoning', true ],     
48 48
         
49 49
         // Fraudulent orders.
50
-        ['fraud-orders'    , '3', 'Fraud Orders', true],      
50
+        [ 'fraud-orders', '3', 'Fraud Orders', true ],      
51 51
 
52 52
         // Participating in distributed denial-of-service (usually part of botnet).        
53
-        ['ddos'            , '4', 'DDoS Attack', true],       
53
+        [ 'ddos', '4', 'DDoS Attack', true ],       
54 54
         
55 55
         // 
56
-        ['ftp-bf'          , '5', 'FTP Brute-Force', true],   
56
+        [ 'ftp-bf', '5', 'FTP Brute-Force', true ],   
57 57
         
58 58
         // Oversized IP packet.
59
-        ['pingdeath'       , '6', 'Ping of Death', true],     
59
+        [ 'pingdeath', '6', 'Ping of Death', true ],     
60 60
 
61 61
         // Phishing websites and/or email.
62
-        ['phishing'        , '7', 'Phishing', true],          
62
+        [ 'phishing', '7', 'Phishing', true ],          
63 63
         
64 64
         //
65
-        ['fraudvoip'       , '8', 'Fraud VoIP', true],        
65
+        [ 'fraudvoip', '8', 'Fraud VoIP', true ],        
66 66
 
67 67
         // Open proxy, open relay, or Tor exit node.
68
-        ['openproxy'       , '9', 'Open Proxy', true],        
68
+        [ 'openproxy', '9', 'Open Proxy', true ],        
69 69
 
70 70
          // Comment/forum spam, HTTP referer spam, or other CMS spam.
71
-         ['webspam'         , '10', 'Web Spam', true],        
71
+         [ 'webspam', '10', 'Web Spam', true ],        
72 72
 
73 73
         // Spam email content, infected attachments, and phishing emails. Note: Limit comments to only relevent
74 74
         // information (instead of log dumps) and be sure to remove PII if you want to remain anonymous.
75
-        ['emailspam'       , '11', 'Email Spam', true],                                                   
75
+        [ 'emailspam', '11', 'Email Spam', true ],                                                   
76 76
              
77 77
         // CMS blog comment spam.
78
-        ['blogspam'        , '12', 'Blog Spam', true],      
78
+        [ 'blogspam', '12', 'Blog Spam', true ],      
79 79
         
80 80
         // Conjunctive category.
81
-        ['vpnip'           , '13', 'VPN IP', false], // to check alone ??           
81
+        [ 'vpnip', '13', 'VPN IP', false ], // to check alone ??           
82 82
 
83 83
         // Scanning for open ports and vulnerable services.
84
-        ['scan'            , '14', 'Port Scan', true],        
84
+        [ 'scan', '14', 'Port Scan', true ],        
85 85
        
86 86
         // 
87
-        ['hack'            , '15', 'Hacking', true],           
87
+        [ 'hack', '15', 'Hacking', true ],           
88 88
 
89 89
         // Attempts at SQL injection.
90
-        ['sql'             , '16', 'SQL Injection', true],     
90
+        [ 'sql', '16', 'SQL Injection', true ],     
91 91
         
92 92
         // Email sender spoofing.
93
-        ['spoof'           , '17', 'Spoofing', true],         
93
+        [ 'spoof', '17', 'Spoofing', true ],         
94 94
 
95 95
         // Credential brute-force attacks on webpage logins and services like SSH, FTP, SIP, SMTP, RDP, etc. 
96 96
         // This category is seperate from DDoS attacks.
97
-        ['brute'           , '18', 'Brute-Force', true],     
97
+        [ 'brute', '18', 'Brute-Force', true ],     
98 98
 
99 99
         // Webpage scraping (for email addresses, content, etc) and crawlers that do not honor robots.txt.                                  
100 100
         // Excessive requests and user agent spoofing can also be reported here.                        
101
-        ['badbot'          , '19', 'Bad Web Bot', true],      
101
+        [ 'badbot', '19', 'Bad Web Bot', true ],      
102 102
                                                          
103 103
         // Host is likely infected with malware and being used for other attacks or to host malicious content. 
104 104
         // The host owner may not be aware of the compromise. This category is often used in combination 
105 105
         // with other attack categories.
106
-        ['explhost'        , '20', 'Exploited Host', true],
106
+        [ 'explhost', '20', 'Exploited Host', true ],
107 107
         
108 108
         // Attempts to probe for or exploit installed web applications such as a CMS 
109 109
         // like WordPress/Drupal, e-commerce solutions, forum software, phpMyAdmin and 
110 110
         // various other software plugins/solutions.                                                         
111
-        ['webattack'       , '21', 'Web App Attack', true ],   
111
+        [ 'webattack', '21', 'Web App Attack', true ],   
112 112
         
113 113
         // Secure Shell (SSH) abuse. Use this category in combination 
114 114
         // with more specific categories.
115
-        ['ssh'             , '22', 'SSH', false],              
115
+        [ 'ssh', '22', 'SSH', false ],              
116 116
 
117 117
         // Abuse was targeted at an "Internet of Things" type device. Include 
118 118
         // information about what type of device was targeted in the comments.         
119
-        ['oit'             , '23', 'IoT Targeted', true],     
119
+        [ 'oit', '23', 'IoT Targeted', true ],     
120 120
       ];
121 121
 
122 122
     /**
@@ -129,8 +129,8 @@  discard block
 block discarded – undo
129 129
      */
130 130
     public function getCategoryIdbyName(string $categoryName)
131 131
     {
132
-        foreach ($this->aipdbApiCategories as $cat){
133
-            if ($cat[0] === $categoryName) {
132
+        foreach ($this->aipdbApiCategories as $cat) {
133
+            if ($cat[ 0 ] === $categoryName) {
134 134
                 return $cat;
135 135
             }
136 136
          }
@@ -149,8 +149,8 @@  discard block
 block discarded – undo
149 149
      */
150 150
     public function getCategoryNameById(string $categoryId)
151 151
     {
152
-        foreach ($this->aipdbApiCategories as $cat){
153
-           if ($cat[1] === $categoryId) {
152
+        foreach ($this->aipdbApiCategories as $cat) {
153
+           if ($cat[ 1 ] === $categoryId) {
154 154
                return $cat;
155 155
            }
156 156
         }
@@ -171,8 +171,8 @@  discard block
 block discarded – undo
171 171
     protected function getCategoryIndex(string $value, int $index)
172 172
     {
173 173
         $i = 0;
174
-        foreach ($this->aipdbApiCategories as $cat){
175
-            if ($cat[$index] === $value) {
174
+        foreach ($this->aipdbApiCategories as $cat) {
175
+            if ($cat[ $index ] === $value) {
176 176
                 return $i;
177 177
             }
178 178
             $i++;
Please login to merge, or discard this patch.
lib/ApiManager.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
      */
158 158
     public function report(string $ip = '', string $categories = '', string $message = '', bool $returnArray = false)
159 159
     {
160
-         // ip must be set
160
+            // ip must be set
161 161
         if (empty($ip)){
162 162
             throw new \InvalidArgumentException('Ip was empty');
163 163
         }
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         }
169 169
 
170 170
         // message must be set
171
-          if (empty($message)){
171
+            if (empty($message)){
172 172
             throw new \InvalidArgumentException('report message was empty');
173 173
         }
174 174
 
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 
286 286
         // option
287 287
         if ($verbose){
288
-           $data['verbose'] = true;
288
+            $data['verbose'] = true;
289 289
         }
290 290
 
291 291
         // check AbuseIPDB request
@@ -331,14 +331,14 @@  discard block
 block discarded – undo
331 331
             'Key: ' . $this->aipdbApiKey,
332 332
         ]);
333 333
   
334
-      // execute curl call
335
-      $result = curl_exec($ch);
334
+        // execute curl call
335
+        $result = curl_exec($ch);
336 336
   
337
-      // close connection
338
-      curl_close($ch);
337
+        // close connection
338
+        curl_close($ch);
339 339
   
340
-      // return response as object / array
341
-      return json_decode($result, $returnArray);
340
+        // return response as object / array
341
+        return json_decode($result, $returnArray);
342 342
     }
343 343
 
344 344
     /** 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
      * @access public
349 349
      * @param string      $message           The original message 
350 350
      *  
351
-	 * @return string
351
+     * @return string
352 352
      */
353 353
     protected function cleanMessage(string $message)
354 354
     {
@@ -373,10 +373,10 @@  discard block
 block discarded – undo
373 373
      *
374 374
      * @access public
375 375
      * @static
376
-	 * @param string    $filePath       The file's full path
377
-	 * @param bool      $trowError      Throw error on true or silent process. Default is true
376
+     * @param string    $filePath       The file's full path
377
+     * @param bool      $trowError      Throw error on true or silent process. Default is true
378 378
      *  
379
-	 * @return object|null 
379
+     * @return object|null 
380 380
      * @throws \Exception
381 381
      * @throws \LogicException
382 382
      */
@@ -384,10 +384,10 @@  discard block
 block discarded – undo
384 384
     {
385 385
         // check file exists
386 386
         if (!file_exists($filePath) || !is_file($filePath)){
387
-           if ($throwError) {
387
+            if ($throwError) {
388 388
                 throw new \Exception('Config file not found');
389
-           }
390
-           return null;  
389
+            }
390
+            return null;  
391 391
         }
392 392
 
393 393
         // get and parse content
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
      * @access protected
51 51
      * @var array $selfIps  
52 52
      */
53
-    protected $selfIps = []; 
53
+    protected $selfIps = [ ]; 
54 54
 
55 55
     /**
56 56
      * Constructor
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
      * @param array   $myIps      The Ips/domain name you dont want to display in report messages
62 62
      * 
63 63
      */
64
-    public function __construct(string $apiKey, string $userId, array $myIps = [])
64
+    public function __construct(string $apiKey, string $userId, array $myIps = [ ])
65 65
     {
66 66
         $this->aipdbApiKey = $apiKey;
67 67
         $this->aipdbUserId = $userId;
@@ -100,22 +100,22 @@  discard block
 block discarded – undo
100 100
     {
101 101
 
102 102
         // check file exists
103
-        if (!file_exists($configPath) || !is_file($configPath)){
103
+        if (!file_exists($configPath) || !is_file($configPath)) {
104 104
             throw new \InvalidArgumentException('The file [' . $configPath . '] does not exist.');
105 105
         }
106 106
 
107 107
         // check file is readable
108
-        if (!is_readable($configPath)){
108
+        if (!is_readable($configPath)) {
109 109
             throw new InvalidPermissionException('The file [' . $configPath . '] is not readable.');
110 110
         }
111 111
 
112 112
         // todo check file exist
113 113
         $keyConfig = self::loadJsonFile($configPath);
114
-        $selfIps = [];
114
+        $selfIps = [ ];
115 115
         
116 116
         // Look for other optional config files in the same directory 
117 117
         $selfIpsConfigPath = pathinfo($configPath, PATHINFO_DIRNAME) . DIRECTORY_SEPARATOR . 'self_ips.json';
118
-        if (file_exists($selfIpsConfigPath)){
118
+        if (file_exists($selfIpsConfigPath)) {
119 119
             $selfIps = self::loadJsonFile($selfIpsConfigPath)->self_ips;
120 120
         }
121 121
 
@@ -158,17 +158,17 @@  discard block
 block discarded – undo
158 158
     public function report(string $ip = '', string $categories = '', string $message = '', bool $returnArray = false)
159 159
     {
160 160
          // ip must be set
161
-        if (empty($ip)){
161
+        if (empty($ip)) {
162 162
             throw new \InvalidArgumentException('Ip was empty');
163 163
         }
164 164
 
165 165
         // categories must be set
166
-        if (empty($categories)){
166
+        if (empty($categories)) {
167 167
             throw new \InvalidArgumentException('categories list was empty');
168 168
         }
169 169
 
170 170
         // message must be set
171
-          if (empty($message)){
171
+          if (empty($message)) {
172 172
             throw new \InvalidArgumentException('report message was empty');
173 173
         }
174 174
 
@@ -210,21 +210,21 @@  discard block
 block discarded – undo
210 210
         foreach ($cats as $cat) {
211 211
 
212 212
             // get index on our array of categories
213
-            $catIndex    = is_numeric($cat) ? $this->getCategoryIndex($cat, 1) : $this->getCategoryIndex($cat, 0);
213
+            $catIndex = is_numeric($cat) ? $this->getCategoryIndex($cat, 1) : $this->getCategoryIndex($cat, 0);
214 214
 
215 215
             // check if found
216
-            if ($catIndex === false ){
217
-                throw new \InvalidArgumentException('Invalid report category was given : ['. $cat .  ']');
216
+            if ($catIndex === false) {
217
+                throw new \InvalidArgumentException('Invalid report category was given : [' . $cat . ']');
218 218
             }
219 219
 
220 220
             // get Id
221
-            $catId = $this->aipdbApiCategories[$catIndex][1];
221
+            $catId = $this->aipdbApiCategories[ $catIndex ][ 1 ];
222 222
 
223 223
             // need another ?
224
-            if ($needAnother !== false){
224
+            if ($needAnother !== false) {
225 225
 
226 226
                 // is a standalone cat ?
227
-                if ($this->aipdbApiCategories[$catIndex][3] === false) {
227
+                if ($this->aipdbApiCategories[ $catIndex ][ 3 ] === false) {
228 228
                     $needAnother = true;
229 229
 
230 230
                 } else {
@@ -235,10 +235,10 @@  discard block
 block discarded – undo
235 235
             }
236 236
 
237 237
             // set or add to cats list 
238
-            $catsString = ($catsString === '') ? $catId : $catsString .','.$catId;
238
+            $catsString = ($catsString === '') ? $catId : $catsString . ',' . $catId;
239 239
         }
240 240
 
241
-        if ($needAnother !== false){
241
+        if ($needAnother !== false) {
242 242
             throw new \InvalidArgumentException('Invalid report category paremeter given: some categories can\'t be used alone');
243 243
         }
244 244
 
@@ -262,18 +262,18 @@  discard block
 block discarded – undo
262 262
     public function check(string $ip = null, string $maxAge = '30', bool $verbose = false, bool $returnArray = false)
263 263
     {
264 264
         
265
-        if (!is_numeric($maxAge)){
265
+        if (!is_numeric($maxAge)) {
266 266
             throw new \InvalidArgumentException('maxAge must be a numeric value (' . $maxAge . ' was given)');
267 267
         }
268 268
         $maxAge = intval($maxAge);
269 269
 
270 270
         // max age must less or equal to 365
271
-        if ($maxAge > 365 || $maxAge < 1){
271
+        if ($maxAge > 365 || $maxAge < 1) {
272 272
             throw new \InvalidArgumentException('maxAge must be at least 1 and less than 365 (' . $maxAge . ' was given)');
273 273
         }
274 274
 
275 275
         //ip must be set
276
-        if (empty($ip)){
276
+        if (empty($ip)) {
277 277
             throw new \InvalidArgumentException('ip argument must be set (null given)');
278 278
         }
279 279
 
@@ -284,12 +284,12 @@  discard block
 block discarded – undo
284 284
         ];
285 285
 
286 286
         // option
287
-        if ($verbose){
288
-           $data['verbose'] = true;
287
+        if ($verbose) {
288
+           $data[ 'verbose' ] = true;
289 289
         }
290 290
 
291 291
         // check AbuseIPDB request
292
-        return $this->apiRequest('check', $data, 'GET', $returnArray) ;
292
+        return $this->apiRequest('check', $data, 'GET', $returnArray);
293 293
     }
294 294
 
295 295
     /**
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
         $message = str_replace('\\', '', $message);
357 357
 
358 358
         // Remove self ips
359
-        foreach ($this->myIps as $ip){
359
+        foreach ($this->myIps as $ip) {
360 360
             $message = str_replace($ip, '[MUNGED]', $message);
361 361
         } 
362 362
 
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
     protected static function loadJsonFile(string $filePath, bool $throwError = true)
384 384
     {
385 385
         // check file exists
386
-        if (!file_exists($filePath) || !is_file($filePath)){
386
+        if (!file_exists($filePath) || !is_file($filePath)) {
387 387
            if ($throwError) {
388 388
                 throw new \Exception('Config file not found');
389 389
            }
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
         $json    = json_decode(utf8_encode($content));
396 396
 
397 397
         // check for errors
398
-        if ($json == null && json_last_error() != JSON_ERROR_NONE){
398
+        if ($json == null && json_last_error() != JSON_ERROR_NONE) {
399 399
             if ($throwError) {
400 400
                 throw new \LogicException(sprintf("Failed to parse config file Error: '%s'", json_last_error_msg()));
401 401
             }
Please login to merge, or discard this patch.