Merge pull request #5 from s0d3s/master

Implement determining location of proxies

Author: DevAlone

models.py

@@ -1,6 +1,11 @@
 from proxy_py import settings
 import peewee
 import peewee_async
+import os.path
+import geoip2.database
+import logging
+
+log = logging.getLogger("proxy_py/main")
 
 raw_db = peewee_async.PooledPostgresqlDatabase(
     *settings.DATABASE_CONNECTION_ARGS,
@@ -52,15 +57,31 @@ class Meta:
     # TODO: consider storing as binary
     _white_ipv4 = peewee.CharField(16, null=True)
     _white_ipv6 = peewee.CharField(45, null=True)
-    city = peewee.TextField(null=True)
-    region = peewee.TextField(null=True)
-    country_code = peewee.CharField(3, null=True)
-    # TODO: add location
 
     def get_raw_protocol(self):
         return self.raw_protocol
-
+    
     @property
+    def location(self):
+        if os.path.isfile(settings.GEOLITE2_CITY_FILE_LOCATION):
+            reader = geoip2.database.Reader(settings.GEOLITE2_CITY_FILE_LOCATION)
+            response = reader.city(self.domain)
+            
+            return {
+                'latitude': response.location.latitude,
+                'longitude': response.location.longitude,
+                'country_code': response.country.iso_code,
+                'country': response.country.name,
+                'city': response.city.name,            
+            }
+        else:
+            '''
+            DB doesn`t exists
+            '''
+            log.warning("Public IP Database has been absent")
+            return None
+    
+    @property    
     def address(self):
         return self.to_url()
 

processor.py

@@ -358,14 +358,6 @@ async def create_or_update_proxy(
                 if additional_info.ipv4 is not None:
                     proxy.white_ipv4 = additional_info.ipv4
 
-                if additional_info.city is not None:
-                    proxy.city = additional_info.city
-
-                if additional_info.region is not None:
-                    proxy.region = additional_info.region
-
-                if additional_info.country_code is not None:
-                    proxy.country_code = additional_info.country_code.strip().lower()
 
             checking_time = int(end_checking_time - start_checking_time)
             if checking_time > settings.PROXY_CHECKING_TIMEOUT:

proxy_py/_settings.py

@@ -7,6 +7,7 @@
 """
 Database settings (do not try to change after creation of the database)
 """
+GEOLITE2_CITY_FILE_LOCATION = '/tmp/proxy_py_9910549a_7d41_4102_9e9d_15d39418a5cb/GeoLite2-City.mmdb'
 
 DATABASE_CONNECTION_ARGS = ()
 DATABASE_CONNECTION_KWARGS = {
@@ -82,7 +83,7 @@
 PROXY_PROVIDER_SERVER_API_CONFIG_FETCH_CONFIG = {
     'fields': [
         'address', 'protocol', 'auth_data', 'domain', 'port', 'last_check_time', 'next_check_time', 'number_of_bad_checks',
-        'bad_proxy', 'uptime', 'response_time', 'white_ipv4', 'white_ipv6', 'city', 'country_code', 'region'
+        'bad_proxy', 'uptime', 'response_time', 'white_ipv4', 'white_ipv6', 'location'
     ],
     'filter_fields': [
         'last_check_time', 'protocol', 'number_of_bad_checks', 'bad_proxy', 'uptime', 'response_time'

requirements.txt

@@ -14,3 +14,4 @@ pytest
 pytest-asyncio
 termcolor
 uvloop
+geoip2