vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #317 from coreos-inc/noscopeheadshot

Browse source 
Switch the base case for when a scope string contains an invalid scope.
This commit is contained in:
josephschorr 2015-08-05 17:39:11 -04:00
commit eda26cbdc9
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
auth/scopes.py
View file

@ -101,7 +101,7 @@ def scopes_from_scope_string(scopes):
# https://tools.ietf.org/html/rfc6749#section-3.3 # https://tools.ietf.org/html/rfc6749#section-3.3
# However, we also support commas for backwards compatibility with existing callers to our code. # However, we also support commas for backwards compatibility with existing callers to our code.
scope_set = {ALL_SCOPES.get(scope, None) for scope in re.split(' |,', scopes)} scope_set = {ALL_SCOPES.get(scope, None) for scope in re.split(' |,', scopes)}
return scope_set if not None in scope_set else {} return scope_set if not None in scope_set else set()
def validate_scope_string(scopes): def validate_scope_string(scopes):

9
test/test_auth.py
View file

@ -9,7 +9,8 @@ from flask import g
from flask.ext.principal import identity_loaded from flask.ext.principal import identity_loaded
from auth.auth import _process_basic_auth from auth.auth import _process_basic_auth
from auth.scopes import scopes_from_scope_string, is_subset_string, DIRECT_LOGIN, ADMIN_REPO from auth.scopes import (scopes_from_scope_string, is_subset_string, DIRECT_LOGIN, ADMIN_REPO,
ALL_SCOPES)
from auth.permissions import QuayDeferredPermissionUser from auth.permissions import QuayDeferredPermissionUser
from endpoints.api import api_bp, api from endpoints.api import api_bp, api
from endpoints.api.user import User, Signin from endpoints.api.user import User, Signin
@ -132,9 +133,9 @@ class TestAuth(ApiTestCase):
self.assertEquals(QuayDeferredPermissionUser.for_id('123454', {ADMIN_REPO})._scope_set, {ADMIN_REPO}) self.assertEquals(QuayDeferredPermissionUser.for_id('123454', {ADMIN_REPO})._scope_set, {ADMIN_REPO})
def assertParsedScopes(self, scopes_str, *args): def assertParsedScopes(self, scopes_str, *args):
expected = list(args) expected_scope_set = {ALL_SCOPES[scope_name] for scope_name in args}
parsed = scopes_from_scope_string(scopes_str) parsed_scope_set = scopes_from_scope_string(scopes_str)
self.assertEquals([p.scope for p in parsed], expected) self.assertEquals(parsed_scope_set, expected_scope_set)
def test_scopes_parsing(self): def test_scopes_parsing(self):
# Valid single scopes. # Valid single scopes.