- Remove queries to DB-IP API.

Author: dptole

.env.example

@@ -34,5 +34,3 @@ PUSHER_APP_CLUSTER=
 
 GOOGLE_RECAPTCHA_SITE_SECRET=
 GOOGLE_RECAPTCHA_SITE_KEY=
-
-DB_IP_API_KEY=

app/Helper.php

@@ -11,14 +11,8 @@ class Helper {
   static $pusher = null;
   static $lsr = null;
   static $tzs = null;
-  static $db_ip_api_keys_info = [];
-  static $db_ip_api_ips_info = [];
   static $db_ip_html_ips_info = [];
 
-  public static function getDbIpApiKey() {
-    return env('DB_IP_API_KEY');
-  }
-
   public static function getPusherOptions() {
     return [
       'cluster' => env('PUSHER_APP_CLUSTER'),
@@ -231,70 +225,24 @@ public static function getRequestIp() {
     ;
   }
 
-  public static function dbIpGetApiKeyInfo($api_key) {
-    if(isset(Helper::$db_ip_api_keys_info[$api_key])):
-      return Helper::$db_ip_api_keys_info[$api_key];
-    endif;
-
-    $api_key_info = json_decode(@file_get_contents("http://api.db-ip.com/v2/$api_key/"));
-
-    return Helper::$db_ip_api_keys_info[$api_key] = is_object($api_key_info) && property_exists($api_key_info, 'queriesLeft') && $api_key_info->queriesLeft > 0
-      ? $api_key_info
-      : null
-    ;
-  }
-
-  public static function dbIpDecorateResponse($ip_info, $ip, $api_key = null) {
+  public static function dbIpDecorateResponse($ip_info, $ip) {
     if(!is_object($ip_info)):
       return $ip_info;
     endif;
     $ip_info->Ip = $ip;
-    // $ip_info->ApiKey = $api_key;
     return $ip_info;
   }
 
-  public static function dbIpGetIpInfo($ip, $api_key = null) {
+  public static function dbIpGetIpInfo($ip) {
     $ip_from_html = Helper::dbIpGetIpInfoFromHtml($ip);
 
     if($ip_from_html):
-      return Helper::dbIpDecorateResponse($ip_from_html, $ip, $api_key);
-    endif;
-
-    $ip_from_api = Helper::dbIpGetIpInfoFromApi($ip, $api_key);
-
-    if($ip_from_api):
-      return Helper::dbIpDecorateResponse($ip_from_api, $ip, $api_key);
+      return Helper::dbIpDecorateResponse($ip_from_html, $ip);
     endif;
 
     return false;
   }
 
-  public static function dbIpGetIpInfoFromApi($ip, $api_key = null) {
-    if(isset(Helper::$db_ip_api_ips_info[$ip])):
-      return Helper::$db_ip_api_ips_info[$ip];
-    endif;
-
-    $start_time = -Helper::ms();
-
-    if($api_key === null):
-      $api_key = Helper::getDbIpApiKey();
-    endif;
-    $api_key_info = Helper::dbIpGetApiKeyInfo($api_key);
-
-    if(!is_object($api_key_info)):
-      return false;
-    endif;
-
-    $ip_info = json_decode(@file_get_contents("http://api.db-ip.com/v2/{$api_key_info->apiKey}/$ip"));
-
-    if(!is_object($ip_info)):
-      return false;
-    endif;
-
-    $ip_info->Elapsed = $start_time + Helper::ms();
-    return Helper::$db_ip_api_ips_info[$ip] = Helper::dbIpDecorateResponse($ip_info, $ip, $api_key);
-  }
-
   public static function dbIpGetIpInfoFromHtml($ip) {
     if(isset(Helper::$db_ip_html_ips_info[$ip])):
       return Helper::$db_ip_html_ips_info[$ip];
@@ -308,24 +256,51 @@ public static function dbIpGetIpInfoFromHtml($ip) {
 
     $tables = $dom->getElementsByTagName('table');
 
-    foreach($tables as $table):
+    foreach($tables as $table_index => $table):
       $trs = $table->getElementsByTagName('tr');
 
-      foreach($trs as $tr):
-        $th = $tr->getElementsByTagName('th');
-        $td = $tr->getElementsByTagName('td');
-
-        if(!($th->length === 1 && $td->length === 1)):
-          continue;
-        endif;
+      if($table_index === 1):
+        foreach($trs as $tr_index => $tr):
+          $th = $tr->getElementsByTagName('th');
+          $td = $tr->getElementsByTagName('td');
+
+          if($tr_index === 0):
+            if(!(
+              $th->length === 3 &&
+              $td->length === 0 &&
+              $th->item(0)->textContent === 'Crawler' &&
+              $th->item(1)->textContent === 'Proxy' &&
+              $th->item(2)->textContent === 'Attack source'
+            )):
+              break;
+            endif;
+          else:
+            if(!($th->length === 0 && $td->length === 3)):
+              break;
+            endif;
+
+            $props['Security / Crawler'] = preg_replace('#^[\x09\xa0\xc2]*|[\x09\xa0\xc2]*$#', '', trim($td->item(0)->textContent)) === 'Yes';
+            $props['Security / Proxy'] = preg_replace('#^[\x09\xa0\xc2]*|[\x09\xa0\xc2]*$#', '', trim($td->item(1)->textContent)) === 'Yes';
+            $props['Security / Attack source'] = preg_replace('#^[\x09\xa0\xc2]*|[\x09\xa0\xc2]*$#', '', trim($td->item(2)->textContent)) === 'Yes';
+          endif;
+        endforeach;
+      else:
+        foreach($trs as $tr_index => $tr):
+          $th = $tr->getElementsByTagName('th');
+          $td = $tr->getElementsByTagName('td');
+
+          if(!($th->length === 1 && $td->length === 1)):
+            continue;
+          endif;
 
-        $text_th = preg_replace('#^[\x09\xa0\xc2]*|[\x09\xa0\xc2]*$#', '', trim($th->item(0)->textContent));
-        $text_td = preg_replace('#^[\x09\xa0\xc2]*|[\x09\xa0\xc2]*$#', '', trim($td->item(0)->textContent));
+          $text_th = preg_replace('#^[\x09\xa0\xc2]*|[\x09\xa0\xc2]*$#', '', trim($th->item(0)->textContent));
+          $text_td = preg_replace('#^[\x09\xa0\xc2]*|[\x09\xa0\xc2]*$#', '', trim($td->item(0)->textContent));
 
-        if($text_th && $text_td):
-          $props[$text_th] = $text_td;
-        endif;
-      endforeach;
+          if($text_th && $text_td):
+            $props[$text_th] = $text_td;
+          endif;
+        endforeach;
+      endif;
     endforeach;
 
     if(count($props) < 1):
@@ -345,4 +320,12 @@ public static function dbIpGetIpInfoFromHtml($ip) {
   public static function ms() {
     return microtime(true) * 1000 | 0;
   }
+
+  public static function readDotEnvFile() {
+    return parse_ini_file(
+      dirname($_SERVER['DOCUMENT_ROOT']) . "/.env",
+      false,
+      INI_SCANNER_RAW
+    );
+  }
 }

readme.md

@@ -12,7 +12,6 @@ Pre-requisites
 - PHP v5.6+
 - Pusher
 - GoogleRecaptcha
-- Db-Ip
 
 Building
 ========
@@ -117,20 +116,11 @@ GOOGLE_RECAPTCHA_SITE_SECRET=
 GOOGLE_RECAPTCHA_SITE_KEY=
 ```
 
-# Db-Ip
-
-Register at [db-ip][db-ip-url] to get your key. Edit the `.env` file afterwards.
-
-```
-DB_IP_API_KEY=
-```
-
 License
 =======
 
 [MIT][LICENSE]
 
-[db-ip-url]: https://db-ip.com/login/
 [google-recaptcha-url]: https://www.google.com/recaptcha/admin#list
 [pusher-url]: https://dashboard.pusher.com/accounts/sign_in
 [composer-url]: https://getcomposer.org/