vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add resolved IP information to track_and_log

Browse source
This commit is contained in:
Joseph Schorr 2017-09-27 16:39:47 -04:00
parent 010dda2c52
commit 52927de7f6
2 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
util/audit.py
View file

@ -5,7 +5,7 @@ from urlparse import urlparse
from flask import request from flask import request
from app import analytics, userevents from app import analytics, userevents, ip_resolver
from data import model from data import model
from auth.registry_jwt_auth import get_granted_entity from auth.registry_jwt_auth import get_granted_entity
from auth.auth_context import (get_authenticated_user, get_validated_token, from auth.auth_context import (get_authenticated_user, get_validated_token,
@ -85,6 +85,11 @@ def track_and_log(event_name, repo_obj, analytics_name=None, analytics_sample=1,
analytics.track(analytics_id, analytics_name, extra_params) analytics.track(analytics_id, analytics_name, extra_params)
# Add the resolved information to the metadata.
resolved_ip = ip_resolver.resolve_ip(request.remote_addr)
if resolved_ip is not None:
metadata['resolved_ip'] = resolved_ip._asdict()
# Log the action to the database. # Log the action to the database.
logger.debug('Logging the %s to logs system', event_name) logger.debug('Logging the %s to logs system', event_name)
model.log.log_action(event_name, namespace_name, performer=authenticated_user, model.log.log_action(event_name, namespace_name, performer=authenticated_user,

30
util/ipresolver/__init__.py
View file

@ -1,5 +1,6 @@
import logging import logging
import json import json
import requests
from cachetools import ttl_cache, lru_cache from cachetools import ttl_cache, lru_cache
from collections import namedtuple, defaultdict from collections import namedtuple, defaultdict
@ -12,6 +13,21 @@ ResolvedLocation = namedtuple('ResolvedLocation', ['provider', 'region', 'servic
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
_DATA_FILES = {'aws-ip-ranges.json': 'https://ip-ranges.amazonaws.com/ip-ranges.json'}
def update_resolver_datafiles():
""" Performs an update of the data file(s) used by the IP Resolver. """
for filename, url in _DATA_FILES.iteritems():
logger.debug('Updating IP resolver data file "%s" from URL "%s"', filename, url)
with open('util/ipresolver/%s' % filename, 'w') as f:
response = requests.get(url)
logger.debug('Got %s response for URL %s', response.status_code, url)
if response.status_code / 2 != 100:
raise Exception('Got non-2XX status code for URL %s: %s' % (url, response.status_code))
f.write(response.text)
logger.debug('Successfully wrote %s', filename)
class IPResolver(object): class IPResolver(object):
def __init__(self, app, *args, **kwargs): def __init__(self, app, *args, **kwargs):
self.app = app self.app = app
@ -30,20 +46,20 @@ class IPResolver(object):
@ttl_cache(maxsize=1, ttl=600) @ttl_cache(maxsize=1, ttl=600)
def _get_location_function(self): def _get_location_function(self):
try: try:
with open('util/ipresolver/ip-ranges.json', 'r') as f: with open('util/ipresolver/aws-ip-ranges.json', 'r') as f:
ip_range_json = json.loads(f.read()) aws_ip_range_json = json.loads(f.read())
except IOError: except IOError:
logger.exception('Could not load IP Ranges') logger.exception('Could not load AWS IP Ranges')
return None return None
except ValueError: except ValueError:
logger.exception('Could not load IP Ranges') logger.exception('Could not load AWS IP Ranges')
return None return None
except TypeError: except TypeError:
logger.exception('Could not load IP Ranges') logger.exception('Could not load AWS IP Ranges')
return None return None
sync_token = ip_range_json['syncToken'] sync_token = aws_ip_range_json['syncToken']
all_amazon, regions, services = IPResolver._parse_amazon_ranges(ip_range_json) all_amazon, regions, services = IPResolver._parse_amazon_ranges(aws_ip_range_json)
return IPResolver._build_location_function(sync_token, all_amazon, regions, services, self.geoip_db) return IPResolver._build_location_function(sync_token, all_amazon, regions, services, self.geoip_db)
@staticmethod @staticmethod