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

[James Tunnicliffe]

[Stevan Radaković (stevanr)]

Looks good.
Approve +1

review: Approve

=== modified file 'license_protected_downloads/tests/test_views.py'
--- license_protected_downloads/tests/test_views.py	2012-08-20 15:41:26 +0000
+++ license_protected_downloads/tests/test_views.py	2012-08-22 13:37:44 +0000
@@ -411,5 +411,39 @@
         # If a build-info file is invalid, we don't allow access
         self.assertEqual(response.status_code, 403)
 
+    def test_partial_build_info_file_open(self):
+        target_file = ("partial-license-settings/"
+                       "partially-complete-build-info/"
+                       "should_be_open.txt")
+        url = urlparse.urljoin("http://testserver/", target_file)
+        response = self.client.get(url, follow=True)
+
+        # If a build-info file specifies this file is open
+        self.assertEqual(response.status_code, 200)
+
+    def test_partial_build_info_file_protected(self):
+        target_file = ("partial-license-settings/"
+                       "partially-complete-build-info/"
+                       "should_be_protected.txt")
+        file_path = os.path.join(TESTSERVER_ROOT, target_file)
+        build_info = BuildInfo(file_path)
+
+        # Try to fetch file from server - we should be redirected
+        url = urlparse.urljoin("http://testserver/", target_file)
+        response = self.client.get(url, follow=True)
+        digest = hashlib.md5(build_info.get("license-text")).hexdigest()
+        self.assertRedirects(response, '/license?lic=%s&url=%s' %
+                                       (digest, target_file))
+
+    def test_partial_build_info_file_unspecified(self):
+        target_file = ("partial-license-settings/"
+                       "partially-complete-build-info/"
+                       "should_be_inaccessible.txt")
+        url = urlparse.urljoin("http://testserver/", target_file)
+        response = self.client.get(url, follow=True)
+
+        # If a build-info file has no information about this file
+        self.assertEqual(response.status_code, 403)
+
 if __name__ == '__main__':
     unittest.main()
 
=== added directory 'license_protected_downloads/tests/testserver_root/partial-license-settings'
=== added directory 'license_protected_downloads/tests/testserver_root/partial-license-settings/partially-complete-build-info'
=== added file 'license_protected_downloads/tests/testserver_root/partial-license-settings/partially-complete-build-info/BUILD-INFO.txt'
--- license_protected_downloads/tests/testserver_root/partial-license-settings/partially-complete-build-info/BUILD-INFO.txt	1970-01-01 00:00:00 +0000
+++ license_protected_downloads/tests/testserver_root/partial-license-settings/partially-complete-build-info/BUILD-INFO.txt	2012-08-22 13:37:44 +0000
@@ -0,0 +1,13 @@
+Format-Version: 0.1
+
+Files-Pattern: *protected*
+Build-Name: landing-multi-license
+Theme: samsung
+License-Type: protected
+License-Text: <p>IMPORTANT — PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.</p>
+ <p>
+ </p>
+
+Files-Pattern: *open*
+Build-Name: false-positive
+License-Type: open
 
=== added file 'license_protected_downloads/tests/testserver_root/partial-license-settings/partially-complete-build-info/should_be_inaccessible.txt'
=== added file 'license_protected_downloads/tests/testserver_root/partial-license-settings/partially-complete-build-info/should_be_open.txt'
=== added file 'license_protected_downloads/tests/testserver_root/partial-license-settings/partially-complete-build-info/should_be_protected.txt'
=== modified file 'license_protected_downloads/views.py'
--- license_protected_downloads/views.py	2012-08-20 15:41:26 +0000
+++ license_protected_downloads/views.py	2012-08-22 13:37:44 +0000
@@ -177,7 +177,11 @@
 
     digests = []
 
-    if license_type and license_type != "open":
+    if license_type:
+        if license_type == "open":
+            return "OPEN"
+
+        # File matches a license, isn't open.
         if openid_teams:
             return "OPEN"
         elif license_text:
@@ -189,9 +193,11 @@
                 digests.append(digest)
                 _insert_license_into_db(digest, license_text, theme)
         else:
-            return None
+            # No license text - file as inaccessible.
+            return []
     else:
-        return "OPEN"
+        # No license found - file is inaccessible.
+        return []
 
     return digests
 
 
=== added directory 'sampleroot/partial-license-settings'
=== added directory 'sampleroot/partial-license-settings/partially-complete-build-info'
=== added file 'sampleroot/partial-license-settings/partially-complete-build-info/BUILD-INFO.txt'
--- sampleroot/partial-license-settings/partially-complete-build-info/BUILD-INFO.txt	1970-01-01 00:00:00 +0000
+++ sampleroot/partial-license-settings/partially-complete-build-info/BUILD-INFO.txt	2012-08-22 13:37:44 +0000
@@ -0,0 +1,13 @@
+Format-Version: 0.1
+
+Files-Pattern: *protected*
+Build-Name: landing-multi-license
+Theme: samsung
+License-Type: protected
+License-Text: <p>IMPORTANT — PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.</p>
+ <p>
+ </p>
+
+Files-Pattern: *open*
+Build-Name: false-positive
+License-Type: open
 
=== added file 'sampleroot/partial-license-settings/partially-complete-build-info/should_be_inaccessible.txt'
=== added file 'sampleroot/partial-license-settings/partially-complete-build-info/should_be_open.txt'
=== added file 'sampleroot/partial-license-settings/partially-complete-build-info/should_be_protected.txt'