Merge lp:~ricardokirkner/rnr-server/fix-acl-verify-request into lp:rnr-server

[Ricardo Kirkner]

ensure acl verify request is made properly

send body data as a json encoded dict

[Facundo Batista (facundo)]

review: Needs Information

[Matt Goodall (matt-goodall)]

lgtm, with a question

review: Approve

[Facundo Batista (facundo)]

Thanks

review: Approve

=== modified file 'django_project/settings_base.py'
--- django_project/settings_base.py	2016-02-19 17:11:09 +0000
+++ django_project/settings_base.py	2016-05-25 14:22:07 +0000
@@ -344,7 +344,7 @@
 ROOT_URLCONF = 'urls'
 SCA_APPS_CACHE_TIMEOUT = 3600
 SCA_DELEGATED_SSO_SECRET = ''
-SCA_HOST_URL = 'https://sc.staging.ubuntu.com/'
+SCA_HOST_URL = 'https://myapps.developer.staging.ubuntu.com/'
 SECURE_PROXY_SSL_HEADER = None
 SEND_BROKEN_LINK_EMAILS = False
 SERVER_EMAIL = 'root@localhost'
 
=== modified file 'src/core/tests/test_utilities.py'
--- src/core/tests/test_utilities.py	2016-05-17 14:32:12 +0000
+++ src/core/tests/test_utilities.py	2016-05-25 14:22:07 +0000
@@ -1,3 +1,4 @@
+import json
 import os
 
 from django.conf import settings
@@ -532,16 +533,32 @@
         expected.update(**kwargs)
         self.assertEqual(data, expected)
 
+    def assert_verify_acl_request(self, request):
+        headers = {'Content-Type': 'application/json'}
+        body = json.dumps({
+            'auth_data': {
+                'http_url': request.build_absolute_uri(),
+                'http_method': request.method,
+                'authorization': request.META['HTTP_AUTHORIZATION'],
+            }
+        })
+        match = self.requests_double.find_call(
+            settings.SCA_HOST_URL.strip('/') + '/dev/api/acl/verify/',
+            headers=headers, body=body, method='POST')
+        self.assertIsNotNone(match)
+
     def test_verify_acl_allowed(self):
         self.sca_double.set_verify_acl_response()
         request = self.make_request()
         data = self.sca.verify_acl(request)
+        self.assert_verify_acl_request(request)
         self.assert_verify_acl_response(data)
 
     def test_verify_acl_not_allowed(self):
         self.sca_double.set_verify_acl_response(allowed=False)
         request = self.make_request()
         data = self.sca.verify_acl(request)
+        self.assert_verify_acl_request(request)
         self.assertIsNone(data)
 
     def test_verify_acl_failed(self):
@@ -550,6 +567,7 @@
             method='POST', body='some error', status_code=500)
         request = self.make_request()
         data = self.sca.verify_acl(request)
+        self.assert_verify_acl_request(request)
         self.assertIsNone(data)
         self.mock_logger.warn.assert_called_once_with(
             'Failed to verify acl. Response: some error (500)')
@@ -558,6 +576,7 @@
         self.sca_double.set_verify_acl_response(permissions=['package_upload'])
         request = self.make_request()
         data = self.sca.verify_acl(request)
+        self.assert_verify_acl_request(request)
         self.assertIsNone(data)
 
     def test_verify_acl_returns_account_data(self):
@@ -576,4 +595,5 @@
         self.sca_double.set_verify_acl_response(**expected)
         request = self.make_request()
         data = self.sca.verify_acl(request)
+        self.assert_verify_acl_request(request)
         self.assert_verify_acl_response(data, **expected)
 
=== modified file 'src/core/utilities.py'
--- src/core/utilities.py	2016-05-17 14:32:12 +0000
+++ src/core/utilities.py	2016-05-25 14:22:07 +0000
@@ -193,14 +193,15 @@
 
     def verify_acl(self, request):
         data = {
-            'auth_data': json.dumps({
+            'auth_data': {
                 'http_url': request.build_absolute_uri(),
                 'http_method': request.method,
                 'authorization': request.META.get('HTTP_AUTHORIZATION', None),
-            }),
+            },
         }
         url = settings.SCA_HOST_URL.strip('/') + '/dev/api/acl/verify/'
-        response = requests.post(url, data=json.dumps(data))
+        response = requests.post(url, data=json.dumps(data),
+                                 headers={'Content-Type': 'application/json'})
         if response.ok:
             data = response.json()
             if data.get('allowed', False):