Merge lp:~ricardokirkner/rnr-server/flags-n-macaroons into lp:rnr-server

[Ricardo Kirkner]

added macaroons support to packages and reviews flags apis

[Fabián Ezequiel Gallina (fgallina)]

Looking good, added comments.

[lp:~ricardokirkner/rnr-server/flags-n-macaroons]

333. By Ricardo Kirkner on 2016-05-20

Merged review-crud-api-with-macaroons into flags-n-macaroons.

[lp:~ricardokirkner/rnr-server/flags-n-macaroons]

334. By Ricardo Kirkner on 2016-05-20

assert right package/review have been flagged

335. By Ricardo Kirkner on 2016-05-20

Merged review-crud-api-with-macaroons into flags-n-macaroons.

[Fabián Ezequiel Gallina (fgallina)]

LGTM

review: Approve

=== modified file 'src/clickreviews/api/urls.py'
--- src/clickreviews/api/urls.py	2016-05-20 14:00:39 +0000
+++ src/clickreviews/api/urls.py	2016-05-20 14:00:39 +0000
@@ -44,13 +44,13 @@
 
 click_package_flag_resource = CSRFExemptResource(
     handler=ClickPackageFlagHandler,
-    authentication=auth)
+    authentication=(macaroons_auth, auth))
 click_package_flag_resource.__name__ = "Resource"
 click_package_flag_resource = never_cache(click_package_flag_resource)
 
 click_package_review_flag_resource = CSRFExemptResource(
     handler=ClickPackageReviewFlagHandler,
-    authentication=auth)
+    authentication=(macaroons_auth, auth))
 click_package_review_flag_resource.__name__ = "Resource"
 click_package_review_flag_resource = never_cache(
     click_package_review_flag_resource)

=== modified file 'src/clickreviews/tests/test_handlers.py'
--- src/clickreviews/tests/test_handlers.py	2016-05-20 14:00:39 +0000
+++ src/clickreviews/tests/test_handlers.py	2016-05-20 14:00:39 +0000
@@ -44,6 +44,14 @@
         p.start()
         self.addCleanup(p.stop)
 
+    def make_account_data(self, user):
+        return {
+            'verified': True,
+            'openid': user.useropenid_set.first().claimed_id.split('/')[-1],
+            'email': user.email,
+            'displayname': user.username,
+        }
+
 
 class ClickReviewsHandlerTestCase(MacaroonsAuthenticatedTestCase):
 
@@ -327,14 +335,6 @@
         response = self.update_review(review, data)
         self.assert_review_updated(response, data)
 
-    def make_account_data(self, user):
-        return {
-            'verified': True,
-            'openid': user.useropenid_set.first().claimed_id.split('/')[-1],
-            'email': user.email,
-            'displayname': user.username,
-        }
-
     def test_update_review_using_macaroon_auth(self):
         user = self.factory.makeUser()
         account = self.make_account_data(user)
@@ -570,7 +570,7 @@
         self.assertEqual('Accept, Accept-Encoding', vary)
 
 
-class BaseClickPackageFlagHandlerTestCase(TestCaseWithFactory):
+class BaseClickPackageFlagHandlerTestCase(MacaroonsAuthenticatedTestCase):
 
     url_name = None
 
@@ -583,7 +583,6 @@
         self.mock_is_authenticated.return_value = True
         self.addCleanup(p.stop)
         self.user = self.factory.makeUser()
-        self.client.login(username=self.user.username, password='test')
         click_verify_fn = ('clickreviews.forms.'
                            'verify_click_package_published')
         patcher = mock.patch(click_verify_fn)
@@ -597,7 +596,7 @@
             'description': description}
 
     def do_request(
-            self, data=None, headers=None, user=None, **kwargs):
+            self, data=None, headers=None, user=None, auth='oauth', **kwargs):
         url = reverse(self.url_name, kwargs=kwargs)
         if data is None:
             data = {}
@@ -605,6 +604,12 @@
             headers = {}
         if user is None:
             user = self.factory.makeUser()
+        if auth == 'macaroon':
+            authorization = 'Macaroon root="%s", discharge="%s"' % (
+                'root-macaroon-data', 'discharge-macaroon-data')
+            headers['HTTP_AUTHORIZATION'] = authorization
+        else:
+            self.client.login(username=self.user.username, password='test')
         return self.client.post(url, data, **headers)
 
 
@@ -682,6 +687,27 @@
         self.assertIn(error,  response_data['errors']['package_name'])
         self.assertEqual(ClickPackageFlag.objects.count(), 1)
 
+    def test_support_macaroon_authentication(self):
+        user = self.factory.makeUser()
+        account = self.make_account_data(user)
+        self.sca_double.set_verify_acl_response(account=account)
+
+        package = self.factory.makeClickPackage(package_name='some_package')
+        assert not ClickPackageFlag.objects.exists()
+        data = self.make_data()
+        response = self.do_request(
+            package_name=package.package_name, data=data,
+            user=user, auth='macaroon')
+        self.assertEqual(response.status_code, httplib.OK)
+        data = json.loads(response.content)
+        self.assert_package_flagged(package, data)
+
+    def assert_package_flagged(self, package, data):
+        flag = ClickPackageFlag.objects.get(id=data['id'])
+        self.assertEqual(flag.description, data['description'])
+        self.assertEqual(flag.summary, data['summary'])
+        self.assertEqual(flag.moderation.package, package)
+
 
 class ClickPackageReviewFlagHandlerTestCase(
         BaseClickPackageFlagHandlerTestCase):
@@ -746,6 +772,27 @@
         self.assertIn(error,  response_data['errors']['review'])
         self.assertEqual(ClickPackageReviewFlag.objects.count(), 1)
 
+    def test_support_macaroon_authentication(self):
+        user = self.factory.makeUser()
+        account = self.make_account_data(user)
+        self.sca_double.set_verify_acl_response(account=account)
+
+        self.client.logout()
+        review = self.factory.makeClickPackageReview()
+        assert not ClickPackageReviewFlag.objects.exists()
+        data = self.make_data()
+        response = self.do_request(
+            review_id=review.pk, data=data, user=user, auth='macaroon')
+        self.assertEqual(response.status_code, httplib.OK)
+        data = json.loads(response.content)
+        self.assert_review_flagged(review, data)
+
+    def assert_review_flagged(self, review, data):
+        flag = ClickPackageReviewFlag.objects.get(id=data['id'])
+        self.assertEqual(flag.description, data['description'])
+        self.assertEqual(flag.summary, data['summary'])
+        self.assertEqual(flag.moderation.review, review)
+
 
 class BaseClickPackageModerationHandlerTestCase(
         SSOTestCaseMixin, TestCaseWithFactory):