Merge pull request #546 from ewindisch/remove_private_endpoints

Remove private image endpoints

Author: dmp42

docker_registry/images.py

@@ -168,28 +168,6 @@ def _valid_bytes_range(bytes_range):
     return True
 
 
-@app.route('/v1/private_images/<image_id>/layer', methods=['GET'])
-@toolkit.requires_auth
-@require_completion
-def get_private_image_layer(image_id):
-    try:
-        headers = None
-        bytes_range = None
-        if store.supports_bytes_range:
-            headers['Accept-Ranges'] = 'bytes'
-            bytes_range = _parse_bytes_range()
-        repository = toolkit.get_repository()
-        if not repository:
-            # No auth token found, either standalone registry or privileged
-            # access. In both cases, private images are "disabled"
-            return toolkit.api_error('Image not found', 404)
-        if not store.is_private(*repository):
-            return toolkit.api_error('Image not found', 404)
-        return _get_image_layer(image_id, headers, bytes_range)
-    except exceptions.FileNotFoundError:
-        return toolkit.api_error('Image not found', 404)
-
-
 @app.route('/v1/images/<image_id>/layer', methods=['GET'])
 @toolkit.requires_auth
 @require_completion
@@ -296,23 +274,6 @@ def put_image_checksum(image_id):
     return toolkit.response()
 
 
-@app.route('/v1/private_images/<image_id>/json', methods=['GET'])
-@toolkit.requires_auth
-@require_completion
-def get_private_image_json(image_id):
-    repository = toolkit.get_repository()
-    if not repository:
-        # No auth token found, either standalone registry or privileged access
-        # In both cases, private images are "disabled"
-        return toolkit.api_error('Image not found', 404)
-    try:
-        if not store.is_private(*repository):
-            return toolkit.api_error('Image not found', 404)
-        return _get_image_json(image_id)
-    except exceptions.FileNotFoundError:
-        return toolkit.api_error('Image not found', 404)
-
-
 @app.route('/v1/images/<image_id>/json', methods=['GET'])
 @toolkit.requires_auth
 @require_completion
@@ -422,26 +383,6 @@ def put_image_json(image_id):
     return toolkit.response()
 
 
-@app.route('/v1/private_images/<image_id>/files', methods=['GET'])
-@toolkit.requires_auth
-@require_completion
-def get_private_image_files(image_id, headers):
-    repository = toolkit.get_repository()
-    if not repository:
-        # No auth token found, either standalone registry or privileged access
-        # In both cases, private images are "disabled"
-        return toolkit.api_error('Image not found', 404)
-    try:
-        if not store.is_private(*repository):
-            return toolkit.api_error('Image not found', 404)
-        data = layers.get_image_files_json(image_id)
-        return toolkit.response(data, headers=headers, raw=True)
-    except exceptions.FileNotFoundError:
-        return toolkit.api_error('Image not found', 404)
-    except tarfile.TarError:
-        return toolkit.api_error('Layer format not supported', 400)
-
-
 @app.route('/v1/images/<image_id>/files', methods=['GET'])
 @toolkit.requires_auth
 @require_completion