Switch to using straight docker IDs instead of a hashing scheme

endpoints/api/__init__.py

@@ -1,7 +1,6 @@
 import logging
 import json
 import datetime
-import hashlib
 
 from flask import Blueprint, request, make_response, jsonify, session
 from flask.ext.restful import Resource, abort, Api, reqparse
@@ -345,12 +344,6 @@ def log_action(kind, user_or_orgname, metadata=None, repo=None):
                    metadata=metadata, repository=repo)
 
 
-def calculate_internal_id(dbid):
-  """ Returns an 'internal id' we can send to the frontend that represents the
-      given database ID, but without leaking its actual value.
-  """
-  return hashlib.sha1("internal-db-" + str(dbid)).hexdigest()
-
 import endpoints.api.billing
 import endpoints.api.build
 import endpoints.api.discovery

endpoints/api/image.py

@@ -4,27 +4,26 @@ from collections import defaultdict
 
 from app import storage as store
 from endpoints.api import (resource, nickname, require_repo_read, RepositoryParamResource,
-                           format_date, NotFound, calculate_internal_id)
+                           format_date, NotFound)
 from data import model
 from util.cache import cache_control_flask_restful
 
 
-def image_view(image):
+def image_view(image, image_map):
   extended_props = image
   if image.storage and image.storage.id:
     extended_props = image.storage
 
   command = extended_props.command
 
-  def internal_id(aid):
-    if aid == '':
+  def docker_id(aid):
+    if not aid:
       return ''
 
-    return calculate_internal_id(aid)
+    return image_map[aid]
 
-  # Calculate the ancestors string, with the DBID's replaced with the
-  # hashed 'internal' IDs.
-  ancestors = [internal_id(a) for a in image.ancestors.split('/')]
+  # Calculate the ancestors string, with the DBID's replaced with the docker IDs.
+  ancestors = [docker_id(a) for a in image.ancestors.split('/')]
   ancestors_string = '/'.join(ancestors)
 
   return {
@@ -35,10 +34,7 @@ def image_view(image):
     'size': extended_props.image_size,
     'locations': list(image.storage.locations),
     'uploading': image.storage.uploading,
-
     'ancestors': ancestors_string,
-
-    'internal_id': calculate_internal_id(image.id),
     'sort_index': len(image.ancestors)
   }
 
@@ -57,14 +53,16 @@ class RepositoryImageList(RepositoryParamResource):
     for tag in all_tags:
       tags_by_image_id[tag.image.docker_image_id].append(tag.name)
 
+    image_map = {}
+    for image in all_images:
+      image_map[str(image.id)] = image.docker_image_id
 
     def add_tags(image_json):
       image_json['tags'] = tags_by_image_id[image_json['id']]
       return image_json
 
-
     return {
-      'images': [add_tags(image_view(image)) for image in all_images]
+      'images': [add_tags(image_view(image, image_map)) for image in all_images]
     }
 
 
@@ -79,7 +77,12 @@ class RepositoryImage(RepositoryParamResource):
     if not image:
       raise NotFound()
 
-    return image_view(image)
+    # Lookup all the ancestor images for the image.
+    image_map = {}
+    for current_image in model.get_parent_images(namespace, repository, image):
+      image_map[str(current_image.id)] = image.docker_image_id
+
+    return image_view(image, image_map)
 
 
 @resource('/v1/repository/<repopath:repository>/image/<image_id>/changes')

endpoints/api/repository.py

@@ -7,8 +7,7 @@ from data import model
 from endpoints.api import (truthy_bool, format_date, nickname, log_action, validate_json_request,
                            require_repo_read, require_repo_write, require_repo_admin,
                            RepositoryParamResource, resource, query_param, parse_args, ApiResource,
-                           request_error, require_scope, Unauthorized, NotFound, InvalidRequest,
-                           calculate_internal_id)
+                           request_error, require_scope, Unauthorized, NotFound, InvalidRequest)
 from auth.permissions import (ModifyRepositoryPermission, AdministerRepositoryPermission,
                               CreateRepositoryPermission, ReadRepositoryPermission)
 from auth.auth_context import get_authenticated_user
@@ -169,8 +168,7 @@ class Repository(RepositoryParamResource):
     def tag_view(tag):
       return {
         'name': tag.name,
-        'image_id': tag.image.docker_image_id,
-        'internal_id': calculate_internal_id(tag.image.id)
+        'image_id': tag.image.docker_image_id
       }
 
     organization = None

endpoints/api/tag.py

@@ -85,11 +85,14 @@ class RepositoryTagImages(RepositoryParamResource):
       raise NotFound()
 
     parent_images = model.get_parent_images(namespace, repository, tag_image)
+    image_map = {}
+    for image in parent_images:
+      image_map[str(image.id)] = image.docker_image_id
 
     parents = list(parent_images)
     parents.reverse()
     all_images = [tag_image] + parents
 
     return {
-      'images': [image_view(image) for image in all_images]
+      'images': [image_view(image, image_map) for image in all_images]
     }