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

rename secscan_endpoint and move db close to API

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-11-10 15:01:33 -05:00
parent 270010105d
commit 8e2868737b
6 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

26
util/secscan/secscanendpoint.py → util/secscan/api.py
View file

@ -2,11 +2,13 @@ import features
import logging
import requests
from app import app
from database import CloseForLongOperation
from urlparse import urljoin
logger = logging.getLogger(__name__)
class SecurityScanEndpoint(object):
class SecurityScannerAPI(object):
""" Helper class for talking to the Security Scan service (Clair). """
def __init__(self, app, config_provider):
self.app = app
@ -41,7 +43,7 @@ class SecurityScanEndpoint(object):
body = {
'LayersIDs': [layer_id]
}
response = self.call_api('vulnerabilities/%s/affected-layers', body, cve_id)
response = self.call('vulnerabilities/%s/affected-layers', body, cve_id)
except requests.exceptions.RequestException:
logger.exception('Got exception when trying to call Clair endpoint')
return False
@ -61,8 +63,11 @@ class SecurityScanEndpoint(object):
return True
def call_api(self, relative_url, body=None, *args, **kwargs):
""" Issues an HTTP call to the sec API at the given relative URL. """
def call(self, relative_url, body=None, *args, **kwargs):
""" Issues an HTTP call to the sec API at the given relative URL.
This function disconnects from the database while awaiting a response
from the API server.
"""
security_config = self.security_config
api_url = urljoin(security_config['ENDPOINT'], '/' + security_config['API_VERSION']) + '/'
url = urljoin(api_url, relative_url % args)
@ -71,9 +76,10 @@ class SecurityScanEndpoint(object):
timeout = security_config.get('API_TIMEOUT_SECONDS', 1)
logger.debug('Looking up sec information: %s', url)
if body is not None:
return client.post(url, json=body, params=kwargs, timeout=timeout, cert=self.keys,
verify=self.certificate)
else:
return client.get(url, params=kwargs, timeout=timeout, cert=self.keys,
verify=self.certificate)
with CloseForLongOperation(app.config):
if body is not None:
return client.post(url, json=body, params=kwargs, timeout=timeout, cert=self.keys,
verify=self.certificate)
else:
return client.get(url, params=kwargs, timeout=timeout, cert=self.keys,
verify=self.certificate)