Merge lp:~gesha/linaro-license-protection/eula-style-openid-support into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

This branch adds missed OpenID handling.
OpenID is handled as initially, simple redirected to OpenID login page. Complete support will be added by separate BP https://blueprints.launchpad.net/linaro-license-protection/+spec/license-protection-openid-support

[James Tunnicliffe (dooferlad)]

Looks good.

review: Approve

=== modified file 'android/build-info/BUILD-INFO.txt'
--- android/build-info/BUILD-INFO.txt	2012-06-11 10:44:16 +0000
+++ android/build-info/BUILD-INFO.txt	2012-06-18 13:02:19 +0000
@@ -36,3 +36,7 @@
 Build-Name: landing-panda
 License-Type: open
 
+Files-Pattern: *openid*
+Build-Name: landing-protected
+License-Type: protected
+OpenID-Launchpad-Teams: linaro
 
=== added file 'android/build-info/openid.txt'
--- android/build-info/openid.txt	1970-01-01 00:00:00 +0000
+++ android/build-info/openid.txt	2012-06-18 13:02:19 +0000
@@ -0,0 +1,1 @@
+This is protected with OpenID.
 \ No newline at end of file
 
=== modified file 'licenses/license.php'
--- licenses/license.php	2012-06-11 10:44:16 +0000
+++ licenses/license.php	2012-06-18 13:02:19 +0000
@@ -34,6 +34,7 @@
     $theme = $bi->get("Theme");
     $lic_type = $bi->get("License-Type");
     $lic_text = $bi->get("License-Text");
+    $openid = $bi->get("OpenID-Launchpad-Teams");
 } else {
     $flist = LicenseHelper::getFilesList($search_dir);
     if (!empty($name_only)) {
@@ -46,6 +47,8 @@
     if ($bi_found) {
         if ($lic_type == 'open')
             LicenseHelper::redirect_with_status($down, $domain, 200);
+        elseif (($openid != false) and ($lic_type == 'protected'))
+            LicenseHelper::redirect_with_status($down, $domain, 200);
         elseif (($theme != false) or ($lic_text != false))
             $template_content = file_get_contents($doc."/licenses/".$theme.".html");
         else
 
=== modified file 'tests/test_click_through_license.py'
--- tests/test_click_through_license.py	2012-05-28 09:38:39 +0000
+++ tests/test_click_through_license.py	2012-06-18 13:02:19 +0000
@@ -39,6 +39,7 @@
 build_info_samsung_test_file = '/android/build-info/origen-blob.txt'
 build_info_ste_test_file = '/android/build-info/snowball-blob.txt'
 build_info_not_protected_test_file = '/android/build-info/panda-open.txt'
+build_info_openid_test_file = '/android/build-info/openid.txt'
 
 
 class Contains(object):
@@ -320,3 +321,10 @@
         if os.path.exists("%s/cookies.txt" % docroot):
             os.rename("%s/cookies.txt" % docroot, "%s/cookies.ste" % docroot)
         self.assertThat(testfile, Contains(search))
+
+    def test_build_info_openid_protection(self):
+        search = "This is protected with OpenID."
+        testfile = fetcher.get(host + build_info_openid_test_file)
+        fetcher.close()
+        self.assertThat(testfile, Contains(search))
+