Merge lp:~gesha/linaro-license-protection/openid-workaround into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

This branch adds whitelisting support to workaround issue with django access to apache-openid protected files.
Should be removed after we get full support of build-info and drop apache-openid protection.

[lp:~gesha/linaro-license-protection/openid-workaround]

124. By Georgy Redkozubov on 2012-08-28

Added missing test dirs and files.

[James Tunnicliffe (dooferlad)]

Looks great.

[James Tunnicliffe (dooferlad)]

Oops. Forgot the approve button!

review: Approve

=== modified file 'license_protected_downloads/config.py'
--- license_protected_downloads/config.py	2012-07-24 11:51:25 +0000
+++ license_protected_downloads/config.py	2012-08-28 17:21:19 +0000
@@ -5,3 +5,14 @@
     '50.17.250.69',  # android-build.linaro.org
     '82.69.11.23',  # validation.linaro.org
 )
+
+WHITELIST = (
+    '/hwpacks',
+    '/precise/restricted',
+    '/hwpacks/freescale',
+    '/hwpacks/samsung',
+    '/hwpacks/ste',
+    '/hwpacks/ti',
+    '/hwpacks/arm',
+    '/android/~linaro-android-restricted',
+)

=== modified file 'license_protected_downloads/tests/test_views.py'
--- license_protected_downloads/tests/test_views.py	2012-08-27 10:02:15 +0000
+++ license_protected_downloads/tests/test_views.py	2012-08-28 17:21:19 +0000
@@ -13,6 +13,7 @@
 from license_protected_downloads.views import _sizeof_fmt
 from license_protected_downloads.config import INTERNAL_HOSTS
 
+
 THIS_DIRECTORY = os.path.dirname(os.path.abspath(__file__))
 TESTSERVER_ROOT = os.path.join(THIS_DIRECTORY, "testserver_root")
 
@@ -487,6 +488,16 @@
         self.assertEqual(_sizeof_fmt(1234567899), '1.1G')
         self.assertEqual(_sizeof_fmt(1234567899999), '1.1T')
 
+    def test_whitelisted_dirs(self):
+        target_file = "precise/restricted/whitelisted.txt"
+        url = urlparse.urljoin("http://testserver/", target_file)
+        response = self.client.get(url, follow=True)
+
+        # If we have access to the file, we will get an X-Sendfile response
+        self.assertEqual(response.status_code, 200)
+        file_path = os.path.join(TESTSERVER_ROOT, target_file)
+        self.assertEqual(response['X-Sendfile'], file_path)
+
 
 if __name__ == '__main__':
     unittest.main()

=== added directory 'license_protected_downloads/tests/testserver_root/precise'
=== added directory 'license_protected_downloads/tests/testserver_root/precise/restricted'
=== added file 'license_protected_downloads/tests/testserver_root/precise/restricted/whitelisted.txt'
--- license_protected_downloads/tests/testserver_root/precise/restricted/whitelisted.txt	1970-01-01 00:00:00 +0000
+++ license_protected_downloads/tests/testserver_root/precise/restricted/whitelisted.txt	2012-08-28 17:21:19 +0000
@@ -0,0 +1,1 @@
+This file is under whitelisted dir
\ No newline at end of file

=== modified file 'license_protected_downloads/views.py'
--- license_protected_downloads/views.py	2012-08-27 10:56:15 +0000
+++ license_protected_downloads/views.py	2012-08-28 17:21:19 +0000
@@ -3,7 +3,6 @@
 import mimetypes
 import os
 import re
-import time
 from mimetypes import guess_type
 from datetime import datetime
 
@@ -296,6 +295,17 @@
     return found
 
 
+def is_whitelisted(url):
+    """ Check if requested file is under whitelisted path.
+    """
+    found = False
+    for path in config.WHITELIST:
+        if re.search(r'^%s' % path, url):
+            found = True
+
+    return found
+
+
 def file_server(request, path):
     """Serve up a file / directory listing or license page as required"""
     url = path
@@ -351,7 +361,8 @@
         raise Http404
 
     response = None
-    if get_client_ip(request) in config.INTERNAL_HOSTS:
+    if get_client_ip(request) in config.INTERNAL_HOSTS or\
+       is_whitelisted(os.path.join('/', url)):
         digests = 'OPEN'
     else:
         digests = is_protected(path)

=== added directory 'sampleroot/precise'
=== added directory 'sampleroot/precise/restricted'
=== added file 'sampleroot/precise/restricted/whitelisted.txt'
--- sampleroot/precise/restricted/whitelisted.txt	1970-01-01 00:00:00 +0000
+++ sampleroot/precise/restricted/whitelisted.txt	2012-08-28 17:21:19 +0000
@@ -0,0 +1,1 @@
+This file is under whitelisted dir
\ No newline at end of file