Merge pull request #3535 from mboersma/fix-cert-delete-with-wildcard

fix(controller): allow "*" wildcard in cert REST URLs

Author: mboersma

controller/api/tests/test_certificate.py

@@ -110,3 +110,11 @@ def test_delete_certificate(self):
         url = '/v1/certs/autotest.example.com'
         response = self.client.delete(url, HTTP_AUTHORIZATION='token {}'.format(self.token))
         self.assertEqual(response.status_code, 204)
+        # deleting a wildcard cert should work too (even though they're unsupported right now)
+        # https://github.com/deis/deis/issues/3533
+        Certificate.objects.create(owner=self.user,
+                                   common_name='*.example.com',
+                                   certificate=self.autotest_example_com_cert)
+        url = '/v1/certs/*.example.com'
+        response = self.client.delete(url, HTTP_AUTHORIZATION='token {}'.format(self.token))
+        self.assertEqual(response.status_code, 204)

controller/api/urls.py

@@ -82,7 +82,7 @@
         views.AdminPermsViewSet.as_view({'delete': 'destroy'})),
     url(r'^admin/perms/?',
         views.AdminPermsViewSet.as_view({'get': 'list', 'post': 'create'})),
-    url(r'^certs/(?P<common_name>[-_.\w]+)/?'.format(settings.APP_URL_REGEX),
+    url(r'^certs/(?P<common_name>[-_*.\w]+)/?'.format(settings.APP_URL_REGEX),
         views.CertificateViewSet.as_view({'get': 'retrieve', 'delete': 'destroy'})),
     url(r'^certs/?',
         views.CertificateViewSet.as_view({'get': 'list', 'post': 'create'})),