Merge remote-tracking branch 'origin/master' into nomenclature

Conflicts:
	test/data/test.db
	workers/dockerfilebuild.py

endpoints/api/__init__.py

@@ -27,8 +27,8 @@ api_bp = Blueprint('api', __name__)
 api = Api()
 api.init_app(api_bp)
 api.decorators = [csrf_protect,
-                  process_oauth,
-                  crossdomain(origin='*', headers=['Authorization', 'Content-Type'])]
+                  crossdomain(origin='*', headers=['Authorization', 'Content-Type']),
+                  process_oauth]
 
 
 class ApiException(Exception):
@@ -90,6 +90,7 @@ def handle_api_error(error):
   if error.error_type is not None:
     response.headers['WWW-Authenticate'] = ('Bearer error="%s" error_description="%s"' %
                                             (error.error_type, error.error_description))
+
   return response
 
 
@@ -191,6 +192,7 @@ def query_param(name, help_str, type=reqparse.text_type, default=None,
       'default': default,
       'choices': choices,
       'required': required,
+      'location': ('args')
     })
     return func
   return add_param

endpoints/api/user.py

@@ -120,6 +120,10 @@ class User(ApiResource):
           'type': 'string',
           'description': 'The user\'s email address',
         },
+        'invite_code': {
+          'type': 'string',
+          'description': 'The optional invite code'
+        }
       }
     },
     'UpdateUser': {
@@ -207,16 +211,14 @@ class User(ApiResource):
 
     return user_view(user)
 
+  @show_if(features.USER_CREATION)
   @nickname('createNewUser')
-  @parse_args
-  @query_param('inviteCode', 'Invitation code given for creating the user.', type=str,
-               default='')
   @internal_only
   @validate_json_request('NewUser')
-  def post(self, args):
+  def post(self):
     """ Create a new user. """
     user_data = request.get_json()
-    invite_code = args['inviteCode']
+    invite_code = user_data.get('invite_code', '')
 
     existing_user = model.get_user(user_data['username'])
     if existing_user:

endpoints/callbacks.py

@@ -26,7 +26,8 @@ def render_ologin_error(service_name,
                         error_message='Could not load user data. The token may have expired.'):
   return render_page_template('ologinerror.html', service_name=service_name,
                               error_message=error_message,
-                              service_url=get_app_url())
+                              service_url=get_app_url(),
+                              user_creation=features.USER_CREATION)
 
 def exchange_code_for_token(code, service_name='GITHUB', for_login=True, form_encode=False,
                             redirect_suffix=''):
@@ -85,7 +86,12 @@ def get_google_user(token):
 def conduct_oauth_login(service_name, user_id, username, email, metadata={}):
   to_login = model.verify_federated_login(service_name.lower(), user_id)
   if not to_login:
-    # try to create the user
+    # See if we can create a new user.
+    if not features.USER_CREATION:
+      error_message = 'User creation is disabled. Please contact your administrator'
+      return render_ologin_error(service_name, error_message)
+
+    # Try to create the user
     try:
       valid = next(generate_valid_usernames(username))
       to_login = model.create_federated_user(valid, email, service_name.lower(),
@@ -147,7 +153,7 @@ def github_oauth_callback():
 
   token = exchange_code_for_token(request.args.get('code'), service_name='GITHUB')
   user_data = get_github_user(token)
-  if not user_data:
+  if not user_data or not 'login' in user_data:
     return render_ologin_error('GitHub')
 
   username = user_data['login']

endpoints/index.py

@@ -19,6 +19,7 @@ from auth.permissions import (ModifyRepositoryPermission, UserAdminPermission,
 from util.http import abort
 from endpoints.notificationhelper import spawn_notification
 
+import features
 
 logger = logging.getLogger(__name__)
 profile = logging.getLogger('application.profiler')
@@ -65,6 +66,9 @@ def generate_headers(role='read'):
 @index.route('/users', methods=['POST'])
 @index.route('/users/', methods=['POST'])
 def create_user():
+  if not features.USER_CREATION:
+    abort(400, 'User creation is disabled. Please speak to your administrator.')
+
   user_data = request.get_json()
   if not 'username' in user_data:
     abort(400, 'Missing username')
@@ -454,6 +458,7 @@ def get_search():
 @index.route('/_ping')
 @index.route('/_ping')
 def ping():
+  # NOTE: any changes made here must also be reflected in the nginx config
   response = make_response('true', 200)
   response.headers['X-Docker-Registry-Version'] = '0.6.0'
   response.headers['X-Docker-Registry-Standalone'] = '0'

endpoints/registry.py

@@ -220,7 +220,7 @@ def put_image_layer(namespace, repository, image_id):
     image_size = tmp.tell()
 
     # Save the size of the image.
-    model.set_image_size(image_id, namespace, repository, image_size)
+    model.set_image_size(image_id, namespace, repository, image_size, uncompressed_size_info.size)
 
     tmp.seek(0)
     csums.append(checksums.compute_tarsum(tmp, json_data))
@@ -229,12 +229,6 @@ def put_image_layer(namespace, repository, image_id):
     logger.debug('put_image_layer: Error when computing tarsum '
                  '{0}'.format(e))
 
-  # Write the uncompressed image size, if any.
-  if uncompressed_size_info['size'] > 0:
-    profile.debug('Storing uncompressed layer size: %s' % uncompressed_size_info['size'])
-    repo_image.storage.uncompressed_size = uncompressed_size_info['size']
-    repo_image.storage.save()
-
   if repo_image.storage.checksum is None:
     # We don't have a checksum stored yet, that's fine skipping the check.
     # Not removing the mark though, image is not downloadable yet.

endpoints/trigger.py

@@ -377,7 +377,7 @@ class GithubBuildTrigger(BuildTrigger):
       gh_client = self._get_client(auth_token)
       source = config['build_source']
       repo = gh_client.get_repo(source)
-      branches = [branch['name'] for branch in repo.get_branches()]
+      branches = [branch.name for branch in repo.get_branches()]
 
       if not repo.default_branch in branches:
         branches.insert(0, repo.default_branch)