diff --git a/endpoints/verbs.py b/endpoints/verbs.py index f316b256c..6e9de7d90 100644 --- a/endpoints/verbs.py +++ b/endpoints/verbs.py @@ -78,11 +78,7 @@ def _write_synthetic_image_to_storage(verb, linked_storage_uuid, linked_location def _repo_verb(namespace, repository, tag, verb, formatter, checker=None, **kwargs): permission = ReadRepositoryPermission(namespace, repository) - - # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - # TODO: renable auth! - # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - if True or permission.can() or model.repository_is_public(namespace, repository): + if permission.can() or model.repository_is_public(namespace, repository): # Lookup the requested tag. try: tag_image = model.get_tag_image(namespace, repository, tag) @@ -113,10 +109,7 @@ def _repo_verb(namespace, repository, tag, verb, formatter, checker=None, **kwar derived = model.find_or_create_derived_storage(repo_image.storage, verb, store.preferred_locations[0]) - # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - # TODO: renable caching! - # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - if False and not derived.uploading: + if not derived.uploading: logger.debug('Derived %s image %s exists in storage', verb, derived.uuid) derived_layer_path = store.image_layer_path(derived.uuid) download_url = store.get_direct_download_url(derived.locations, derived_layer_path)