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

Merge pull request #2881 from coreos-inc/fix-verbs

Browse source 
Fix verbs for recent storage change
This commit is contained in:
josephschorr 2017-10-07 00:17:42 -04:00 • committed by GitHub
commit e646afd75b
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
endpoints/verbs/__init__.py
View file

@ -5,7 +5,7 @@ from flask import redirect, Blueprint, abort, send_file, make_response, request
import features import features
from app import app, signer, storage, metric_queue, license_validator from app import app, signer, storage, metric_queue, license_validator, config_provider, ip_resolver
from auth.auth_context import get_authenticated_user from auth.auth_context import get_authenticated_user
from auth.decorators import process_auth from auth.decorators import process_auth
from auth.permissions import ReadRepositoryPermission from auth.permissions import ReadRepositoryPermission
@ -48,7 +48,7 @@ def _open_stream(formatter, repo_image, tag, derived_image_id, handlers):
def get_next_layer(): def get_next_layer():
# Re-Initialize the storage engine because some may not respond well to forking (e.g. S3) # Re-Initialize the storage engine because some may not respond well to forking (e.g. S3)
store = Storage(app, metric_queue) store = Storage(app, metric_queue, config_provider=config_provider, ip_resolver=ip_resolver)
for current_image in image_list: for current_image in image_list:
current_image_path = model.get_blob_path(current_image.blob) current_image_path = model.get_blob_path(current_image.blob)
current_image_stream = store.stream_read_file(current_image.blob.locations, current_image_stream = store.stream_read_file(current_image.blob.locations,
@ -97,7 +97,7 @@ def _write_derived_image_to_storage(verb, derived_image, queue_file):
queue_file.add_exception_handler(handle_exception) queue_file.add_exception_handler(handle_exception)
# Re-Initialize the storage engine because some may not respond well to forking (e.g. S3) # Re-Initialize the storage engine because some may not respond well to forking (e.g. S3)
store = Storage(app, metric_queue) store = Storage(app, metric_queue, config_provider=config_provider, ip_resolver=ip_resolver)
image_path = model.get_blob_path(derived_image.blob) image_path = model.get_blob_path(derived_image.blob)
store.stream_write(derived_image.blob.locations, image_path, queue_file) store.stream_write(derived_image.blob.locations, image_path, queue_file)
queue_file.close() queue_file.close()

11
storage/cloud.py
View file

@ -613,9 +613,15 @@ class CloudFrontedS3Storage(S3Storage):
def get_direct_download_url(self, path, request_ip=None, expires_in=60, requires_cors=False, def get_direct_download_url(self, path, request_ip=None, expires_in=60, requires_cors=False,
head=False): head=False):
# If CloudFront could not be loaded, fall back to normal S3.
if self.cloudfront_privatekey is None:
return super(CloudFrontedS3Storage, self).get_direct_download_url(path, request_ip,
expires_in, requires_cors,
head)
resolved_ip_info = None resolved_ip_info = None
logger.debug('Got direct download request for path "%s" with IP "%s"', path, request_ip) logger.debug('Got direct download request for path "%s" with IP "%s"', path, request_ip)
if request_ip is not None: if request_ip is not None and self._context.ip_resolver is not None:
# Lookup the IP address in our resolution table and determine whether it is under AWS. If it is, # Lookup the IP address in our resolution table and determine whether it is under AWS. If it is,
# then return an S3 signed URL, since we are in-network. # then return an S3 signed URL, since we are in-network.
resolved_ip_info = self._context.ip_resolver.resolve_ip(request_ip) resolved_ip_info = self._context.ip_resolver.resolve_ip(request_ip)
@ -652,6 +658,9 @@ class CloudFrontedS3Storage(S3Storage):
""" Returns the private key, loaded from the config provider, used to sign direct """ Returns the private key, loaded from the config provider, used to sign direct
download URLs to CloudFront. download URLs to CloudFront.
""" """
if self._context.config_provider is None:
return None
with self._context.config_provider.get_volume_file(cloudfront_privatekey_filename) as key_file: with self._context.config_provider.get_volume_file(cloudfront_privatekey_filename) as key_file:
return serialization.load_pem_private_key( return serialization.load_pem_private_key(
key_file.read(), key_file.read(),