Skip to content
This repository was archived by the owner on May 6, 2020. It is now read-only.

Commit 9098331

Browse files
kmalaMatthew Fisher
authored andcommitted
fix(perms):Use the same regex for perms as auth endpoint (#1181)
1 parent 184b54c commit 9098331

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

rootfs/api/tests/test_perm.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def test_delete(self):
134134
self.assertTrue(response.data['is_superuser'])
135135

136136
submit = {
137-
'username': 'second',
137+
'username': 'second.lastname',
138138
'password': 'password',
139139
'email': 'autotest@deis.io',
140140
}
@@ -148,12 +148,12 @@ def test_delete(self):
148148
self.client.credentials(HTTP_AUTHORIZATION='Token ' + token)
149149
# grant user 2 the superuser perm
150150
url = '/v2/admin/perms'
151-
body = {'username': 'second'}
151+
body = {'username': 'second.lastname'}
152152
response = self.client.post(url, body)
153153
self.assertEqual(response.status_code, 201, response.data)
154154

155155
# revoke the superuser perm
156-
response = self.client.delete(url + '/second')
156+
response = self.client.delete(url + '/second.lastname')
157157
self.assertEqual(response.status_code, 204, response.data)
158158
response = self.client.get(url)
159159
self.assertEqual(response.status_code, 200, response.data)

rootfs/api/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
url(r'^auth/tokens/$',
107107
views.TokenManagementViewSet.as_view({'post': 'regenerate'})),
108108
# admin sharing
109-
url(r'^admin/perms/(?P<username>[-_\w]+)/?$',
109+
url(r'^admin/perms/(?P<username>[\w.@+-]+)/?$',
110110
views.AdminPermsViewSet.as_view({'delete': 'destroy'})),
111111
url(r'^admin/perms/?$',
112112
views.AdminPermsViewSet.as_view({'get': 'list', 'post': 'create'})),

0 commit comments

Comments
 (0)