enforce license across registry blueprints

endpoints/api/suconfig.py

@@ -19,7 +19,7 @@ from data.database import User
 from util.config.configutil import add_enterprise_config_defaults
 from util.config.database import sync_database_with_config
 from util.config.validator import validate_service_for_config, CONFIG_FILENAMES
-from util.config.provider.license import decode_license, LicenseError
+from util.license import decode_license, LicenseError
 from data.runmigration import run_alembic_migration
 from data.users import get_federated_service_name, get_users_handler
 

endpoints/v1/__init__.py

@@ -1,14 +1,16 @@
 from flask import Blueprint, make_response
 
-from app import metric_queue
+from app import metric_queue, license_validator
 from endpoints.decorators import anon_protect, anon_allowed
+from util.license import enforce_license_before_request
 from util.metrics.metricqueue import time_blueprint
 
 
 v1_bp = Blueprint('v1', __name__)
-
+enforce_license_before_request(license_validator, v1_bp)
 time_blueprint(v1_bp, metric_queue)
 
+
 # Note: This is *not* part of the Docker index spec. This is here for our own health check,
 # since we have nginx handle the _ping below.
 @v1_bp.route('/_internal_ping')
@@ -29,4 +31,4 @@ def ping():
 
 from endpoints.v1 import index
 from endpoints.v1 import registry
-from endpoints.v1 import tag
+from endpoints.v1 import tag

endpoints/v2/__init__.py

@@ -9,7 +9,7 @@ from semantic_version import Spec
 
 import features
 
-from app import app, metric_queue, get_app_url
+from app import app, metric_queue, get_app_url, license_validator
 from auth.auth_context import get_grant_context
 from auth.permissions import (ReadRepositoryPermission, ModifyRepositoryPermission,
                               AdministerRepositoryPermission)
@@ -18,13 +18,17 @@ from data import model
 from endpoints.decorators import anon_protect, anon_allowed
 from endpoints.v2.errors import V2RegistryException, Unauthorized
 from util.http import abort
-from util.registry.dockerver import docker_version
+from util.license import enforce_license_before_request
 from util.metrics.metricqueue import time_blueprint
+from util.registry.dockerver import docker_version
 from util.pagination import encrypt_page_token, decrypt_page_token
 
-logger = logging.getLogger(__name__)
-v2_bp = Blueprint('v2', __name__)
 
+logger = logging.getLogger(__name__)
+
+
+v2_bp = Blueprint('v2', __name__)
+enforce_license_before_request(license_validator, v2_bp)
 time_blueprint(v2_bp, metric_queue)
 
 

endpoints/verbs/__init__.py

@@ -5,7 +5,7 @@ from flask import redirect, Blueprint, abort, send_file, make_response, request
 
 import features
 
-from app import app, signer, storage, metric_queue
+from app import app, signer, storage, metric_queue, license_validator
 from auth.auth_context import get_authenticated_user
 from auth.permissions import ReadRepositoryPermission
 from auth.process import process_auth
@@ -18,6 +18,7 @@ from endpoints.v2.blob import BLOB_DIGEST_ROUTE
 from image.appc import AppCImageFormatter
 from image.docker.squashed import SquashedDockerImageFormatter
 from storage import Storage
+from util.license import enforce_license_before_request
 from util.registry.filelike import wrap_with_handler
 from util.registry.queuefile import QueueFile
 from util.registry.queueprocess import QueueProcess
@@ -25,9 +26,11 @@ from util.registry.torrent import (make_torrent, per_user_torrent_filename, publ
                                    PieceHasher)
 
 
-verbs = Blueprint('verbs', __name__)
 logger = logging.getLogger(__name__)
 
+verbs = Blueprint('verbs', __name__)
+enforce_license_before_request(license_validator, verbs)
+
 
 def _open_stream(formatter, namespace, repository, tag, derived_image_id, repo_image, handlers):
   """