Fix disabled namespace check

data/registry_model/datatype.py

@@ -4,7 +4,7 @@ from functools import wraps, total_ordering
 
 class FromDictionaryException(Exception):
   """ Exception raised if constructing a data type from a dictionary fails due to
-      a version mismatch or missing data.
+      missing data.
   """
 
 def datatype(name, static_fields):
@@ -40,9 +40,6 @@ def datatype(name, static_fields):
 
     @classmethod
     def from_dict(cls, dict_data):
-      if dict_data.get('version') != 1:
-        raise FromDictionaryException()
-
       try:
         return cls(**dict_data)
       except:
@@ -50,9 +47,11 @@ def datatype(name, static_fields):
 
     def asdict(self):
       dictionary_rep = dict(self._fields)
+      assert ('db_id' not in dictionary_rep and
+              'inputs' not in dictionary_rep)
+
       dictionary_rep['db_id'] = self._db_id
       dictionary_rep['inputs'] = self._inputs
-      dictionary_rep['version'] = 1
       return dictionary_rep
 
   return DataType

data/registry_model/interface.py

@@ -171,6 +171,10 @@ class RegistryDataInterface(object):
         it should be removed.
     """
 
+  @abstractmethod
+  def is_existing_disabled_namespace(self, namespace_name):
+    """ Returns whether the given namespace exists and is disabled. """
+
   @abstractmethod
   def is_namespace_enabled(self, namespace_name):
     """ Returns whether the given namespace exists and is enabled. """
@@ -274,7 +278,9 @@ class RegistryDataInterface(object):
     Mounts the blob from another repository into the specified target repository, and adds an
     expiration before that blob is automatically GCed. This function is useful during push
     operations if an existing blob from another repositroy is being pushed. Returns False if
-    the mounting fails. Note that this function does *not* check security for mounting the blob.
+    the mounting fails. Note that this function does *not* check security for mounting the blob
+    and the caller is responsible for doing this check (an example can be found in
+    endpoints/v2/blob.py).
     """
 
   @abstractmethod

data/registry_model/label_handlers.py

@@ -17,12 +17,12 @@ def _expires_after(label_dict, manifest, model):
   model.set_tags_expiration_for_manifest(manifest, total_seconds)
 
 
-_LABEL_HANDLES = {
+_LABEL_HANDLERS = {
   'quay.expires-after': _expires_after,
 }
 
 def apply_label_to_manifest(label_dict, manifest, model):
   """ Runs the handler defined, if any, for the given label. """
-  handler = _LABEL_HANDLES.get(label_dict['key'])
+  handler = _LABEL_HANDLERS.get(label_dict['key'])
   if handler is not None:
     handler(label_dict, manifest, model)

data/registry_model/registry_pre_oci_model.py

@@ -257,8 +257,6 @@ class PreOCIModel(RegistryDataInterface):
                                 media_type_name=media_type_name))
 
     yield add_label
-    if labels_to_add:
-      pass
 
     # TODO: make this truly batch once we've fully transitioned to V2_2 and no longer need
     # the mapping tables.
@@ -537,6 +535,11 @@ class PreOCIModel(RegistryDataInterface):
 
     return Manifest.for_tag_manifest(tag_manifest)
 
+  def is_existing_disabled_namespace(self, namespace_name):
+    """ Returns whether the given namespace exists and is disabled. """
+    namespace = model.user.get_namespace_user(namespace_name)
+    return namespace is not None and not namespace.enabled
+
   def is_namespace_enabled(self, namespace_name):
     """ Returns whether the given namespace exists and is enabled. """
     namespace = model.user.get_namespace_user(namespace_name)
@@ -732,9 +735,9 @@ class PreOCIModel(RegistryDataInterface):
 
       return blob_found.asdict()
 
-    blob_cache_key = cache_key.for_repository_blob(namespace_name, repo_name, blob_digest)
+    blob_cache_key = cache_key.for_repository_blob(namespace_name, repo_name, blob_digest, 2)
     blob_dict = model_cache.retrieve(blob_cache_key, load_blob)
-  
+
     try:
       return Blob.from_dict(blob_dict) if blob_dict is not None else None
     except FromDictionaryException:
@@ -841,7 +844,7 @@ class PreOCIModel(RegistryDataInterface):
     """
     Mounts the blob from another repository into the specified target repository, and adds an
     expiration before that blob is automatically GCed. This function is useful during push
-    operations if an existing blob from another repositroy is being pushed. Returns False if
+    operations if an existing blob from another repository is being pushed. Returns False if
     the mounting fails.
     """
     repo = model.repository.lookup_repository(target_repository_ref._db_id)
@@ -862,7 +865,7 @@ class PreOCIModel(RegistryDataInterface):
     try:
       tag_manifest = database.TagManifest.get(id=manifest._db_id)
     except database.TagManifest.DoesNotExist:
-      return None
+      return
 
     model.tag.set_tag_expiration_for_manifest(tag_manifest, expiration_sec)