Skip to content

Commit 9168d27

Browse files
committed
fix(controller): allow "*" wildcard in cert REST URLs
1 parent 5c2ae9c commit 9168d27

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

controller/api/tests/test_certificate.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,11 @@ def test_delete_certificate(self):
110110
url = '/v1/certs/autotest.example.com'
111111
response = self.client.delete(url, HTTP_AUTHORIZATION='token {}'.format(self.token))
112112
self.assertEqual(response.status_code, 204)
113+
# deleting a wildcard cert should work too (even though they're unsupported right now)
114+
# https://github.com/deis/deis/issues/3533
115+
Certificate.objects.create(owner=self.user,
116+
common_name='*.example.com',
117+
certificate=self.autotest_example_com_cert)
118+
url = '/v1/certs/*.example.com'
119+
response = self.client.delete(url, HTTP_AUTHORIZATION='token {}'.format(self.token))
120+
self.assertEqual(response.status_code, 204)

controller/api/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
views.AdminPermsViewSet.as_view({'delete': 'destroy'})),
8383
url(r'^admin/perms/?',
8484
views.AdminPermsViewSet.as_view({'get': 'list', 'post': 'create'})),
85-
url(r'^certs/(?P<common_name>[-_.\w]+)/?'.format(settings.APP_URL_REGEX),
85+
url(r'^certs/(?P<common_name>[-_*.\w]+)/?'.format(settings.APP_URL_REGEX),
8686
views.CertificateViewSet.as_view({'get': 'retrieve', 'delete': 'destroy'})),
8787
url(r'^certs/?',
8888
views.CertificateViewSet.as_view({'get': 'list', 'post': 'create'})),

0 commit comments

Comments
 (0)