Merge lp:~gesha/linaro-license-protection/build-info-support into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

This branch adds support for BUILD-INFO.txt license protection.
BUILD-INFO.txt describes files to be protected, the license type, it contains license text. For the first step Version info, Build name, OpenID protection and User info collection are not used.
If the BUILD-INFO.txt is absent then previous EULA/OPEN-EULA protection is used.

[lp:~gesha/linaro-license-protection/build-info-support]

85. By Georgy Redkozubov on 2012-05-28

Added missing files

86. By Georgy Redkozubov on 2012-05-28

[merge] Fix php unit wrong error message when tests are failing.

[Stevan Radaković (stevanr)]

Nice work gesha.
I have one general proposal: The license text should be extracted from
the build info file and put in the separate file in the same directory
as the build info file.

Few comments on the code also:

>
> @@ -102,4 +102,5 @@
> RewriteCond %{REQUEST_URI} !^/licenses/.*$
> RewriteCond %{ENV:LP_DOWNLOAD_DIR}/EULA.txt !-f
> RewriteCond %{ENV:LP_DOWNLOAD_DIR}/OPEN-EULA.txt !-f
> +RewriteCond %{ENV:LP_DOWNLOAD_DIR}/BUILD-INFO.txt !-f
> RewriteRule .* - [R=403,L]

A comment above this block should be updated to match the new Build info
change.

> === added file 'licenses/BuildInfo.php'
> --- licenses/BuildInfo.php 1970-01-01 00:00:00 +0000
> +++ licenses/BuildInfo.php 2012-05-28 09:45:23 +0000
> @@ -0,0 +1,151 @@
> +<?php
> +
> +class BuildInfo
> +{
> + private $text_array = array();
> + private $fields_defined = array("Format-Version", "Files-Pattern",
> + "Build-Name", "Theme", "License-Type", "OpenID-Launchpad-Teams",
> + "Collect-User-Data", "License-Text");
> + private $multiline_vars = array("License-Text");
> + private $search_path = '';
> +

I like using __construct method and do all the class attribute setup in
there, that way is more readable.
Also, since your build file is something always unique to the build info
instance, you can make it an attribute of the class, and then just
assign it during class initialization. Something like:

$bi = BuildInfo("build_info.txt");
$bi->readFile();
...

> + public function readFile($fn)
> + {
> + $this->search_path = dirname($fn);
> + $field = '';
> + $fp_read = 0;
> + if (is_dir($fn) or !is_file($fn) or filesize($fn) == 0) return false; is
> + $file = fopen($fn, "r") or exit("Unable to open file $fn!");

There are exceptions in PHP as well, I started using them in the project
so I think it should be good idea that we stick with that.

> + // Get the 'Format-Version' field.
> + $line = fgets($file);
> + $fields = explode(":", $line, "2");
This is good, you ensure that second and any other ":" char is ignored.

...
> + // Get the rest fileds.
> + while(!feof($file)) {
> + if ($fp_read) {
> + print_r($fields);
Is this some leftover debugging? Please remove.

> + $this->text_array[$fields[0]] = trim($fields[1]);
> + $fp_read = 0;
> + }
> + $line = fgets($file);
> + if (trim($line) == "")
> + continue;
> + $fields = explode(":", $line, "2");
> + if ($fields[0] == "Files-Pattern") {
> + $tmp_arr = array();
> + $fp = trim($fields[1]);
> + while(!feof($file)) {
> + $line = fgets($file);
> + if (trim($line) == "")
> + continue;
> + $fields = explode(":", $line, "2");
> + if (in_array($fields[0], $this->multiline_vars)) {
> + $field = $fields[0];
> + if (isset($fields[1]))
> + $tmp_arr[$fields[0]] = trim($fields[1]);
> + while...

[lp:~gesha/linaro-license-protection/build-info-support]

87. By Georgy Redkozubov on 2012-05-29

Fixed 'Files-Pattern' with multiple patterns

88. By Georgy Redkozubov on 2012-05-30

Added cunstructor and updated code to take into account it

89. By Georgy Redkozubov on 2012-05-30

Merged PHP unit tests into single test class

90. By Georgy Redkozubov on 2012-05-30

Added comments to code

91. By Georgy Redkozubov on 2012-05-30

Added tests for testing contents of BUILD-INFO array

92. By Georgy Redkozubov on 2012-05-30

Fixed indentation

[Georgy Redkozubov (gesha)]

> Nice work gesha.
> I have one general proposal: The license text should be extracted from
> the build info file and put in the separate file in the same directory
> as the build info file.

We've agreed to have a license text inside of the BUILD-INFO.txt when made discussed the format of that file.

>
> Few comments on the code also:
>
> > + public function readFile($fn)
> > + {
> > + $this->search_path = dirname($fn);
> > + $field = '';
> > + $fp_read = 0;
> > + if (is_dir($fn) or !is_file($fn) or filesize($fn) == 0) return
> false; is
> > + $file = fopen($fn, "r") or exit("Unable to open file $fn!");
>
> There are exceptions in PHP as well, I started using them in the project
> so I think it should be good idea that we stick with that.

Actually it is usual to open files such way. There is no suitable exception for that.

> > + $this->text_array[$fields[0]] = trim($fields[1]);
> > + $fp_read = 0;
> > + }
> > + $line = fgets($file);
> > + if (trim($line) == "")
> > + continue;
> > + $fields = explode(":", $line, "2");
> > + if ($fields[0] == "Files-Pattern") {
> > + $tmp_arr = array();
> > + $fp = trim($fields[1]);
> > + while(!feof($file)) {
> > + $line = fgets($file);
> > + if (trim($line) == "")
> > + continue;
> > + $fields = explode(":", $line, "2");
> > + if (in_array($fields[0], $this->multiline_vars)) {
> > + $field = $fields[0];
> > + if (isset($fields[1]))
> > + $tmp_arr[$fields[0]] = trim($fields[1]);
> > + while(!feof($file)) {
> > + $line = fgets($file);
> > + if (trim($line) == "")
> > + continue;
> > + $fields = explode(":", $line, "2");
> > + if(in_array($fields[0], $this->fields_defined))
> {
> > + if ($fields[0] == "Files-Pattern") {
> > + fseek($file, -(strlen($line)),
> SEEK_CUR);
> > + break 2;
> > + }
> > + break;
> > + }
> > + $tmp_arr[$field] = $tmp_arr[$field].
> > + "\n".rtrim($line);
> > + }
> > +
> > + }
> > + if (isset($fields[1])) {
> > + $tmp_arr[$fields[0]] = trim($fields[1]);
> > + }
> > + }
> > + $this->text_array[$fp] = $tmp_arr;
> > + unset($tmp_arr);
> > + }
> > + }
> > + fclose($file);
> > +
> > + return true;
> > + }
> > +
>
> First, the code above is not commented at all and was very hard to read.
> I think this will change anyway if you apply the license text ext...

[Georgy Redkozubov (gesha)]

Refactored BUILD-INFO.txt parsing.
Updated tests.

[lp:~gesha/linaro-license-protection/build-info-support]

93. By Georgy Redkozubov on 2012-05-31

[merge] Danilos TDD intro

94. By Georgy Redkozubov on 2012-06-05

Refactored parsing BUILD-INFO.txt

[Stevan Radaković (stevanr)]

Hi gesha,

Your additions look great!

Few small pointers tho:

92 === added file 'licenses/BuildInfo.php'
93 --- licenses/BuildInfo.php 1970-01-01 00:00:00 +0000
94 +++ licenses/BuildInfo.php 2012-06-05 14:32:19 +0000
95 @@ -0,0 +1,207 @@
96 +<?php
97 +
98 +class BuildInfo
99 +{
100 + private $text_array = array();
101 + private $fields_defined = array("Format-Version", "Files-Pattern",
102 + "Build-Name", "Theme", "License-Type", "OpenID-Launchpad-Teams",
103 + "Collect-User-Data", "License-Text");
104 + private $multiline_vars = array("License-Text");
105 + private $search_path = '';
106 + private $fname = '';

I would really like to see all the initialization inside the __construct class.
Furthermore, empty strings need not be initialized. "private $fname;" is enough.

There are very small amount of comments in the BuildInfo.php file.
Fields like text_array are very non-descriptive, we should rename those as well.

132 + private function getInfoForFile($fname)
133 + {
134 + /**
135 + * Get array of fields for corresponding file
136 + */
137 + foreach (array_keys($this->text_array) as $key)
138 + if ($key != 'Format-Version') {
139 + $files = glob($this->search_path."/".$key);
140 + foreach ($files as $file)
141 + if ($file == $this->search_path."/".$fname)
142 + return $this->text_array[$key];
143 + }
144 + return array();
145 + }

We can avoid this whole mumbo by putting $fname as the attribute of the class and then only hold the relevant build info data for that file in text_array attribute. That's all we need for each HTTP request anyway.

165 + public function getTheme($fname)
166 + {
167 + $info = $this->getInfoForFile($fname);
168 + if (array_key_exists('Theme', $info))
169 + return $info["Theme"];
170 + else
171 + return false;
172 + }

All getFieldX methods should be united in one method.
I.e. public function get($fieldName) - (if we remove $fname as suggested above)
We'll get less code, less tests, and if we would need to implement new fields, we wouldn't need to add separate method and additional tests.

801 === modified file 'tests/test_click_through_license.py'
802 --- tests/test_click_through_license.py 2012-05-17 18:44:59 +0000
803 +++ tests/test_click_through_license.py 2012-06-05 14:32:19 +0000
804 @@ -36,6 +36,9 @@

Tests fail for these 3 new tests added..

review: Needs Fixing (code)

[lp:~gesha/linaro-license-protection/build-info-support]

95. By Georgy Redkozubov on 2012-06-11

Refactored 'getX' methods into single 'get' method. Updated code to use new approach.

[Georgy Redkozubov (gesha)]

Stevan, thanks for review. Your notes are good.

>
>
> I would really like to see all the initialization inside the __construct
> class.
> Furthermore, empty strings need not be initialized. "private $fname;" is
> enough.
>
> There are very small amount of comments in the BuildInfo.php file.
> Fields like text_array are very non-descriptive, we should rename those as
> well.

Moved inititalization to constructor.

>
> We can avoid this whole mumbo by putting $fname as the attribute of the class
> and then only hold the relevant build info data for that file in text_array
> attribute. That's all we need for each HTTP request anyway.

That's a good point.

>
>
> All getFieldX methods should be united in one method.
> I.e. public function get($fieldName) - (if we remove $fname as suggested
> above)
> We'll get less code, less tests, and if we would need to implement new fields,
> we wouldn't need to add separate method and additional tests.
>

I refactored code and did the reduction.

>
> 801 === modified file 'tests/test_click_through_license.py'
> 802 --- tests/test_click_through_license.py 2012-05-17 18:44:59 +0000
> 803 +++ tests/test_click_through_license.py 2012-06-05 14:32:19 +0000
> 804 @@ -36,6 +36,9 @@
>
> Tests fail for these 3 new tests added..

That was by the mistype. Fixed.

[Stevan Radaković (stevanr)]

Great work gesha. Approved.

> Stevan, thanks for review. Your notes are good.
>
> >
> >
> > I would really like to see all the initialization inside the __construct
> > class.
> > Furthermore, empty strings need not be initialized. "private $fname;" is
> > enough.
> >
> > There are very small amount of comments in the BuildInfo.php file.
> > Fields like text_array are very non-descriptive, we should rename those as
> > well.
>
> Moved inititalization to constructor.
>
> >
> > We can avoid this whole mumbo by putting $fname as the attribute of the
> class
> > and then only hold the relevant build info data for that file in text_array
> > attribute. That's all we need for each HTTP request anyway.
>
> That's a good point.
>
> >
> >
> > All getFieldX methods should be united in one method.
> > I.e. public function get($fieldName) - (if we remove $fname as suggested
> > above)
> > We'll get less code, less tests, and if we would need to implement new
> fields,
> > we wouldn't need to add separate method and additional tests.
> >
>
> I refactored code and did the reduction.
>
> >
> > 801 === modified file 'tests/test_click_through_license.py'
> > 802 --- tests/test_click_through_license.py 2012-05-17 18:44:59 +0000
> > 803 +++ tests/test_click_through_license.py 2012-06-05 14:32:19 +0000
> > 804 @@ -36,6 +36,9 @@
> >
> > Tests fail for these 3 new tests added..
>
> That was by the mistype. Fixed.

review: Approve

=== modified file '.htaccess'
--- .htaccess	2012-05-11 12:03:32 +0000
+++ .htaccess	2012-06-11 10:48:21 +0000
@@ -1,4 +1,4 @@
-IndexIgnore HEADER* licenses *EULA*
+IndexIgnore HEADER* licenses *EULA* BUILD-INFO.txt
 IndexOptions FancyIndexing HTMLTable
 
 RewriteEngine On
@@ -93,13 +93,14 @@
 RewriteCond %{HTTP_COOKIE} redirectlicensephp=404
 RewriteRule .* - [CO=redirectlicensephp:INVALID:.%{ENV:CO_DOMAIN}:-1,L]
 
-## Redirect to the Samsung license file protected builds.
+## Redirect to the license file protected builds.
 RewriteCond %{REQUEST_URI} !^/$ 
 RewriteRule .* /licenses/license.php [CO=downloadrequested:%{REQUEST_URI}:.%{ENV:CO_DOMAIN}:5:/,L,R]
 
-## Return "Permission denied" if no EULA/OPEN-EULA exists
+## Return "Permission denied" if no EULA/OPEN-EULA/BUILD-INFO exists
 RewriteCond %{REQUEST_URI} !^/$
 RewriteCond %{REQUEST_URI} !^/licenses/.*$
 RewriteCond %{ENV:LP_DOWNLOAD_DIR}/EULA.txt !-f
 RewriteCond %{ENV:LP_DOWNLOAD_DIR}/OPEN-EULA.txt !-f
+RewriteCond %{ENV:LP_DOWNLOAD_DIR}/BUILD-INFO.txt !-f
 RewriteRule .* - [R=403,L]

=== added directory 'android/build-info'
=== added file 'android/build-info/BUILD-INFO.txt'
--- android/build-info/BUILD-INFO.txt	1970-01-01 00:00:00 +0000
+++ android/build-info/BUILD-INFO.txt	2012-06-11 10:48:21 +0000
@@ -0,0 +1,38 @@
+Format-Version: 0.1
+
+Files-Pattern: *snowball*
+Build-Name: landing-snowball
+Theme: ste
+License-Type: protected
+License-Text: <p>IMPORTANT — PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.</p>
+ <p>
+  THIS IS A LEGALLY BINDING AGREEMENT BETWEEN YOU, an individual or a
+  legal entity, (“LICENSEE”) AND SAMSUNG ELECTRONICS CO.,
+  LTD. (“SAMSUNG”). BY CLICKING THE "ACCEPT" BUTTON, OR BY DOWNLOADING OR
+  INSTALLING OR OTHERWISE USING THE SOFTWARE, YOU AGREE TO BE BOUND BY THE
+  TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS OF THIS
+  AGREEMENT OR ARE NOT AUTHORISED TO ACCEPT AND AGREE TO THE TERMS OF THE
+  AGREEMENT ON BEHALF OF YOUR LEGAL ENTITY, DO NOT DOWNLOAD, INSTALL OR
+  OTHERWISE USE THE SOFTWARE.
+ </p>
+
+Files-Pattern: *origen*
+Build-Name: landing-origen
+Theme: samsung
+License-Type: protected 
+License-Text: <p>IMPORTANT — PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.</p>
+ <p>
+  THIS IS A LEGALLY BINDING AGREEMENT BETWEEN YOU, an individual or a
+  legal entity, (“LICENSEE”) AND SAMSUNG ELECTRONICS CO.,
+  LTD. (“SAMSUNG”). BY CLICKING THE "ACCEPT" BUTTON, OR BY DOWNLOADING OR
+  INSTALLING OR OTHERWISE USING THE SOFTWARE, YOU AGREE TO BE BOUND BY THE
+  TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS OF THIS
+  AGREEMENT OR ARE NOT AUTHORISED TO ACCEPT AND AGREE TO THE TERMS OF THE
+  AGREEMENT ON BEHALF OF YOUR LEGAL ENTITY, DO NOT DOWNLOAD, INSTALL OR
+  OTHERWISE USE THE SOFTWARE.
+ </p>
+
+Files-Pattern: *panda*
+Build-Name: landing-panda
+License-Type: open
+

=== added file 'android/build-info/origen-blob.txt'
--- android/build-info/origen-blob.txt	1970-01-01 00:00:00 +0000
+++ android/build-info/origen-blob.txt	2012-06-11 10:48:21 +0000
@@ -0,0 +1,1 @@
+This is protected with click-through Samsung license.
\ No newline at end of file

=== added file 'android/build-info/panda-open.txt'
--- android/build-info/panda-open.txt	1970-01-01 00:00:00 +0000
+++ android/build-info/panda-open.txt	2012-06-11 10:48:21 +0000
@@ -0,0 +1,1 @@
+This is always available.

=== added file 'android/build-info/snowball-blob.txt'
--- android/build-info/snowball-blob.txt	1970-01-01 00:00:00 +0000
+++ android/build-info/snowball-blob.txt	2012-06-11 10:48:21 +0000
@@ -0,0 +1,1 @@
+This is protected with click-through ST-E license.
\ No newline at end of file

=== added file 'licenses/BuildInfo.php'
--- licenses/BuildInfo.php	1970-01-01 00:00:00 +0000
+++ licenses/BuildInfo.php	2012-06-11 10:48:21 +0000
@@ -0,0 +1,168 @@
+<?php
+
+class BuildInfo
+{
+    private $build_info_array;
+    private $fields_defined;
+    private $multiline_vars;
+    private $search_path;
+    private $fname;
+    private $file_info_array;
+
+    public function __construct($fn)
+    {
+        $this->build_info_array = array();
+        $this->file_info_array = array();
+        $this->fields_defined = array("Format-Version", "Files-Pattern",
+            "Build-Name", "Theme", "License-Type", "OpenID-Launchpad-Teams",
+            "Collect-User-Data", "License-Text");
+        $this->multiline_vars = array("License-Text");
+        $this->search_path = dirname($fn);
+        $this->fname = basename($fn);
+        $this->build_info_file = $this->search_path."/BUILD-INFO.txt";
+        $data = $this->readFile();
+        if (is_array($data)) {
+            $this->build_info_array = $this->parseData($data);
+            $this->file_info_array = $this->getInfoForFile($this->fname);
+        }
+    }
+
+    public function readFile()
+    {
+        $data = array();
+        if (is_dir($this->build_info_file) or !is_file($this->build_info_file) or filesize($this->build_info_file) == 0) return false;
+        $file = fopen($this->build_info_file, "r") or exit("Unable to open file $this->build_info_file!");
+        while(!feof($file)) {
+            $line = fgets($file);
+            if (trim($line) == "")
+                continue;
+            $data[] = $line;
+        }
+        return $data;
+    }
+
+    private function getInfoForFile($fname)
+    {
+        /**
+         * Get array of fields for corresponding file
+         */
+        foreach (array_keys($this->build_info_array) as $key)
+            if ($key != 'Format-Version') {
+                $files = glob($this->search_path."/".$key);
+                foreach ($files as $file)
+                    if ($file == $this->search_path."/".$fname)
+                        return $this->build_info_array[$key];
+            }
+        return array();
+    }
+
+    public function getFormatVersion()
+    {
+        if (array_key_exists('Format-Version', $this->build_info_array))
+            return $this->build_info_array["Format-Version"];
+        else
+            return false;
+    }
+
+    // Get value of specified field for corresponding file
+    public function get($field)
+    {
+        if (array_key_exists($field, $this->file_info_array))
+            return $this->file_info_array[$field];
+        else
+            return false;
+    }
+
+    public function parseLine($line) {
+        $values = explode(":", $line, 2);
+        if ($values === false || count($values) != 2) {
+            throw new InvalidArgumentException("Line is not in the correct format.");
+        } else {
+            $field = trim($values[0]);
+            $value = trim($values[1]);
+            if (!$this->isValidField($field)) {
+                throw new InvalidArgumentException("Field '$field' not allowed.");
+            } else {
+                return array($field => $value);
+            }
+        }
+    }
+
+    public function isValidField($field_name) {
+        if (in_array($field_name, $this->fields_defined)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function parseContinuation($lines, &$line_no) {
+        $text = '';
+        $total_lines = count($lines);
+        while ($line_no < $total_lines &&
+            strlen($lines[$line_no]) > 0) {
+                if ($lines[$line_no][0] == ' ') {
+                    $text .= "\n" . substr($lines[$line_no], 1);
+                    $line_no++;
+                } else {
+                    break;
+                }
+            }
+        return $text;
+    }
+
+    /**
+     * `data` should be array of lines.
+     */
+    public function parseData($data) {
+        if (!is_array($data)) {
+            throw new InvalidArgumentException("No array provided.");
+        }
+        $format_line = array_shift($data);
+        $values = $this->parseLine($format_line);
+        if (!array_key_exists("Format-Version", $values)) {
+            throw new InvalidArgumentException("Data in incorrect format.");
+        }
+        $result = array("Format-Version" => $values["Format-Version"]);
+
+        $line_no = 0;
+        while ($line_no < count($data)) {
+            $line = $data[$line_no];
+            $values = $this->parseLine($line);
+            if (array_key_exists("Files-Pattern", $values)) {
+                $line_no++;
+                $block = $this->parseBlock($data, $line_no);
+                if (is_array($block)) {
+                    foreach (explode(",", $values["Files-Pattern"]) as $pattern) {
+                        $result[$pattern] = $block;
+                    }
+                }
+            }
+        }
+        return $result;
+    }
+
+    public function parseBlock($data, &$line_no) {
+        $result = array();
+
+        if (!is_array($data)) {
+            throw new InvalidArgumentException("No array provided.");
+        }
+        while ($line_no < count($data)) {
+            $line = $data[$line_no];
+            $values = $this->parseLine($line);
+            if (array_key_exists("License-Text", $values)) {
+                $text = $values["License-Text"];
+                $line_no++;
+                $text .= $this->parseContinuation($data, $line_no);
+                $result["License-Text"] = $text;
+            } elseif (array_key_exists("Files-Pattern", $values)) {
+                return $result;
+            } else {
+                $line_no++;
+                $result = array_merge($result, $values);
+            }
+        }
+        return $result;
+    }
+}

=== modified file 'licenses/license.php'
--- licenses/license.php	2012-05-11 08:23:42 +0000
+++ licenses/license.php	2012-06-11 10:48:21 +0000
@@ -1,6 +1,7 @@
 <?php
 
 require_once("LicenseHelper.php");
+require_once("BuildInfo.php");
 
 $down = $_COOKIE["downloadrequested"];
 $host = $_SERVER["HTTP_HOST"];
@@ -9,55 +10,78 @@
 $fn = $doc.$down; // Filename on server
 $flist = array();
 $eula = '';
+$bi_found = 0;
 
 if (preg_match("/.*openid.*/", $fn) or preg_match("/.*restricted.*/", $fn) or preg_match("/.*private.*/", $fn)) {
-	LicenseHelper::redirect_with_status($down, $domain, 200);
+    LicenseHelper::redirect_with_status($down, $domain, 200);
 }
 
 if (file_exists($fn) and LicenseHelper::checkFile($fn)) { // Requested download is file
-	$search_dir = dirname($fn);
-	$repl = dirname($down);
-	$name_only = array(basename($down), '');
+    $search_dir = dirname($fn);
+    $repl = dirname($down);
+    $name_only = array(basename($down), '');
 } elseif (is_dir($fn)) { // Requested download is directory
-	$search_dir = $fn;
-	$repl = $down;
-	$name_only = array();
+    $search_dir = $fn;
+    $repl = $down;
+    $name_only = array();
 } else { // Requested download not found on server
-	LicenseHelper::redirect_with_status($down, $domain, 404);
+    LicenseHelper::redirect_with_status($down, $domain, 404);
 }
 
-$flist = LicenseHelper::getFilesList($search_dir);
-
-if (!empty($name_only)) {
-	$pattern = "/^".$name_only[0]."\.EULA\.txt.*/";
-	$eula = LicenseHelper::findFileByPattern($flist, $pattern);
+if (file_exists($search_dir."/BUILD-INFO.txt")) {
+    $bi_found = 1;
+    $bi = new BuildInfo($search_dir."/".$name_only[0]);
+    $theme = $bi->get("Theme");
+    $lic_type = $bi->get("License-Type");
+    $lic_text = $bi->get("License-Text");
+} else {
+    $flist = LicenseHelper::getFilesList($search_dir);
+    if (!empty($name_only)) {
+        $pattern = "/^".$name_only[0]."\.EULA\.txt.*/";
+        $eula = LicenseHelper::findFileByPattern($flist, $pattern);
+    }
 }
 
 if (LicenseHelper::checkFile($fn)) {
-	if (LicenseHelper::checkFile($doc."/".$repl."/".$eula)) { // Special EULA found
-		$theme = LicenseHelper::getTheme($eula, $down);
-	} elseif (LicenseHelper::checkFile($doc."/".$repl."/EULA.txt")) { // No special EULA found
-		$theme = LicenseHelper::getTheme("EULA.txt", $down);
-	} elseif (LicenseHelper::findFileByPattern($flist, "/.*EULA.txt.*/")) {
-		// If file is requested but no special EULA for it and no EULA.txt is present,
-		// look for any EULA and if found decide that current file is not protected.
-		LicenseHelper::redirect_with_status($down, $domain, 200);
-	} else {
-		LicenseHelper::redirect_with_status($down, $domain, 403);
-	}
+    if ($bi_found) {
+        if ($lic_type == 'open')
+            LicenseHelper::redirect_with_status($down, $domain, 200);
+        elseif (($theme != false) or ($lic_text != false))
+            $template_content = file_get_contents($doc."/licenses/".$theme.".html");
+        else
+            LicenseHelper::redirect_with_status($down, $domain, 403);
+    } else {
+        if (LicenseHelper::checkFile($doc."/".$repl."/".$eula)) {
+            // Special EULA found
+            $theme = LicenseHelper::getTheme($eula, $down);
+        } elseif (LicenseHelper::checkFile($doc."/".$repl."/EULA.txt")) {
+            // No special EULA found
+            $theme = LicenseHelper::getTheme("EULA.txt", $down);
+        } elseif (LicenseHelper::findFileByPattern($flist, "/.*EULA.txt.*/")) {
+            // If file is requested but no special EULA for it and no EULA.txt
+            // is present, look for any EULA and if found decide that current
+            // file is not protected.
+            LicenseHelper::redirect_with_status($down, $domain, 200);
+        } else {
+            LicenseHelper::redirect_with_status($down, $domain, 403);
+        }
+        $template_content = file_get_contents($doc."/licenses/".$theme.".html");
+        $lic_text = file_get_contents($doc."/licenses/".$theme.".txt");
+    }
 } elseif (is_dir($fn)) {
-	if (empty($flist) or LicenseHelper::findFileByPattern($flist, "/.*EULA.txt.*/")) { // Directory contains only subdirs or any EULA
-		LicenseHelper::redirect_with_status($down, $domain, 200);
-	} else { // No special EULA, no EULA.txt, no OPEN-EULA.txt found
-		LicenseHelper::redirect_with_status($down, $domain, 403);
-	}
+    if (empty($flist)
+        or LicenseHelper::findFileByPattern($flist, "/.*EULA.txt.*/")
+        or $bi_found) {
+            // Directory contains only subdirs or any EULA or BUILD-INFO.txt
+            LicenseHelper::redirect_with_status($down, $domain, 200);
+        } else {
+            // No special EULA, no EULA.txt, no OPEN-EULA.txt found
+            LicenseHelper::redirect_with_status($down, $domain, 403);
+        }
 } else {
-	LicenseHelper::redirect_with_status($down, $domain, 403);
+    LicenseHelper::redirect_with_status($down, $domain, 403);
 }
 
-$template_content = file_get_contents($doc."/licenses/".$theme.".html");
-$eula_content = file_get_contents($doc."/licenses/".$theme.".txt");
-
-$out = str_replace("EULA.txt", $eula_content, $template_content);
+$out = str_replace("EULA.txt", $lic_text, $template_content);
 echo $out;
 ?>

=== added file 'tests/BUILD-INFO.txt'
--- tests/BUILD-INFO.txt	1970-01-01 00:00:00 +0000
+++ tests/BUILD-INFO.txt	2012-06-11 10:48:21 +0000
@@ -0,0 +1,18 @@
+Format-Version: 0.1
+Files-Pattern: *.txt
+Build-Name: landing-snowball
+Theme: stericsson
+License-Type: open
+OpenID-Launchpad-Teams: linaro,non-linaro
+Collect-User-Data: yes
+License-Text: <p>IMPORTANT — PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.</p>
+ <p>
+  THIS IS A LEGALLY BINDING AGREEMENT BETWEEN YOU, an individual or a
+  legal entity, (“LICENSEE”) AND SAMSUNG ELECTRONICS CO.,
+  LTD. (“SAMSUNG”). BY CLICKING THE "ACCEPT" BUTTON, OR BY DOWNLOADING OR
+  INSTALLING OR OTHERWISE USING THE SOFTWARE, YOU AGREE TO BE BOUND BY THE
+  TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS OF THIS
+  AGREEMENT OR ARE NOT AUTHORISED TO ACCEPT AND AGREE TO THE TERMS OF THE
+  AGREEMENT ON BEHALF OF YOUR LEGAL ENTITY, DO NOT DOWNLOAD, INSTALL OR
+  OTHERWISE USE THE SOFTWARE.
+ </p>

=== added file 'tests/BuildInfoTest.php'
--- tests/BuildInfoTest.php	1970-01-01 00:00:00 +0000
+++ tests/BuildInfoTest.php	2012-06-11 10:48:21 +0000
@@ -0,0 +1,244 @@
+<?php
+
+require_once("licenses/BuildInfo.php");
+
+class BuildInfoTest extends PHPUnit_Framework_TestCase
+{
+
+    private $temp_filename;
+    private $good_bi;
+    private $empty_bi;
+    private $fname;
+
+    public function setUp()
+    {
+        $this->good_bi = new BuildInfo("tests/BUILD-INFO.txt");
+        $this->temp_filename = tempnam(sys_get_temp_dir(), "build-info");
+        $this->empty_bi = new BuildInfo($this->temp_filename);
+        $this->fname = "BUILD-INFO.txt";
+    }
+
+    public function tearDown() {
+        if (file_exists($this->temp_filename)) {
+            unlink($this->temp_filename);
+        }
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function test_parseLine_fails() {
+        $line = "no separator";
+        $buildinfo = new BuildInfo("");
+        $buildinfo->parseLine($line);
+    }
+
+    public function test_parseLine_passes() {
+        $line = "Build-Name:value";
+        $buildinfo = new BuildInfo("");
+        $this->assertEquals(array("Build-Name" => "value"),
+                            $buildinfo->parseLine($line));
+    }
+
+    public function test_parseLine_trims() {
+        $line = "Build-Name: value";
+        $buildinfo = new BuildInfo("");
+        $this->assertEquals(array("Build-Name" => "value"),
+                            $buildinfo->parseLine($line));
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function test_parseLine_invalid_field() {
+        $line = "field: value";
+        $buildinfo = new BuildInfo("");
+        $this->assertEquals(array("field" => "value"),
+                            $buildinfo->parseLine($line));
+    }
+
+    public function test_isValidField_true() {
+        $buildinfo = new BuildInfo("");
+        $fields_allowed = array("Format-Version", "Files-Pattern",
+                                "Build-Name", "Theme", "License-Type", "OpenID-Launchpad-Teams",
+                                "Collect-User-Data", "License-Text");
+        foreach ($fields_allowed as $field) {
+            $this->assertTrue($buildinfo->isValidField($field));
+        }
+    }
+
+    public function test_isValidField_false() {
+        $buildinfo = new BuildInfo("");
+        $this->assertFalse($buildinfo->isValidField("Some random text"));
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function test_parseData_fails() {
+        $buildinfo = new BuildInfo("");
+        $buildinfo->parseData(array("Arbitrary text"));
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function test_parseData_array_expected() {
+        $buildinfo = new BuildInfo("");
+        $buildinfo->parseData("Arbitrary text");
+    }
+
+    public function test_parseData_format_version() {
+        $buildinfo = new BuildInfo("");
+        $values = $buildinfo->parseData(array("Format-Version: 2.0"));
+        $this->assertEquals(array("Format-Version" => "2.0"),
+                            $values);
+    }
+
+    public function test_parseData_extra_fields() {
+        $buildinfo = new BuildInfo("");
+        $values = $buildinfo->parseData(array(
+                                              "Format-Version: 2.0",
+                                              "Files-Pattern: *.txt",
+                                              "Build-Name: woohoo"));
+        $this->assertEquals(array("Format-Version" => "2.0",
+                                  "*.txt" => array("Build-Name" => "woohoo")),
+                            $values);
+    }
+
+    public function test_parseBlock_license() {
+        $buildinfo = new BuildInfo("");
+        $lineno = 0;
+        $values = $buildinfo->parseBlock(array(
+                                              "Format-Version: 2.0",
+                                              "License-Text: line1",
+                                              " line2"), $lineno);
+        $this->assertEquals(array("Format-Version" => "2.0",
+                                  "License-Text" => "line1\nline2"),
+                            $values);
+    }
+
+    public function test_parseContinuation_no_continuation() {
+        $buildinfo = new BuildInfo("");
+        $lineno = 0;
+        $this->assertEquals(
+            "",
+            $buildinfo->parseContinuation(array("no-space"), $lineno));
+    }
+
+    public function test_parseContinuation_indexed() {
+        $buildinfo = new BuildInfo("");
+        $lineno = 0;
+        $this->assertEquals("",
+                            $buildinfo->parseContinuation(array("no-space", " space"), $lineno));
+    }
+
+    public function test_parseContinuation() {
+        $buildinfo = new BuildInfo("");
+        $lineno = 1;
+        $value = $buildinfo->parseContinuation(array("no-space", " line1", " line2"), $lineno);
+        $this->assertEquals("\nline1\nline2", $value);
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function test_parseData_no_format_version_fails() {
+        $buildinfo = new BuildInfo("");
+        $values = $buildinfo->parseData(array("Build-Name: blah"));
+    }
+
+   public function test_parseData_blocks() {
+        $buildinfo = new BuildInfo("");
+        $lineno = 0;
+        $values = $buildinfo->parseData(array("Format-Version: 2.0",
+                                              "Files-Pattern: *.txt",
+                                              "Build-Name: woohoo",
+                                              "Files-Pattern: *.tgz",
+                                              "Build-Name: weehee"));
+        $this->assertEquals(array("Format-Version" => "2.0",
+                                  "*.txt" => array("Build-Name" => "woohoo"),
+                                  "*.tgz" => array("Build-Name" => "weehee")),
+                            $values);
+   }
+ 
+    public function test_parseData_block_multiple_patterns() {
+        $buildinfo = new BuildInfo("");
+        $lineno = 0;
+        $values = $buildinfo->parseData(array("Format-Version: 2.0",
+                                              "Files-Pattern: *.txt,*.tgz",
+                                              "Build-Name: weehee"));
+        $this->assertEquals(array("Format-Version" => "2.0",
+                                  "*.txt" => array("Build-Name" => "weehee"),
+                                  "*.tgz" => array("Build-Name" => "weehee")),
+                            $values);
+    }
+ 
+   
+    /**
+     * Running readFile on a directory returns false.
+     */
+    public function test_readFile_nonFile()
+    {
+        $bi = new BuildInfo(dirname(__FILE__));
+        $this->assertFalse($bi->readFile());
+    }
+
+    /**
+     * Running readFile on a nonexistent file returns false.
+     */
+    public function test_readFile_nonexistentFile()
+    {
+        $bi = new BuildInfo("nonexistent.file");
+        $this->assertFalse($bi->readFile());
+    }
+
+    /**
+     * Running readFile on a regular file returns array of strings.
+     */
+    public function test_readFile_file()
+    {
+        $bi = new BuildInfo("tests/BUILD-INFO.txt");
+        $this->assertInternalType('array', $bi->readFile());
+    }
+
+    /**
+     * Running 'get' functions on an empty fields returns false.
+     */
+    public function test_getFormatVersion_empty()
+    {
+        $this->assertFalse($this->empty_bi->getFormatVersion());
+    }
+
+    /**
+     * Running 'get' functions on non-empty fields returns string value.
+     */
+    public function test_getFormatVersion_type()
+    {
+        $this->assertInternalType(
+            'string', $this->good_bi->getFormatVersion());
+    }
+
+    public function test_getFormatVersion()
+    {
+        $this->assertEquals('0.1', $this->good_bi->getFormatVersion());
+    }
+
+    public function test_getBuildName_empty()
+    {
+        $this->assertFalse($this->empty_bi->get("Build-Name"));
+    }
+
+    public function test_getBuildName_type()
+    {
+        $this->assertInternalType(
+            'string', $this->good_bi->get("Build-Name"));
+    }
+
+    public function test_getBuildName()
+    {
+        $this->assertEquals(
+            'landing-snowball', $this->good_bi->get("Build-Name"));
+    }
+}
+?>

=== modified file 'tests/LicenseHelperTest.php'
--- tests/LicenseHelperTest.php	2012-05-29 07:30:45 +0000
+++ tests/LicenseHelperTest.php	2012-06-11 10:48:21 +0000
@@ -174,4 +174,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>

=== modified file 'tests/test_click_through_license.py'
--- tests/test_click_through_license.py	2012-05-17 18:44:59 +0000
+++ tests/test_click_through_license.py	2012-06-11 10:48:21 +0000
@@ -36,6 +36,9 @@
 per_file_ste_test_file = '/android/images/snowball-blob.txt'
 per_file_not_protected_test_file = '/android/images/MANIFEST'
 dirs_only_dir = '/android/~linaro-android/'
+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'
 
 
 class Contains(object):
@@ -295,3 +298,25 @@
         search = "Not Found"
         testfile = fetcher.get(host + not_found_test_file)
         self.assertThat(testfile, Contains(search))
+
+    def test_build_info_non_protected_file(self):
+        search = "This is always available."
+        testfile = fetcher.get(host + build_info_not_protected_test_file)
+        self.assertThat(testfile, Contains(search))
+
+    def test_build_info_accept_license_samsung_file(self):
+        search = "This is protected with click-through Samsung license."
+        testfile = fetcher.get(host + build_info_samsung_test_file)
+        fetcher.close()
+        if os.path.exists("%s/cookies.txt" % docroot):
+            os.rename("%s/cookies.txt" % docroot,
+                    "%s/cookies.samsung" % docroot)
+        self.assertThat(testfile, Contains(search))
+
+    def test_build_info_accept_license_ste_file(self):
+        search = "This is protected with click-through ST-E license."
+        testfile = fetcher.get(host + build_info_ste_test_file)
+        fetcher.close()
+        if os.path.exists("%s/cookies.txt" % docroot):
+            os.rename("%s/cookies.txt" % docroot, "%s/cookies.ste" % docroot)
+        self.assertThat(testfile, Contains(search))

=== modified file 'tests/test_php_unit.py'
--- tests/test_php_unit.py	2012-05-28 09:35:50 +0000
+++ tests/test_php_unit.py	2012-06-11 10:48:21 +0000
@@ -17,7 +17,7 @@
         super(PhpUnitTest, self).setUp()
         self.xml_path = tempfile.mkstemp()[1]
         returncode = subprocess.Popen(['phpunit', '--log-junit',
-                          self.xml_path, 'tests/LicenseHelperTest'],
+                          self.xml_path, 'tests'],
                           stdout=open('/dev/null', 'w'),
                           stderr=subprocess.STDOUT).wait()
         if returncode == -1: