Merge branch 'master' into create_data_interface_for_subsystem_api/tag_632

endpoints/api/manifest.py

@@ -10,6 +10,7 @@ from endpoints.exception import NotFound
 from data import model
 
 from digest import digest_tools
+from util.validation import VALID_LABEL_KEY_REGEX
 
 BASE_MANIFEST_ROUTE = '/v1/repository/<apirepopath:repository>/manifest/<regex("{0}"):manifestref>'
 MANIFEST_DIGEST_ROUTE = BASE_MANIFEST_ROUTE.format(digest_tools.DIGEST_PATTERN)
@@ -92,9 +93,17 @@ class RepositoryManifestLabels(RepositoryParamResource):
     if label_validator.has_reserved_prefix(label_data['key']):
       abort(400, message='Label has a reserved prefix')
 
-    label = model.label.create_manifest_label(tag_manifest, label_data['key'],
-                                              label_data['value'], 'api',
-                                              media_type_name=label_data['media_type'])
+    label = None
+    try:
+      label = model.label.create_manifest_label(tag_manifest, label_data['key'],
+                                                label_data['value'], 'api',
+                                                media_type_name=label_data['media_type'])
+    except model.InvalidLabelKeyException:
+      abort(400, message='Label is of an invalid format or missing please use %s format for labels'.format(
+            VALID_LABEL_KEY_REGEX))
+    except model.InvalidMediaTypeException:
+      abort(400, message='Media type is invalid please use a valid media type of text/plain or application/json')
+
     metadata = {
       'id': label.uuid,
       'key': label_data['key'],

endpoints/api/repositorynotification.py

@@ -161,10 +161,12 @@ class RepositoryNotification(RepositoryParamResource):
   @disallow_for_app_repositories
   def post(self, namespace, repository, uuid):
     """ Resets repository notification to 0 failures. """
-    model.notification.reset_notification_number_of_failures(namespace, repository, uuid)
-    log_action('reset_repo_notification', namespace,
-               {'repo': repository, 'namespace': namespace, 'notification_id': uuid},
-               repo=model.repository.get_repository(namespace, repository))
+    reset = model.notification.reset_notification_number_of_failures(namespace, repository, uuid)
+    if reset is not None:
+      log_action('reset_repo_notification', namespace,
+                 {'repo': repository, 'namespace': namespace, 'notification_id': uuid,
+                  'event': reset.event.name, 'method': reset.method.name},
+                 repo=model.repository.get_repository(namespace, repository))
 
     return 'No Content', 204
 

endpoints/api/test/shared.py

@@ -1,58 +1,10 @@
-import datetime
-import json
-
-from contextlib import contextmanager
-from data import model
+from endpoints.test.shared import conduct_call
 from endpoints.api import api
 
-CSRF_TOKEN_KEY = '_csrf_token'
-CSRF_TOKEN = '123csrfforme'
-
-
-@contextmanager
-def client_with_identity(auth_username, client):
-  with client.session_transaction() as sess:
-    if auth_username and auth_username is not None:
-      loaded = model.user.get_user(auth_username)
-      sess['user_id'] = loaded.uuid
-      sess['login_time'] = datetime.datetime.now()
-      sess[CSRF_TOKEN_KEY] = CSRF_TOKEN
-    else:
-      sess['user_id'] = 'anonymous'
-
-  yield client
-
-  with client.session_transaction() as sess:
-    sess['user_id'] = None
-    sess['login_time'] = None
-    sess[CSRF_TOKEN_KEY] = None
-
-
-def add_csrf_param(params):
-  """ Returns a params dict with the CSRF parameter added. """
-  params = params or {}
-  params[CSRF_TOKEN_KEY] = CSRF_TOKEN
-  return params
-
-
 def conduct_api_call(client, resource, method, params, body=None, expected_code=200):
   """ Conducts an API call to the given resource via the given client, and ensures its returned
       status matches the code given.
 
       Returns the response.
   """
-  params = add_csrf_param(params)
-
-  final_url = api.url_for(resource, **params)
-
-  headers = {}
-  headers.update({"Content-Type": "application/json"})
-
-  if body is not None:
-    body = json.dumps(body)
-
-  rv = client.open(final_url, method=method, data=body, headers=headers)
-  msg = '%s %s: got %s expected: %s | %s' % (method, final_url, rv.status_code, expected_code,
-                                             rv.data)
-  assert rv.status_code == expected_code, msg
-  return rv
+  return conduct_call(client, resource, api.url_for, method, params, body, expected_code)

endpoints/api/test/test_disallow_for_apps.py

@@ -16,7 +16,8 @@ from endpoints.api.trigger import (BuildTriggerList, BuildTrigger, BuildTriggerS
                                    BuildTriggerActivate, BuildTriggerAnalyze, ActivateBuildTrigger,
                                    TriggerBuildList, BuildTriggerFieldValues, BuildTriggerSources,
                                    BuildTriggerSourceNamespaces)
-from endpoints.api.test.shared import client_with_identity, conduct_api_call
+from endpoints.api.test.shared import conduct_api_call
+from endpoints.test.shared import client_with_identity
 from test.fixtures import *
 
 BUILD_ARGS = {'build_uuid': '1234'}

endpoints/api/test/test_organization.py

@@ -2,8 +2,9 @@ import pytest
 
 from data import model
 from endpoints.api import api
-from endpoints.api.test.shared import client_with_identity, conduct_api_call
+from endpoints.api.test.shared import conduct_api_call
 from endpoints.api.organization import Organization
+from endpoints.test.shared import client_with_identity
 from test.fixtures import *
 
 @pytest.mark.parametrize('expiration, expected_code', [

endpoints/api/test/test_repository.py

@@ -2,8 +2,9 @@ import pytest
 
 from mock import patch, ANY, MagicMock
 
-from endpoints.api.test.shared import client_with_identity, conduct_api_call
+from endpoints.api.test.shared import conduct_api_call
 from endpoints.api.repository import RepositoryTrust, Repository
+from endpoints.test.shared import client_with_identity
 from features import FeatureNameValue
 
 from test.fixtures import *
@@ -52,8 +53,8 @@ def test_signing_disabled(client):
       params = {'repository': 'devtable/simple'}
       response = conduct_api_call(cl, Repository, 'GET', params).json
       assert not response['trust_enabled']
-      
-      
+
+
 def test_sni_support():
   import ssl
   assert ssl.HAS_SNI

endpoints/api/test/test_search.py

@@ -4,7 +4,8 @@ from playhouse.test_utils import assert_query_count
 
 from data.model import _basequery
 from endpoints.api.search import ConductRepositorySearch, ConductSearch
-from endpoints.api.test.shared import client_with_identity, conduct_api_call
+from endpoints.api.test.shared import conduct_api_call
+from endpoints.test.shared import client_with_identity
 from test.fixtures import *
 
 @pytest.mark.parametrize('query, expected_query_count', [

endpoints/api/test/test_security.py

@@ -4,12 +4,13 @@ from flask_principal import AnonymousIdentity
 from endpoints.api import api
 from endpoints.api.repositorynotification import RepositoryNotification
 from endpoints.api.team import OrganizationTeamSyncing
-from endpoints.api.test.shared import client_with_identity, conduct_api_call
+from endpoints.api.test.shared import conduct_api_call
 from endpoints.api.repository import RepositoryTrust
 from endpoints.api.signing import RepositorySignatures
 from endpoints.api.search import ConductRepositorySearch
 from endpoints.api.superuser import SuperUserRepositoryBuildLogs, SuperUserRepositoryBuildResource
 from endpoints.api.superuser import SuperUserRepositoryBuildStatus
+from endpoints.test.shared import client_with_identity
 
 from test.fixtures import *
 

endpoints/api/test/test_signing.py

@@ -3,8 +3,9 @@ import pytest
 from collections import Counter
 from mock import patch
 
-from endpoints.api.test.shared import client_with_identity, conduct_api_call
+from endpoints.api.test.shared import conduct_api_call
 from endpoints.api.signing import RepositorySignatures
+from endpoints.test.shared import client_with_identity
 
 from test.fixtures import *
 
@@ -14,21 +15,21 @@ VALID_TARGETS_MAP = {
         "latest": {
           "hashes": {
             "sha256": "2Q8GLEgX62VBWeL76axFuDj/Z1dd6Zhx0ZDM6kNwPkQ="
-          }, 
+          },
           "length": 2111
         }
-      }, 
+      },
       "expiration": "2020-05-22T10:26:46.618176424-04:00"
-    }, 
+    },
     "targets": {
       "targets": {
         "latest": {
           "hashes": {
             "sha256": "2Q8GLEgX62VBWeL76axFuDj/Z1dd6Zhx0ZDM6kNwPkQ="
-          }, 
+          },
           "length": 2111
         }
-      }, 
+      },
       "expiration": "2020-05-22T10:26:01.953414888-04:00"}
   }
 

endpoints/api/test/test_tag.py

@@ -4,9 +4,12 @@ import pytest
 
 from mock import patch, Mock, MagicMock, call
 
+
 from endpoints.api.tag_models_interface import RepositoryTagHistory, Tag
-from endpoints.api.test.shared import client_with_identity, conduct_api_call
+from endpoints.api.test.shared import conduct_api_call
+from endpoints.test.shared import client_with_identity
 from endpoints.api.tag import RepositoryTag, RestoreTag, ListRepositoryTags
+
 from features import FeatureNameValue
 
 from test.fixtures import *

endpoints/api/test/test_team.py

@@ -4,9 +4,11 @@ from mock import patch
 
 from data import model
 from endpoints.api import api
-from endpoints.api.test.shared import client_with_identity, conduct_api_call
+from endpoints.api.test.shared import conduct_api_call
 from endpoints.api.team import OrganizationTeamSyncing, TeamMemberList
 from endpoints.api.organization import Organization
+from endpoints.test.shared import client_with_identity
+
 from test.test_ldap import mock_ldap
 
 from test.fixtures import *