From 8da2db4b71096b19e7a9ef1929369b8483d448bf Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Fri, 4 Jan 2019 17:34:22 -0800
Subject: [PATCH] WIP

---
 datasette/app.py                  |  3 +++
 datasette/cli.py                  |  2 ++
 datasette/templates/database.html | 12 ++++++------
 datasette/templates/index.html    |  4 ++--
 datasette/templates/query.html    |  4 ++--
 datasette/templates/row.html      |  4 ++--
 datasette/templates/table.html    |  4 ++--
 datasette/views/base.py           |  3 ++-
 8 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/datasette/app.py b/datasette/app.py
index cdfcb11d..d9b8ac72 100644
--- a/datasette/app.py
+++ b/datasette/app.py
@@ -99,6 +99,9 @@ CONFIG_OPTIONS = (
     ConfigOption("force_https_urls", False, """
         Force URLs in API output to always use https:// protocol
     """.strip()),
+    ConfigOption("url_prefix", "", """
+        URLs within Datasette itself should start with this (defaults to auto)
+    """.strip()),
 )
 DEFAULT_CONFIG = {
     option.name: option.default
diff --git a/datasette/cli.py b/datasette/cli.py
index 2cadabbf..90ae137e 100644
--- a/datasette/cli.py
+++ b/datasette/cli.py
@@ -49,6 +49,8 @@ class Config(click.ParamType):
                 )
                 return
             return name, int(value)
+        elif isinstance(default, str):
+            return name, value
         else:
             # Should never happen:
             self.fail('Invalid option')
diff --git a/datasette/templates/database.html b/datasette/templates/database.html
index 05acff84..db6eb0dc 100644
--- a/datasette/templates/database.html
+++ b/datasette/templates/database.html
@@ -10,7 +10,7 @@
 {% block body_class %}db db-{{ database|to_css_class }}{% endblock %}
 
 {% block content %}
-<div class="hd"><a href="/">home</a></div>
+<div class="hd"><a href="{{ prefix }}">home</a></div>
 
 <h1 style="padding-left: 10px; border-left: 10px solid #{{ database_hash[:6] }}">{{ metadata.title or database }}</h1>
 
@@ -27,7 +27,7 @@
 {% for table in tables %}
 {% if show_hidden or not table.hidden %}
 <div class="db-table">
-    <h2><a href="/{{ database }}-{{ database_hash }}/{{ table.name|quote_plus }}">{{ table.name }}</a>{% if table.hidden %}<em> (hidden)</em>{% endif %}</h2>
+    <h2><a href="{{ prefix }}{{ database }}-{{ database_hash }}/{{ table.name|quote_plus }}">{{ table.name }}</a>{% if table.hidden %}<em> (hidden)</em>{% endif %}</h2>
     <p><em>{% for column in table.columns[:9] %}{{ column }}{% if not loop.last %}, {% endif %}{% endfor %}{% if table.columns|length > 9 %}...{% endif %}</em></p>
     <p>{{ "{:,}".format(table.count) }} row{% if table.count == 1 %}{% else %}s{% endif %}</p>
 </div>
@@ -35,14 +35,14 @@
 {% endfor %}
 
 {% if hidden_count and not show_hidden %}
-    <p>... and <a href="/{{ database }}-{{ database_hash }}?_show_hidden=1">{{ "{:,}".format(hidden_count) }} hidden table{% if hidden_count == 1 %}{% else %}s{% endif %}</a></p>
+    <p>... and <a href="{{ prefix }}{{ database }}-{{ database_hash }}?_show_hidden=1">{{ "{:,}".format(hidden_count) }} hidden table{% if hidden_count == 1 %}{% else %}s{% endif %}</a></p>
 {% endif %}
 
 {% if views %}
     <h2>Views</h2>
     <ul>
         {% for view in views %}
-            <li><a href="/{{ database }}-{{ database_hash }}/{{ view|urlencode }}">{{ view }}</a></li>
+            <li><a href="{{ prefix }}{{ database }}-{{ database_hash }}/{{ view|urlencode }}">{{ view }}</a></li>
         {% endfor %}
     </ul>
 {% endif %}
@@ -51,13 +51,13 @@
     <h2>Queries</h2>
     <ul>
         {% for query in queries %}
-            <li><a href="/{{ database }}-{{ database_hash }}/{{ query.name|urlencode }}" title="{{ query.description or query.sql }}">{{ query.title or query.name }}</a></li>
+            <li><a href="{{ prefix }}{{ database }}-{{ database_hash }}/{{ query.name|urlencode }}" title="{{ query.description or query.sql }}">{{ query.title or query.name }}</a></li>
         {% endfor %}
     </ul>
 {% endif %}
 
 {% if config.allow_download %}
-    <p>Download SQLite DB: <a href="/{{ database }}-{{ database_hash }}.db">{{ database }}.db</a></p>
+    <p>Download SQLite DB: <a href="{{ prefix }}{{ database }}-{{ database_hash }}.db">{{ database }}.db</a></p>
 {% endif %}
 
 {% include "_codemirror_foot.html" %}
diff --git a/datasette/templates/index.html b/datasette/templates/index.html
index cb52740a..bea9c893 100644
--- a/datasette/templates/index.html
+++ b/datasette/templates/index.html
@@ -10,7 +10,7 @@
 {% block description_source_license %}{% include "_description_source_license.html" %}{% endblock %}
 
 {% for database in databases %}
-    <h2 style="padding-left: 10px; border-left: 10px solid #{{ database.hash[:6] }}"><a href="{{ database.path }}">{{ database.name }}</a></h2>
+    <h2 style="padding-left: 10px; border-left: 10px solid #{{ database.hash[:6] }}"><a href="{{ prefix }}{{ database.path }}">{{ database.name }}</a></h2>
     <p>
         {{ "{:,}".format(database.table_rows_sum) }} rows in {{ database.tables_count }} table{% if database.tables_count != 1 %}s{% endif %}{% if database.tables_count and database.hidden_tables_count %}, {% endif %}
         {% if database.hidden_tables_count %}
@@ -21,7 +21,7 @@
             {{ "{:,}".format(database.views_count) }} view{% if database.views_count != 1 %}s{% endif %}
         {% endif %}
     </p>
-    <p>{% for table in database.tables_truncated %}<a href="{{ database.path }}/{{ table.name|quote_plus }}" title="{{ table.count }} rows">{{ table.name }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% if database.tables_more %}, <a href="{{ database.path }}">...</a>{% endif %}</p>
+    <p>{% for table in database.tables_truncated %}<a href="{{ prefix }}{{ database.path }}/{{ table.name|quote_plus }}" title="{{ table.count }} rows">{{ table.name }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% if database.tables_more %}, <a href="{{ prefix }}{{ database.path }}">...</a>{% endif %}</p>
 {% endfor %}
 
 {% endblock %}
diff --git a/datasette/templates/query.html b/datasette/templates/query.html
index b23c67d8..97d3dd58 100644
--- a/datasette/templates/query.html
+++ b/datasette/templates/query.html
@@ -19,13 +19,13 @@
 {% block body_class %}query db-{{ database|to_css_class }}{% endblock %}
 
 {% block content %}
-<div class="hd"><a href="/">home</a> / <a href="/{{ database }}-{{ database_hash }}">{{ database }}</a></div>
+<div class="hd"><a href="{{ prefix }}">home</a> / <a href="{{ prefix }}{{ database }}-{{ database_hash }}">{{ database }}</a></div>
 
 <h1 style="padding-left: 10px; border-left: 10px solid #{{ database_hash[:6] }}">{{ metadata.title or database }}</h1>
 
 {% block description_source_license %}{% include "_description_source_license.html" %}{% endblock %}
 
-<form class="sql" action="/{{ database }}-{{ database_hash }}{% if canned_query %}/{{ canned_query }}{% endif %}" method="get">
+<form class="sql" action="{{ prefix }}{{ database }}-{{ database_hash }}{% if canned_query %}/{{ canned_query }}{% endif %}" method="get">
     <h3>Custom SQL query{% if display_rows %} returning {% if truncated %}more than {% endif %}{{ "{:,}".format(display_rows|length) }} row{% if display_rows|length == 1 %}{% else %}s{% endif %}{% endif %}</h3>
     {% if editable and config.allow_sql %}
         <p><textarea name="sql">{% if query and query.sql %}{{ query.sql }}{% else %}select * from {{ tables[0].name|escape_sqlite }}{% endif %}</textarea></p>
diff --git a/datasette/templates/row.html b/datasette/templates/row.html
index 4ef0b758..1aa6f80a 100644
--- a/datasette/templates/row.html
+++ b/datasette/templates/row.html
@@ -16,7 +16,7 @@
 {% block body_class %}row db-{{ database|to_css_class }} table-{{ table|to_css_class }}{% endblock %}
 
 {% block content %}
-<div class="hd"><a href="/">home</a> / <a href="/{{ database }}-{{ database_hash }}">{{ database }}</a> / <a href="/{{ database }}-{{ database_hash }}/{{ table|quote_plus }}">{{ table }}</a></div>
+<div class="hd"><a href="{{ prefix }}">home</a> / <a href="{{ prefix }}{{ database }}-{{ database_hash }}">{{ database }}</a> / <a href="{{ prefix }}{{ database }}-{{ database_hash }}/{{ table|quote_plus }}">{{ table }}</a></div>
 
 <h1 style="padding-left: 10px; border-left: 10px solid #{{ database_hash[:6] }}">{{ table }}: {{ ', '.join(primary_key_values) }}</a></h1>
 
@@ -31,7 +31,7 @@
     <ul>
         {% for other in foreign_key_tables %}
             <li>
-                <a href="/{{ database }}-{{ database_hash }}/{{ other.other_table|quote_plus }}?{{ other.other_column }}={{ ', '.join(primary_key_values) }}">
+                <a href="{{ prefix }}{{ database }}-{{ database_hash }}/{{ other.other_table|quote_plus }}?{{ other.other_column }}={{ ', '.join(primary_key_values) }}">
                     {{ "{:,}".format(other.count) }} row{% if other.count == 1 %}{% else %}s{% endif %}</a>
                 from {{ other.other_column }} in {{ other.other_table }}
             </li>
diff --git a/datasette/templates/table.html b/datasette/templates/table.html
index 6177163a..8d4e68f7 100644
--- a/datasette/templates/table.html
+++ b/datasette/templates/table.html
@@ -17,7 +17,7 @@
 {% block body_class %}table db-{{ database|to_css_class }} table-{{ table|to_css_class }}{% endblock %}
 
 {% block content %}
-<div class="hd"><a href="/">home</a> / <a href="/{{ database }}-{{ database_hash }}">{{ database }}</a></div>
+<div class="hd"><a href="{{ prefix }}">home</a> / <a href="{{ prefix }}{{ database }}-{{ database_hash }}">{{ database }}</a></div>
 
 <h1 style="padding-left: 10px; border-left: 10px solid #{{ database_hash[:6] }}">{{ metadata.title or table }}{% if is_view %} (view){% endif %}</h1>
 
@@ -29,7 +29,7 @@
     </h3>
 {% endif %}
 
-<form class="filters" action="/{{ database }}-{{ database_hash }}/{{ table|quote_plus }}" method="get">
+<form class="filters" action="{{ prefix }}{{ database }}-{{ database_hash }}/{{ table|quote_plus }}" method="get">
     {% if supports_search %}
         <div class="search-row"><label for="_search">Search:</label><input id="_search" type="search" name="_search" value="{{ search }}"></div>
     {% endif %}
diff --git a/datasette/views/base.py b/datasette/views/base.py
index 4b89c975..e38b0525 100644
--- a/datasette/views/base.py
+++ b/datasette/views/base.py
@@ -102,6 +102,7 @@ class RenderMixin(HTTPMethodView):
                         "extra_js_urls": self._asset_urls(
                             "extra_js_urls", template, context
                         ),
+                        "prefix": self.ds.config("url_prefix") or "/",
                     }
                 }
             )
@@ -190,7 +191,7 @@ class BaseView(RenderMixin):
         return name, expected, None
 
     def absolute_url(self, request, path):
-        url = urllib.parse.urljoin(request.url, path)
+        url = urllib.parse.urljoin(self.ds.config("url_prefix") or request.url, path)
         if url.startswith("http://") and self.ds.config("force_https_urls"):
             url = "https://" + url[len("http://"):]
         return url