Merge pull request #319 from openaddresses/fix-proxied-redirects

Fix proxied redirects

openaddr/ci/__init__.py

@@ -484,8 +484,10 @@ def _render_and_upload_maps(s3, good_sources, s3_prefix, dirname):
     '''
     urls = dict()
     areas = (render.WORLD, 'world'), (render.USA, 'usa'), (render.EUROPE, 'europe')
+
+    # Safe to force_http=False because we set boto.s3.connection.OrdinaryCallingFormat
+    url_kwargs = dict(expires_in=0, query_auth=False, force_http=False)
     key_kwargs = dict(policy='public-read', headers={'Content-Type': 'image/png'})
-    url_kwargs = dict(expires_in=0, query_auth=False, force_http=True)
 
     for (area, area_name) in areas:
         png_basename = 'render-{}.png'.format(area_name)

openaddr/ci/templates/index.html

@@ -136,11 +136,11 @@
     </tr>
 </table>
 <p>
-    <button onclick="choosemap('http://data.openaddresses.io/render-world.png')">Show World</button>
-    <button onclick="choosemap('http://data.openaddresses.io/render-usa.png')">Show United States</button>
-    <button onclick="choosemap('http://data.openaddresses.io/render-europe.png')">Show Europe</button>
+    <button onclick="choosemap('https://s3.amazonaws.com/data.openaddresses.io/render-world.png')">Show World</button>
+    <button onclick="choosemap('https://s3.amazonaws.com/data.openaddresses.io/render-usa.png')">Show United States</button>
+    <button onclick="choosemap('https://s3.amazonaws.com/data.openaddresses.io/render-europe.png')">Show Europe</button>
 </p>
-<p><img src="http://data.openaddresses.io/render-world.png" width="100%" id="render-img"></p>
+<p><img src="https://s3.amazonaws.com/data.openaddresses.io/render-world.png" width="100%" id="render-img"></p>
 <p>
     The latest summary can always be found at
     <a href="http://results.openaddresses.io">results.openaddresses.io</a>.<br>

openaddr/ci/web.py

@@ -1,4 +1,6 @@
 from flask import Flask
+from werkzeug.contrib.fixers import ProxyFix
+
 from .webhooks import apply_webhooks_blueprint
 from .webapi import apply_webapi_blueprint
 from . import load_config
@@ -7,3 +9,6 @@
 app.config.update(load_config())
 apply_webhooks_blueprint(app)
 apply_webapi_blueprint(app)
+
+# Look at X-Forwarded-* request headers when behind a proxy.
+app.wsgi_app = ProxyFix(app.wsgi_app)

openaddr/tests/__init__.py

@@ -1161,9 +1161,6 @@ def __init__(self, name, fake_s3):
         self.s3 = fake_s3
 
     def generate_url(self, **kwargs):
-        if kwargs.get('force_http', None) is not True:
-            raise ValueError("S3 generate_url() makes bad https:// URLs")
-
         return 'http://fake-s3.local' + self.name
 
     def set_contents_from_string(self, string, **kwargs):

setup.py

@@ -70,6 +70,9 @@
         # http://flask-cors.corydolphin.com
         'Flask-Cors == 2.1.2',
 
+        # https://www.palletsproject.com/projects/werkzeug/
+        'Werkzeug == 0.11.5',
+
         # http://gunicorn.org
         'gunicorn == 19.3.0',