Merge lp:~gesha/linaro-license-protection/improve-eula into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

This branch adds build-based EULA support. EULA/no-EULA handling is implemented by checking the presence of EULA.txt/OPEN-EULA.txt in build directory. If EULA.txt is present then the contents of EULA.txt is shown to the user prior letting him download protected artifacts. If OPEN-EULA.txt is found it means that user doesn't need to accept EULA and proceeds to download immediately. Otherwise "HTTP Error 403 Forbidden" is displayed.

[James Tunnicliffe (dooferlad)]

This looks fine and should work with the scripts that we have to automatically accept licenses.

review: Approve

=== modified file '.htaccess'
--- .htaccess	2012-01-13 16:33:03 +0000
+++ .htaccess	2012-04-02 10:19:19 +0000
@@ -1,8 +1,14 @@
-IndexIgnore HEADER* licenses
+IndexIgnore HEADER* licenses *EULA*
 IndexOptions FancyIndexing HTMLTable
 
 RewriteEngine On
 
+## LP_DOWNLOAD_DIR is set to the dir from REQUEST_URI
+## or to the dir containig file form REQUEST_URI
+RewriteCond %{REQUEST_FILENAME} !.*/licenses/.*
+RewriteCond %{REQUEST_FILENAME} (.*\/)(.*)$
+RewriteRule (.*\/)(.*) - [E=LP_DOWNLOAD_DIR:%1]
+
 ## CO_DOMAIN is set to host name or host address
 ## without port number for use in cookie domain
 RewriteCond %{SERVER_PORT} !^80$
@@ -22,64 +28,84 @@
 
 ## If license file is requested, and a download has been requested previously,
 ## pass through to the license file.
-# Samsung.
-RewriteCond %{REQUEST_URI} /licenses/samsung-v2.html$
-RewriteCond %{HTTP_COOKIE} downloadrequested
-RewriteCond %{HTTP_COOKIE} !samsunglicenseaccepted-v1=true
-RewriteRule .* - [L]
-# ST-E.
-RewriteCond %{REQUEST_URI} /licenses/ste.html$
-RewriteCond %{HTTP_COOKIE} downloadrequested
-RewriteCond %{HTTP_COOKIE} !stelicenseaccepted-v1=true
+RewriteCond %{REQUEST_URI} /licenses/ste.html$ [OR]
+RewriteCond %{REQUEST_URI} /licenses/samsung.html$ [OR]
+RewriteCond %{REQUEST_URI} /licenses/linaro.html$ [OR]
+RewriteCond %{REQUEST_URI} /licenses/license.php$
+RewriteCond %{HTTP_COOKIE} downloadrequested
+RewriteCond %{HTTP_COOKIE} !licenseaccepted=true
 RewriteRule .* - [L]
 
 ## When license files are requested directly, forward to
 ## the snapshots.l.o site itself.
-RewriteCond %{REQUEST_URI} /licenses/samsung-v2.html$ [OR]
+RewriteCond %{REQUEST_URI} /licenses/linaro.html$ [OR]
+RewriteCond %{REQUEST_URI} /licenses/samsung.html$ [OR]
 RewriteCond %{REQUEST_URI} /licenses/ste.html$ [OR]
-RewriteCond %{REQUEST_URI} /licenses/nolicense.html$
+RewriteCond %{REQUEST_URI} /licenses/license.php$
 RewriteCond %{HTTP_COOKIE} !downloadrequested=(.*)
 RewriteRule .* / [R,L]
 
+## Exception for <iframe>
+RewriteCond %{REQUEST_URI} ^.*/EULA.txt$
+RewriteRule .* - [L]
+
 ## If there is a cookie indicating license has been accepted, pass through.
-# Samsung.
-RewriteCond %{HTTP_COOKIE} samsunglicenseaccepted-v1=true
-RewriteCond %{REQUEST_URI} ^/.*origen.*
-RewriteRule .* - [L]
-# ST-E.
-RewriteCond %{HTTP_COOKIE} stelicenseaccepted-v1=true
-RewriteCond %{REQUEST_URI} ^/.*snowball.*
+RewriteCond %{HTTP_COOKIE} licenseaccepted=true
 RewriteRule .* - [L]
 
 ## When license is accepted, set the cookie.
-# Samsung.
-RewriteCond %{REQUEST_URI} licenses/samsung-accepted.html$
-RewriteCond %{HTTP_COOKIE} downloadrequested=([^\;]*\/)([^/\;]*)
-RewriteRule .* %1%2 [CO=samsunglicenseaccepted-v1:true:.%{ENV:CO_DOMAIN}:5:%1,R,L]
-# ST-E.
-RewriteCond %{REQUEST_URI} licenses/ste-accepted.html$
-RewriteCond %{HTTP_COOKIE} downloadrequested=([^\;]*\/)([^/\;]*)
-RewriteRule .* %1%2 [CO=stelicenseaccepted-v1:true:.%{ENV:CO_DOMAIN}:60:%1,R,L]
+RewriteCond %{REQUEST_URI} licenses/.*-accepted.html$
+RewriteCond %{HTTP_COOKIE} downloadrequested=([^\;]*\/)([^/\;]*)
+RewriteRule .* %1%2 [CO=licenseaccepted:true:.%{ENV:CO_DOMAIN}:5:%1,R,L]
 
 ## When license is being declined, show the notice that you have to accept it.
-# Samsung.
-RewriteCond %{REQUEST_URI} licenses/samsung-declined.html$
-RewriteCond %{HTTP_COOKIE} downloadrequested=(.*)
-RewriteRule .* /licenses/nolicense.html [L]
-# ST-E.
-RewriteCond %{REQUEST_URI} licenses/ste-declined.html$
+RewriteCond %{REQUEST_URI} licenses/.*-declined.html$
 RewriteCond %{HTTP_COOKIE} downloadrequested=(.*)
 RewriteRule .* /licenses/nolicense.html [L]
 
 ## Pass through any non-protected dirs.
-RewriteCond %{REQUEST_URI} !^/.*origen.*
-RewriteCond %{REQUEST_URI} !^/.*snowball.*
-RewriteRule .* - [L]
-
-## Redirect to the license file protected builds.
-# Samsung.
-RewriteCond %{REQUEST_URI} ^/.*origen.*$
-RewriteRule .* /licenses/samsung-v2.html [CO=downloadrequested:%{REQUEST_URI}:.%{ENV:CO_DOMAIN},R,L]
-# ST-E.
-RewriteCond %{REQUEST_URI} ^/.*snowball.*
-RewriteRule .* /licenses/ste.html [CO=downloadrequested:%{REQUEST_URI}:.%{ENV:CO_DOMAIN},R,L]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteCond %{REQUEST_FILENAME}/OPEN-EULA.txt -f 
+RewriteRule .* - [L]
+
+RewriteCond %{REQUEST_FILENAME} -f
+RewriteCond %{ENV:LP_DOWNLOAD_DIR}/OPEN-EULA.txt -f 
+RewriteRule .* - [L]
+
+## Redirect to the Samsung license file protected builds.
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteCond %{REQUEST_FILENAME} .*origen.*
+RewriteCond %{REQUEST_FILENAME}/EULA.txt -f
+RewriteRule .* /licenses/license.php?samsung [CO=downloadrequested:%{REQUEST_URI}:.%{ENV:CO_DOMAIN},R,L]
+
+RewriteCond %{REQUEST_FILENAME} -f
+RewriteCond %{REQUEST_FILENAME} .*origen.* 
+RewriteCond %{ENV:LP_DOWNLOAD_DIR}/EULA.txt -f
+RewriteRule .* /licenses/license.php?samsung [CO=downloadrequested:%{REQUEST_URI}:.%{ENV:CO_DOMAIN},R,L]
+
+## Redirect to the ST-E license file protected builds.
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteCond %{REQUEST_FILENAME} .*snowball.* 
+RewriteCond %{REQUEST_FILENAME}/EULA.txt -f
+RewriteRule .* /licenses/license.php?ste [CO=downloadrequested:%{REQUEST_URI}:.%{ENV:CO_DOMAIN},R,L]
+
+RewriteCond %{REQUEST_FILENAME} -f
+RewriteCond %{REQUEST_FILENAME} .*snowball.* 
+RewriteCond %{ENV:LP_DOWNLOAD_DIR}/EULA.txt -f
+RewriteRule .* /licenses/license.php?ste [CO=downloadrequested:%{REQUEST_URI}:.%{ENV:CO_DOMAIN},R,L]
+
+## Redirect to the Linaro license file protected builds.
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteCond %{REQUEST_FILENAME}/EULA.txt -f
+RewriteRule .* /licenses/license.php?linaro [CO=downloadrequested:%{REQUEST_URI}:.%{ENV:CO_DOMAIN},R,L]
+
+RewriteCond %{REQUEST_FILENAME} -f
+RewriteCond %{ENV:LP_DOWNLOAD_DIR}/EULA.txt -f
+RewriteRule .* /licenses/license.php?linaro [CO=downloadrequested:%{REQUEST_URI}:.%{ENV:CO_DOMAIN},R,L]
+
+## Return "Permission denied" if no EULA/OPEN-EULA 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
+RewriteRule .* - [R=403,L]

=== added directory 'android/~linaro-android/staging-imx53'
=== added file 'android/~linaro-android/staging-imx53/test.txt'
--- android/~linaro-android/staging-imx53/test.txt	1970-01-01 00:00:00 +0000
+++ android/~linaro-android/staging-imx53/test.txt	2012-04-02 10:19:19 +0000
@@ -0,0 +1,1 @@
+This is never available.

=== added file 'android/~linaro-android/staging-origen/EULA.txt'
--- android/~linaro-android/staging-origen/EULA.txt	1970-01-01 00:00:00 +0000
+++ android/~linaro-android/staging-origen/EULA.txt	2012-04-02 10:19:19 +0000
@@ -0,0 +1,1 @@
+Samsung EULA goes here
\ No newline at end of file

=== added file 'android/~linaro-android/staging-panda/EULA.txt'
--- android/~linaro-android/staging-panda/EULA.txt	1970-01-01 00:00:00 +0000
+++ android/~linaro-android/staging-panda/EULA.txt	2012-04-02 10:19:19 +0000
@@ -0,0 +1,1 @@
+Linaro EULA goes here
\ No newline at end of file

=== modified file 'android/~linaro-android/staging-panda/test.txt'
--- android/~linaro-android/staging-panda/test.txt	2011-12-09 14:49:04 +0000
+++ android/~linaro-android/staging-panda/test.txt	2012-04-02 10:19:19 +0000
@@ -1,1 +1,1 @@
-This is always available.
+This is a protected with click-through Linaro license.

=== added directory 'android/~linaro-android/staging-snowball/173'
=== added directory 'android/~linaro-android/staging-snowball/173/target'
=== added directory 'android/~linaro-android/staging-snowball/173/target/product'
=== added directory 'android/~linaro-android/staging-snowball/173/target/product/snowball'
=== added file 'android/~linaro-android/staging-snowball/173/target/product/snowball/EULA.txt'
--- android/~linaro-android/staging-snowball/173/target/product/snowball/EULA.txt	1970-01-01 00:00:00 +0000
+++ android/~linaro-android/staging-snowball/173/target/product/snowball/EULA.txt	2012-04-02 10:19:19 +0000
@@ -0,0 +1,1 @@
+STE license goes here
\ No newline at end of file

=== added file 'android/~linaro-android/staging-snowball/173/target/product/snowball/test.txt'
--- android/~linaro-android/staging-snowball/173/target/product/snowball/test.txt	1970-01-01 00:00:00 +0000
+++ android/~linaro-android/staging-snowball/173/target/product/snowball/test.txt	2012-04-02 10:19:19 +0000
@@ -0,0 +1,1 @@
+This is a protected with click-through ST-E license.

=== removed file 'android/~linaro-android/staging-snowball/test.txt'
--- android/~linaro-android/staging-snowball/test.txt	2011-12-09 16:08:16 +0000
+++ android/~linaro-android/staging-snowball/test.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-This is a protected with click-through ST-E license.

=== added directory 'android/~linaro-android/staging-vexpress-a9'
=== added file 'android/~linaro-android/staging-vexpress-a9/OPEN-EULA.txt'
--- android/~linaro-android/staging-vexpress-a9/OPEN-EULA.txt	1970-01-01 00:00:00 +0000
+++ android/~linaro-android/staging-vexpress-a9/OPEN-EULA.txt	2012-04-02 10:19:19 +0000
@@ -0,0 +1,1 @@
+OPEN-EULA goes here
\ No newline at end of file

=== added file 'android/~linaro-android/staging-vexpress-a9/test.txt'
--- android/~linaro-android/staging-vexpress-a9/test.txt	1970-01-01 00:00:00 +0000
+++ android/~linaro-android/staging-vexpress-a9/test.txt	2012-04-02 10:19:19 +0000
@@ -0,0 +1,1 @@
+This is always available.

=== added file 'licenses/license.php'
--- licenses/license.php	1970-01-01 00:00:00 +0000
+++ licenses/license.php	2012-04-02 10:19:19 +0000
@@ -0,0 +1,25 @@
+<?php
+ $down = $_COOKIE["downloadrequested"];
+ $lic = $_SERVER["QUERY_STRING"];
+ $host = $_SERVER["HTTP_HOST"];
+ $doc = $_SERVER["DOCUMENT_ROOT"];
+ $eula = $_COOKIE["eula"];
+ $fn = $doc.$down;
+ if (file_exists($fn) and is_file($fn)) {
+    $repl = dirname($down);
+ } else {
+    $repl = $down;
+ }
+
+ $handle = @fopen($doc."/licenses/".$lic.".html", "r");
+ if ($handle) {
+    while (($buffer = fgets($handle, 4096)) !== false) {
+        $eula = str_replace("src=\"EULA.txt\"", "src=".$repl."/EULA.txt", $buffer);
+        echo $eula;
+    }
+    if (!feof($handle)) {
+        echo "Error: unexpected fgets() fail\n";
+    }
+    fclose($handle);
+ }
+?>

=== added file 'licenses/linaro.html'
--- licenses/linaro.html	1970-01-01 00:00:00 +0000
+++ licenses/linaro.html	2012-04-02 10:19:19 +0000
@@ -0,0 +1,120 @@
+<html>
+<head>
+<title>License Agreement</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<style language="text/css">
+  html, body {
+//    background: #aaa;
+    color: black;
+    margin: 0;
+    padding: 0;
+    font-size: 11pt;
+    font-family: Sans;
+  }
+
+  div#head {
+    height: 110px;
+    background: white;
+    padding: 2em;
+  }
+
+  h1 {
+    padding-left: 200px;
+    margin: 0;
+    color: #444;
+    font-size: 140%;
+    font-weight: bold;
+    text-align: center;
+    background-image: url(/licenses/linaro.png);
+    background-repeat: no-repeat;
+    height: 110px;
+  }
+
+  #content {
+    margin: 0 auto;
+    min-width: 600px;
+    max-width: 920px;
+  }
+
+  h2 {
+    font-size: 120%;
+  }
+
+  #license-text {
+    background: white;
+    color: black;
+    margin: 2em;
+    padding: 2em;
+    text-align: left;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+  }
+
+  #actions {
+    padding: 2em;
+    font-size: 80%;
+    margin-bottom: 4em;
+  }
+
+  #actions .button {
+    background: #e80;
+    color: white;
+    text-decoration: none;
+    font-weight: bold;
+    padding: 10px;
+    margin-left: 10px;
+    float: right;
+    font-size: 110%;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+  }
+
+  #actions .button-decline:hover {
+    background: #f90;
+  }
+
+  #actions .button-accept {
+    background: #8b4;
+  }
+
+  #actions .button-accept:hover {
+    background: #9c5;
+  }
+  iframe#eula {
+    width: 100%;
+    height: 100%;
+    scrolling: auto;
+  }
+</style>
+</head>
+<body>
+
+<div id="head">
+<h1>
+  END-USER LICENSE AGREEMENT<br>
+  FOR LINARO DEVELOPERS (“Agreement”)
+</h1>
+</div>
+
+<div id="content">
+
+<div id="license-text">
+<iframe id="eula" frameborder=0 src="EULA.txt"></iframe>
+</div><!-- license-text -->
+
+<div id="actions">
+
+<div style="float: left;">If accepting the license doesn't work, enable
+cookies in your browser.</div>
+
+<a class="button button-accept" href="linaro-accepted.html">Accept the license</a>
+<a class="button button-decline" href="linaro-declined.html">Decline the license</a>
+
+</div>
+
+</div><!-- content -->
+
+</body>
+</html>

=== added file 'licenses/linaro.png'
Binary files licenses/linaro.png	1970-01-01 00:00:00 +0000 and licenses/linaro.png	2012-04-02 10:19:19 +0000 differ
=== added file 'licenses/samsung.html'
--- licenses/samsung.html	1970-01-01 00:00:00 +0000
+++ licenses/samsung.html	2012-04-02 10:19:19 +0000
@@ -0,0 +1,120 @@
+<html>
+<head>
+<title>License Agreement</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<style language="text/css">
+  html, body {
+    background: #aaa;
+    color: black;
+    margin: 0;
+    padding: 0;
+    font-size: 11pt;
+    font-family: Sans;
+  }
+
+  div#head {
+    height: 120px;
+    background: #e80;
+    padding: 2em;
+  }
+
+  h1 {
+    padding-left: 200px;
+    margin: 0;
+    color: white;
+    font-size: 140%;
+    font-weight: bold;
+    text-align: center;
+    background-image: url(/licenses/exynos.png);
+    background-repeat: no-repeat;
+    height: 109px;
+  }
+
+  #content {
+    margin: 0 auto;
+    min-width: 600px;
+    max-width: 920px;
+  }
+
+  h2 {
+    font-size: 120%;
+  }
+
+  #license-text {
+    background: white;
+    color: black;
+    margin: 2em;
+    padding: 2em;
+    text-align: left;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+  }
+
+  #actions {
+    padding: 2em;
+    font-size: 80%;
+    margin-bottom: 4em;
+  }
+
+  #actions .button {
+    background: #e80;
+    color: white;
+    text-decoration: none;
+    font-weight: bold;
+    padding: 10px;
+    margin-left: 10px;
+    float: right;
+    font-size: 110%;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+  }
+
+  #actions .button-decline:hover {
+    background: #f90;
+  }
+
+  #actions .button-accept {
+    background: #8b4;
+  }
+
+  #actions .button-accept:hover {
+    background: #9c5;
+  }
+  iframe#eula {
+    width: 100%;
+    height: 100%;
+    scrolling: auto;
+  }
+</style>
+</head>
+<body>
+
+<div id="head">
+<h1>
+  SAMSUNG DEVELOPMENT TOOL KIT END-USER LICENSE AGREEMENT FOR LINARO
+  DEVELOPERS (“Agreement”)
+</h1>
+</div>
+
+<div id="content">
+
+<div id="license-text">
+<iframe id="eula" frameborder=0 src="EULA.txt"></iframe>
+</div><!-- license-text -->
+
+<div id="actions">
+
+<div style="float: left;">If accepting the license doesn't work, enable
+cookies in your browser.</div>
+
+<a class="button button-accept" href="samsung-accepted.html">Accept the license</a>
+<a class="button button-decline" href="samsung-declined.html">Decline the license</a>
+
+</div>
+
+</div><!-- content -->
+
+</body>
+</html>

=== modified file 'licenses/ste.html'
--- licenses/ste.html	2012-03-09 13:01:23 +0000
+++ licenses/ste.html	2012-04-02 10:19:19 +0000
@@ -88,6 +88,11 @@
   #actions .button-accept:hover {
     background: #9c5;
   }
+  iframe#eula {
+    width: 100%;
+    height: 100%;
+    scrolling: auto;
+  }
 </style>
 </head>
 <body>
@@ -105,304 +110,7 @@
 <div id="content">
 
 <div id="license-text">
-
-<div>
- This Agreement is a legally binding contract between you - either an 
- individual or a legal entity - (hereinafter referred to as "Licensee") 
- and ST-Ericsson SA, a company incorporated under the laws of 
- Switzerland (hereinafter referred to as "ST-Ericsson"). 
-</p>
-
-<p>
- IMPORTANT - PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY. THIS IS A 
- LEGALLY BINDING AGREEMENT. BY CLICKING THE "ACCEPT" BUTTON BELOW, 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, DO NOT DOWNLOAD, INSTALL OR 
- OTHERWISE USE THE SOFTWARE. 
-</p>
-
-<p>
- ST-Ericsson and Licensee are each hereinafter also referred to as the 
- "Party" and, collectively, as the "Parties." 
-</p>
-
-<h2>
- 1 DEFINITIONS 
-</h2>
-
-<p>
- 1.1 Wherever used in this Agreement, the following terms shall have 
- the meanings set forth below: 
-</p>
-
-<p>
- "Licensee's Applications" means applications and other software 
- developed by Licensee which are intended to interface with and/or run 
- on the Snowball Kit.
-</p>
-
-<p>
- "Limited License Purpose" shall mean the limited license granted under Article 2.1 below.
-</p>
-
-<p>
- "Snowball Kit" means the hardware products "SKY-S9500-ULP-Cxy" 
- where x and y are integers between "0" and "9".
-</p>
-
-<p>
- "Software" shall mean the ST-Ericsson's software for the A9500 
- platform delivered in binary or in source for the related header 
- files, including any copies and new releases thereof. 
-</p>
-
-<p>
- 1.2 Other capitalized expressions used in this Agreement shall have 
- the meanings respectively assigned to them elsewhere in this 
- Agreement. 
-</p>
-
-<p>
- 1.3 Words indicating the singular only also include the plural and 
- vice-versa, where the context so requires. 
-</p>
-
-<p>
- 1.4 The headings of the Articles in this Agreement are for convenience 
- only and shall not affect the interpretation of this Agreement. 
-</p>
-
-<h2>2 LICENSE GRANT</h2>
-
-<p>
- 2.1 Subject to the terms and conditions in this Agreement, STEricsson 
- hereby grants to Licensee a non-exclusive, non-transferable, limited 
- license to use and reproduce the Software solely to the extent 
- required in order to (i) develop Licensee's Applications that 
- interface with and/or run with the Snowball Kit; and (ii) integrate 
- the Software with Licensee Application and/or third party software; 
- and (iii) conduct development testing of the Licensee's Applications' 
- or third party software operation in conjunction with the Snowball Kit 
- and/or Licensee's demonstration of such Licensee's Applications in 
- conjunction with the Snowball Kit (hereinafter "Limited License 
- Purpose"). The Licensee is entitled to flash the Software on a 
- commercial product containg the Snowball Kit. The aforesaid license to 
- the Software is provided that all and any use of the Software is 
- solely and exclusively used on the Snowball Kit. 
-</p>
-
-<p>
- 2.2 Some portion of the Software might contain Open Source 
- Software. Such Open Source Software might be subject to Open Source 
- Terms applicable for each such portion, as further specified in the 
- Software. Such Open Source Software is supplied to Licensee solely 
- under the applicable Open Source Terms and is not subject to the terms 
- of this Agreement. 
-</p>
-
-<p>
- 2.3 Licensee shall not, and shall not permit any third party to alter, 
- change, modify, adapt, decompile, disassemble, compile or reverse 
- engineer or remove or circumvent any protection or other restrictive 
- technology mechanism of the the Software and/or any and all parts 
- thereof, or otherwise use, sub-license, assign or pledge the Software 
- and/or any and all parts thereof other than what is expressly 
- permitted in accordance with this Agreement. 
-</p>
-
-<p>
- 2.4 ST-Ericsson shall retain on behalf of itself or the original owner 
- all right title and interest to any ST-Ericsson Intellectual Property 
- Rights, including but not limited to any patents, trademarks, 
- copyrights, and trade secret rights, and title to copies of any and 
- all media bearing the Software or the Snowball Kit and/or any and all 
- parts thereof, and the Licensee acquires no interest under this 
- Agreement to any ST-Ericsson Intellectual Property Rights or other 
- rights other than the Limited License Purpose expressly set forth in 
- this Article 2. 
-</p>
-
-<p>
- 2.5 Notwithstanding anything to the contrary herein, nothing contained 
- hereunder shall be construed as conferring any right, license or 
- immunity, either directly or by implication, estoppel or otherwise to 
- Licensee or any third party: (i) under any intellectual property 
- rights of any third party; specifically, without limiting the 
- generality of the foregoing, the sale and use of the Products are not 
- licensed under any patents of Telefonaktiebolaget LM Ericsson, or any 
- affiliates of such company; (ii) under any intellectual property 
- rights of STEricsson other than explicitly granted under in this 
- Agreement; or (iii) with respect to any trademark, trade or brand 
- name, a corporate name of ST-Ericsson, or any other name or mark, or 
- contraction abbreviation or simulation thereof. 
-</p>
-
-
-<h2>3 DELIVERY</h2>
-
-<p>
- 3.1 All deliveries of the Software are EX-WORKS (Incoterms 2000) at 
- ST-Ericsson's indicated facility. 
-</p>
-
-
-<h2>4 NO REPRESENTATIONS OR WARRANTIES</h2>
-
-<p>
- 4.1 The Software is delivered "as is" and all representations and
- warranties, express or implied, are hereby disclaimed, including, but
- not limited to that:
-</p>
-
-<p>
- a) the Software or any part thereof is accurate or reliable for any
- purposes whatsoever; and
-</p>
-
-<p>
- b) the use of the Software does not infringe any rights that may be
- held by a third party in respect of any such information.
-</p>
-
-<p>
- 4.2 Licensee acknowledges and agrees that any use of the Software
- and/or the Snowball Kit, or any other part thereof, or any use of
- Licensee's Applications is at Licensee's sole risk.
-</p>
-
-<h2>5 WARRANTY DISCLAIMER AND GENERAL LIMITATION OF LIABILITY</h2>
-
-<p>
- 5.1 THE SOFTWARE AND/OR SNOWBALL KIT AND ANY AND ALL PARTS THEREOF ARE 
- PROVIDED "AS IS". ST-ERICSSON MAKES NO REPRESENTATIONS OR WARRANTIES 
- WITH RESPECT TO THE SOFTWARE AND/OR SNOWBALL KIT AND OR PARTS THEREOF 
- WHETHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- PURPOSE. SPECIFICALLY, WITHOUT LIMITING THE GENERALITY OF THE 
- FOREGOING, ST-ERICSSON MAKES NO REPRESENTATION OR WARRANTY THAT (I) 
- THE USE OF THE SOFTWARE AND/OR SNOWBALL KIT AND OR PARTS THEREOF WILL 
- BE UNINTERRUPTED OR ERROR FREE, AND OR (II) ANY USE AND OR 
- DISTRIBUTION OF THE SOFTWARE AND/OR SNOWBALL KIT AND OR PARTS THEREOF, 
- WHETHER INTEGRATED INTO OTHER EQUIPMENT OR NOT, ARE FREE FROM 
- INFRINGEMENT OF ANY THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, AND IT 
- SHALL BE THE SOLE RESPONSIBILITY OF LICENSEE TO MAKE SUCH 
- DETERMINATION AS IS NECESSARY WITH RESPECT TO THE ACQUISITION OF 
- LICENSES UNDER PATENTS AND OTHER INTELLECTUAL PROPERTY RIGHTS OF THIRD 
- PARTIES. CONSEQUENTLY, IN NO EVENT SHALL ST-ERICSSON, ITS AFFILIATES 
- OR THEIR SUPPLIERS BE LIABLE TO LICENSEE FOR ANY LOSS OR DAMAGES 
- (WHETHER DIRECT, INDRECT OR CONSEQUENTIAL) ARISING FROM ANY USE AND OR 
- DISTRIBUTION OF THE SOFTWARE AND/OR SNOWBALL KIT AND OR PARTS THEREOF, 
- WHETHER INTEGRATED INTO OTHER EQUIPMENT OR NOT, AND OR ARISING BY 
- REASON OF THE FACT THAT THE SOFTWARE AND/OR SNOWBALL KIT AND OR ANY 
- PARTS THEREOF ARE DEFECTIVE OR NON-CONFORMING AND OR ARISING FROM THIS 
- AGREEMENT AND OR ANY BREACH THEREOF. 
-</p>
-
-<p>
- 5.2 THE PARTIES AGREE THAT ANY RIGHTS AND REMEDIES THE LICENSEE MAY 
- HAVE AND OR ANY OBLIGATIONS THAT ST-ERICSSON MAY HAVE ACCORDING TO LAW 
- OR OTHERWISE WITH RESPECT TO ERRORS AND DEFECTS IN THE SOFTWARE AND/OR 
- OTHER DELIVERABLES AND/OR IN ANY PART THEREOF SHALL HEREBY BE 
- DISCLAIMED. 
-</p>
-
-<h2>
- 6 TERMINATION 
-</h2>
-
-<p>
- 6.1 The license and this Agreement are effective until terminated. 
-</p>
-
-<p>
- 6.2 Licensee agrees that each of the terms and conditions set out in 
- this Agreement are material and that failure of Licensee to comply 
- with these terms and conditions shall constitute sufficient cause for 
- ST-Ericsson to terminate this Agreement. The aforesaid is without any 
- prejudice to other rights ST-Ericsson may have in case of breach of 
- this Agreement. 
-</p>
-
-<p>
- 6.3 In the event of termination of this Agreement Licensee shall 
- immediately destroy all copies of the Software, including all portions 
- and derivatives thereof. 
-</p>
-
-<h2>
- 7 EXPORT CONTROL 
-</h2>
-
-<p>
- 7.1 Licensee recognizes that the Software or any parts thereof may be 
- subject to import and export regulations in certain 
- countries. Licensee agrees that it will not knowingly export, 
- re-export or import products, technology or Software, or any parts 
- thereof, of ST-Ericsson, directly or indirectly, to any country to the 
- extent export to such country at the time of export requires an export 
- license or other governmental approval under any export control laws 
- and regulations, without first obtaining such license or approval. 
-</p>
-
-<h2>
- 8 COMPLIANCE WITH LAWS 
-</h2>
-
-<p>
- 8.1 Licensee agrees not to use the Software in violation of, and to 
- comply with any and all applicable law, statute, ordinance or other 
- regulation. 
-</p>
-
-<h2>
- 9 ENTIRE AGREEMENT 
-</h2>
-
-<p>
- 9.1 This is the entire agreement between Licensee and ST-Ericsson on 
- the subject matter of this Agreement, and supersedes all 
- representations, undertakings and agreements previously made between 
- the Parties with respect to the subject matter of this Agreement. 
-</p>
-
-<h2>
- 10 SEVERABILITY 
-</h2>
-
-<p>
- 10.1 If a court or agency of competent jurisdiction holds any term of 
- this Agreement invalid, illegal, or unenforceable for any reason, the 
- remainder of this Agreement shall be valid and enforceable and such 
- term shall be substituted by a valid and enforceable provision so as 
- to the best accomplish the objectives of such provision in this 
- Agreement. 
-</p>
-
-<h2>
- 11 GOVERNING LAW AND JURISDICTION 
-</h2>
-
-<p>
- 11.1 This Agreement shall be governed by and construed in accordance 
- with the laws of Switzerland, without regard to its conflict of laws 
- rules. The application of The United Nations Convention of Contracts 
- for the International Sale of Goods is explicitly excluded. 
-</p>
-
-<p>
- 11.2 Any and all disputes, differences or questions arising out of or 
- in connection with this Agreement shall be under the exclusive 
- jurisdiction of the Swiss courts and the venue shall be Geneva. 
-</p>
-
-<p>
- 11.3 Notwithstanding the aforesaid, nothing in this Article 11 shall 
- prevent the Parties from seeking any interim or final injunctive or 
- equitable relief by a court of competent jurisdiction.
-</p>
-
+<iframe id="eula" frameborder=0 src="EULA.txt"></iframe>
 </div><!-- license-text -->
 
 </div><!-- content -->

=== modified file 'testing/apache2.conf.tmpl'
--- testing/apache2.conf.tmpl	2012-01-12 14:17:32 +0000
+++ testing/apache2.conf.tmpl	2012-04-02 10:19:19 +0000
@@ -17,6 +17,9 @@
 
 DocumentRoot ""
 
+RewriteLog rewrite.log
+RewriteLogLevel 7
+
 AccessFileName .htaccess
 
 LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so
@@ -24,6 +27,7 @@
 LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
 LoadModule autoindex_module /usr/lib/apache2/modules/mod_autoindex.so
 LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
+LoadModule php5_module /usr/lib/apache2/modules/libphp5.so
 
 User daemon
 Group daemon
@@ -96,6 +100,15 @@
 
 </IfModule>
 
+<IfModule mod_php5.c>
+    <FilesMatch "\.ph(p3?|tml)$">
+	SetHandler application/x-httpd-php
+    </FilesMatch>
+    <FilesMatch "\.phps$">
+	SetHandler application/x-httpd-php-source
+    </FilesMatch>
+</IfModule>
+
 DefaultType text/plain
 
 IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=* Charset=UTF-8

=== modified file 'testing/mime.types'
--- testing/mime.types	2012-01-12 07:15:28 +0000
+++ testing/mime.types	2012-04-02 10:19:19 +0000
@@ -3,4 +3,9 @@
 text/html					html htm shtml
 text/plain					asc txt text pot brf
 text/uri-list
-
+application/x-httpd-php                         phtml pht php
+application/x-httpd-php-source                  phps
+application/x-httpd-php3                        php3
+application/x-httpd-php3-preprocessed           php3p
+application/x-httpd-php4                        php4
+application/x-httpd-php5                        php5

=== modified file 'testing/test_click_through_license.py'
--- testing/test_click_through_license.py	2012-01-13 11:48:16 +0000
+++ testing/test_click_through_license.py	2012-04-02 10:19:19 +0000
@@ -19,11 +19,14 @@
 
 host = 'http://127.0.0.1'
 port = '0'  # 0 == Pick a free port.
-samsung_license_path = '/licenses/samsung-v2.html'
+samsung_license_path = '/licenses/samsung.html'
 ste_license_path = '/licenses/ste.html'
+linaro_license_path = '/licenses/linaro.html'
 samsung_test_file = '/android/~linaro-android/staging-origen/test.txt'
-ste_test_file = '/android/~linaro-android/staging-snowball/test.txt'
-not_protected_test_file = '/android/~linaro-android/staging-panda/test.txt'
+ste_test_file = '/android/~linaro-android/staging-snowball/173/target/product/snowball/test.txt'
+never_available = '/android/~linaro-android/staging-imx53/test.txt'
+linaro_test_file = '/android/~linaro-android/staging-panda/test.txt'
+not_protected_test_file = '/android/~linaro-android/staging-vexpress-a9/test.txt'
 
 
 class Contains(object):
@@ -105,6 +108,8 @@
             os.unlink("%s/click_through_license_access.log" % srvroot)
         if os.path.exists("%s/click_through_license_error.log" % srvroot):
             os.unlink("%s/click_through_license_error.log" % srvroot)
+        if os.path.exists("%s/rewrite.log" % srvroot):
+            os.unlink("%s/rewrite.log" % srvroot)
         os.rename("%s/dothtaccess" % docroot, "%s/.htaccess" % docroot)
 
     def setUp(self):
@@ -129,16 +134,26 @@
         testfile = fetcher.get(host + ste_license_path)
         self.assertThat(testfile, Contains(search))
 
+    def test_licensefile_directly_linaro(self):
+        search = "Index of /"
+        testfile = fetcher.get(host + linaro_license_path)
+        self.assertThat(testfile, Contains(search))
+
     def test_redirect_to_license_samsung(self):
-        search = "SAMSUNG DEVELOPMENT TOOL KIT END-USER LICENSE AGREEMENT"
+        search = "LICENSE AGREEMENT"
         testfile = fetcher.get(host + samsung_test_file, ignore_license=True)
         self.assertThat(testfile, Contains(search))
 
     def test_redirect_to_license_ste(self):
-        search = "LIMITED LICENSE AGREEMENT FOR APPLICATION DEVELOPERS"
+        search = "LICENSE AGREEMENT"
         testfile = fetcher.get(host + ste_test_file, ignore_license=True)
         self.assertThat(testfile, Contains(search))
 
+    def test_redirect_to_license_linaro(self):
+        search = "LICENSE AGREEMENT"
+        testfile = fetcher.get(host + linaro_test_file, ignore_license=True)
+        self.assertThat(testfile, Contains(search))
+
     def test_decline_license_samsung(self):
         search = "License has not been accepted"
         testfile = fetcher.get(host + samsung_test_file, accept_license=False)
@@ -149,11 +164,21 @@
         testfile = fetcher.get(host + ste_test_file, accept_license=False)
         self.assertThat(testfile, Contains(search))
 
+    def test_decline_license_linaro(self):
+        search = "License has not been accepted"
+        testfile = fetcher.get(host + linaro_test_file, accept_license=False)
+        self.assertThat(testfile, Contains(search))
+
     def test_non_protected_dirs(self):
         search = "This is always available."
         testfile = fetcher.get(host + not_protected_test_file)
         self.assertThat(testfile, Contains(search))
 
+    def test_never_available_dirs(self):
+        search = "Forbidden"
+        testfile = fetcher.get(host + never_available)
+        self.assertThat(testfile, Contains(search))
+
     def test_accept_license_samsung_file(self):
         search = "This is a protected with click-through Samsung license."
         testfile = fetcher.get(host + samsung_test_file)

=== added directory 'uploads'