Merge lp:~soren/surveilr/remember-service-owner into lp:surveilr

[Soren Hansen]

Set Service.user based on authenticated user info.

=== modified file 'surveilr/api/server/app.py'
--- surveilr/api/server/app.py	2012-01-29 23:14:07 +0000
+++ surveilr/api/server/app.py	2012-01-29 23:25:26 +0000
@@ -52,9 +52,9 @@
 
 def privileged(f):
     @functools.wraps(f)
-    def wrapped(self, req, *args):
+    def wrapped(self, req, *args, **kwargs):
         if is_privileged(req):
-            return f(self, req, *args)
+            return f(self, req, *args, **kwargs)
         else:
             return HTTPForbidden()
     return wrapped
@@ -118,6 +118,7 @@
         user.save()
         return Response(self.json_serialise(user))
 
+    @privileged
     def show(self, req, id):
         """Called for GET requests to /users/{id}
 
@@ -128,10 +129,12 @@
         except riakalchemy.NoSuchObjectError:
             return HTTPNotFound()
 
+    @privileged
     def delete(self, req, id):
         """Called for DELETE requests to /users/{id}
 
         Delete the given user"""
+
         models.User.get(id).delete()
         return Response('')
 
@@ -157,6 +160,12 @@
         Creates the service, returns a JSON object with the ID assigned
         to the service"""
         data = json.loads(req.body)
+
+        data['user'] = [req.environ['surveilr.user']]
+
+        if 'plugins' not in data or not data['plugins']:
+            data['plugins'] = []
+
         service = models.Service(**data)
         service.save()
         return Response(self.json_serialise(service))
@@ -201,6 +210,7 @@
 
         Logs a measurement against the service identified by {id}.
         Returns an empty response"""
+
         data = json.loads(req.body)
         service = models.Service.get(service_name)
         data['service'] = [service]
@@ -247,6 +257,7 @@
 
         Using the Mapper object, it finds the relevant controller
         based on the URL and delegates the call to that."""
+
         results = self.map.routematch(environ=req.environ)
         if not results:
             return exc.HTTPNotFound()

=== modified file 'surveilr/tests/api/server/test_app.py'
--- surveilr/tests/api/server/test_app.py	2012-01-28 21:09:53 +0000
+++ surveilr/tests/api/server/test_app.py	2012-01-29 23:25:26 +0000
@@ -104,9 +104,11 @@
 
     def test_create_retrieve_service(self):
         """Create, retrieve, delete, attempt to retrieve again (service)"""
+        user = self._get_user()
         req = Request.blank('/services',
                             method='POST',
-                            POST=json.dumps({'name': 'this_or_the_other'}))
+                            POST=json.dumps({'name': 'this_or_the_other'}),
+                            environ={'surveilr.user': user})
         resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
@@ -124,11 +126,19 @@
         resp = self.application(req)
         self.assertEquals(resp.status_int, 404)
 
+    def _get_user(self):
+        user = models.User()
+        user.save()
+        self.addCleanup(user.delete)
+        return user
+
     def test_add_remove_plugin_to_service(self):
+        user = self._get_user()
         url = 'http://foo.bar/'
         req = Request.blank('/services',
                             method='POST',
-                            POST=json.dumps({'name': 'this_or_the_other'}))
+                            POST=json.dumps({'name': 'this_or_the_other'}),
+                            environ={'surveilr.user': user})
         resp = self.application(req)
         self.assertEquals(resp.status_int, 200)
 
@@ -158,9 +168,11 @@
         self.assertEquals(plugins, [])
 
     def test_create_retrieve_metric(self):
+        user = self._get_user()
         req = Request.blank('/services',
                             method='POST',
-                            POST='{"name": "this_or_the_other"}')
+                            POST='{"name": "this_or_the_other"}',
+                            environ={'surveilr.user': user})
         resp = self.application(req)
         self.assertEquals(resp.status_int, 200)