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

Add additional logging around secscan analyze

Browse source
This commit is contained in:
Joseph Schorr 2017-04-21 16:52:47 -04:00
parent 94ab6cf635
commit f296599162
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
util/secscan/analyzer.py
View file

@ -64,6 +64,8 @@ class LayerAnalyzer(object):
except AnalyzeLayerException: except AnalyzeLayerException:
# Something went wrong when trying to analyze the layer and we cannot retry, so mark the # Something went wrong when trying to analyze the layer and we cannot retry, so mark the
# layer as invalid. # layer as invalid.
logger.exception('Got exception when trying to analyze layer %s via security scanner',
layer.id)
if not set_secscan_status(layer, False, self._target_version): if not set_secscan_status(layer, False, self._target_version):
raise PreemptedException raise PreemptedException

3
util/secscan/api.py
View file

@ -280,6 +280,7 @@ class ImplementedSecurityScannerAPI(SecurityScannerAPIInterface):
request = self._new_analyze_request(layer) request = self._new_analyze_request(layer)
if not request: if not request:
logger.error('Could not build analyze request for layer %s', layer.id)
raise AnalyzeLayerException raise AnalyzeLayerException
logger.info('Analyzing layer %s', request['Layer']['Name']) logger.info('Analyzing layer %s', request['Layer']['Name'])
@ -303,12 +304,14 @@ class ImplementedSecurityScannerAPI(SecurityScannerAPIInterface):
if message == UNKNOWN_PARENT_LAYER_ERROR_MSG: if message == UNKNOWN_PARENT_LAYER_ERROR_MSG:
raise MissingParentLayerException('Bad request to security scanner: %s' % message) raise MissingParentLayerException('Bad request to security scanner: %s' % message)
else: else:
logger.exception('Got non-200 response for analyze of layer %s', layer.id)
raise AnalyzeLayerException('Bad request to security scanner: %s' % message) raise AnalyzeLayerException('Bad request to security scanner: %s' % message)
# 422 means that the layer could not be analyzed: # 422 means that the layer could not be analyzed:
# - the layer could not be extracted (might be a manifest or an invalid .tar.gz) # - the layer could not be extracted (might be a manifest or an invalid .tar.gz)
# - the layer operating system / package manager is unsupported # - the layer operating system / package manager is unsupported
elif ex.response.status_code == 422: elif ex.response.status_code == 422:
raise InvalidLayerException raise InvalidLayerException
# Otherwise, it is some other error and we should retry. # Otherwise, it is some other error and we should retry.
raise AnalyzeLayerRetryException raise AnalyzeLayerRetryException