Merge lp:~bac/charmworld/bug-1208035 into lp:~juju-jitsu/charmworld/trunk

[Brad Crittenden]

Return a 404 if no path information is passed to API URL for charm or bundle.

If the API URL for a charm or bundle is hit with no path information the handler was throwing an error as the path was non-optional, e.g.

http://staging.jujucharms.com/api/2/bundle
or
http://staging.jujucharms.com/api/2/charm

This branch allows the path to be empty but returns a 404 instead.

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'charmworld/views/api.py'
--- charmworld/views/api.py	2013-08-02 16:50:53 +0000
+++ charmworld/views/api.py	2013-08-06 20:57:27 +0000
@@ -324,8 +324,10 @@
                 charm = None
         return charm_id, trailing, charm
 
-    def charm(self, path):
+    def charm(self, path=None):
         """Retrieve a charm according to its charm_id."""
+        if path is None:
+            raise HTTPNotFound(self.request.path)
         charm_id, trailing, charm_data = self._find_charm(path)
         if charm_data is None:
             return json_response(
@@ -344,8 +346,10 @@
         else:
             raise HTTPNotFound(self.request.path)
 
-    def bundle(self, path):
+    def bundle(self, path=None):
         """Retrieve a bundle based on id."""
+        if path is None:
+            raise HTTPNotFound(self.request.path)
         fullpath = '/'.join(path)
         if len(path) == 3:
             # We have an owner.

=== modified file 'charmworld/views/tests/test_api.py'
--- charmworld/views/tests/test_api.py	2013-08-01 13:05:57 +0000
+++ charmworld/views/tests/test_api.py	2013-08-06 20:57:27 +0000
@@ -669,6 +669,10 @@
         response = self.get_response('bundle', 'foo/bar')
         self.assertEqual(404, response.status_code)
 
+    def test_no_path(self):
+        with self.assertRaises(HTTPNotFound):
+            response = self.get_response('bundle', remainder=None)
+
     def test_valid_lookup_unpromulgated(self):
         self.makeBundle(name='bat', owner='bac', basket='byobu-4')
         response = self.get_response('bundle', '~bac/byobu-4/bat')
@@ -836,6 +840,9 @@
         self.assertEqual(404, response.status_code)
         self.assertEqual({'type': 'no_such_charm', 'charm_id': 'foo'},
                          response.json_body)
+    def test_no_path(self):
+        with self.assertRaises(HTTPNotFound):
+            response = self.get_response('charm', remainder=None)
 
     @staticmethod
     def get_id(charm):