Phase 4 of the namespace to user migration: actually remove the column from the db and remove the dependence on serialized namespaces in the workers and queues

endpoints/api/build.py

@@ -196,8 +196,9 @@ class RepositoryBuildStatus(RepositoryParamResource):
   @nickname('getRepoBuildStatus')
   def get(self, namespace, repository, build_uuid):
     """ Return the status for the builds specified by the build uuids. """
-    build = model.get_repository_build(namespace, repository, build_uuid)
-    if not build:
+    build = model.get_repository_build(build_uuid)
+    if (not build or build.repository.name != repository or
+        build.repository.namespace_user.username != namespace):
       raise NotFound()
       
     can_write = ModifyRepositoryPermission(namespace, repository).can()
@@ -213,7 +214,10 @@ class RepositoryBuildLogs(RepositoryParamResource):
     """ Return the build logs for the build specified by the build uuid. """
     response_obj = {}
 
-    build = model.get_repository_build(namespace, repository, build_uuid)
+    build = model.get_repository_build(build_uuid)
+    if (not build or build.repository.name != repository or
+        build.repository.namespace_user.username != namespace):
+      raise NotFound()
 
     # If the logs have been archived, just redirect to the completed archive
     if build.logs_archived:

endpoints/api/repositorynotification.py

@@ -102,10 +102,14 @@ class RepositoryNotification(RepositoryParamResource):
   def get(self, namespace, repository, uuid):
     """ Get information for the specified notification. """
     try:
-      notification = model.get_repo_notification(namespace, repository, uuid)
+      notification = model.get_repo_notification(uuid)
     except model.InvalidNotificationException:
       raise NotFound()
 
+    if (notification.repository.namespace_user.username != namespace or
+        notification.repository.name != repository):
+      raise NotFound()
+
     return notification_view(notification)
 
   @require_repo_admin
@@ -129,14 +133,18 @@ class TestRepositoryNotification(RepositoryParamResource):
   def post(self, namespace, repository, uuid):
     """ Queues a test notification for this repository. """
     try:
-      notification = model.get_repo_notification(namespace, repository, uuid)
+      notification = model.get_repo_notification(uuid)
     except model.InvalidNotificationException:
       raise NotFound()
 
+    if (notification.repository.namespace_user.username != namespace or
+        notification.repository.name != repository):
+      raise NotFound()
+
     event_info = NotificationEvent.get_event(notification.event.name)
     sample_data = event_info.get_sample_data(repository=notification.repository)
     notification_data = build_notification_data(notification, sample_data)
-    notification_queue.put([namespace, repository, notification.event.name],
-                           json.dumps(notification_data))
+    notification_queue.put([str(notification.repository.namespace_user.id), repository,
+                            notification.event.name], json.dumps(notification_data))
 
     return {}

endpoints/api/user.py

@@ -139,6 +139,10 @@ class User(ApiResource):
           'type': 'string',
           'description': 'The user\'s email address',
         },
+        'username': {
+          'type': 'string',
+          'description': 'The user\'s username',
+        },
       },
     },
   }
@@ -189,6 +193,14 @@ class User(ApiResource):
           send_change_email(user.username, user_data['email'], code.code)
         else:
           model.update_email(user, new_email, auto_verify=not features.MAILING)
+
+      if 'username' in user_data and user_data['username'] != user.username:
+        new_username = user_data['username']
+        if model.get_user_or_org(new_username) is not None:
+          # Username already used
+          raise request_error(message='Username is already in use')
+
+        model.change_username(user, new_username)
         
     except model.InvalidPasswordException, ex:
       raise request_error(exception=ex)