Merge lp:~dooferlad/linaro-license-protection/fix_double_slash_in_links into lp:~linaro-automation/linaro-license-protection/trunk

[James Tunnicliffe]

[Stevan Radaković (stevanr)]

You have a copy-paste leftover comment in the test :)
Approving anyway, you can go on with merging when you update/remove the comment.

review: Approve

=== modified file 'license_protected_downloads/tests/test_views.py'
--- license_protected_downloads/tests/test_views.py	2012-08-22 14:41:55 +0000
+++ license_protected_downloads/tests/test_views.py	2012-08-22 17:38:31 +0000
@@ -463,6 +463,14 @@
         # If a build-info file has no information about this file
         self.assertEqual(response.status_code, 403)
 
+    def test_listings_do_not_contain_double_slash_in_link(self):
+        target_file = 'images/'
+        url = urlparse.urljoin("http://testserver/", target_file)
+        response = self.client.get(url, follow=True)
+
+        # the directory open contains .hidden.txt - we shouldn't be able to
+        # see it in the listing.
+        self.assertNotContains(response, "//origen-blob.txt")
 
 if __name__ == '__main__':
     unittest.main()

=== modified file 'license_protected_downloads/views.py'
--- license_protected_downloads/views.py	2012-08-22 14:41:55 +0000
+++ license_protected_downloads/views.py	2012-08-22 17:38:31 +0000
@@ -67,6 +67,10 @@
         if not re.search(r'^/', url) and url != '':
             url = '/' + url
 
+        # Since the code below assume no trailing slash, make sure that
+        # there isn't one.
+        url = re.sub(r'/$', '', url)
+
         pathname = os.path.join(path, name)
         license_digest_list = is_protected(pathname)
         license_list = License.objects.all_with_hashes(license_digest_list)
@@ -267,6 +271,7 @@
 
 
 def file_server(request, path):
+    """Serve up a file / directory listing or license page as required"""
     url = path
     result = test_path(path)
     if not result: