- Attackers on the site may trick you into doing
- something dangerous like installing software
- or revealing your personal information (for example, passwords,
- phone numbers or credit cards).
-
-
- {# Do what we can to prevent the user from selecting the text #}
-
- Original URL: {{ url_to_annotate }}
-
-{% endmacro %}
-
-{% block body_attrs %}
- {% if reason == "malicious" %}
- class="danger"
- {% endif %}
-{% endblock %}
-
-{% block content %}
- {% if reason == "malicious" %}
- {% set text = {
- "heading": " Deceptive site ahead",
- "details": "This site is not available through Hypothesis because
- it might be hosting harmful content."
- } %}
-
- {% elif reason == "publisher-blocked" %}
- {% set text = {
- "heading": "Content not available",
- "details": "Unfortunately, the publisher of this page has requested
- that we disallow access to it through this Hypothesis service.
- That means we can't show you the page you were looking for
- right away…"
- } %}
-
- {% else %}
- {% set text = {
- "heading": "Content cannot be annotated",
- "details": "Unfortunately, the contents of this page cannot be
- annotated through this Hypothesis service."
- } %}
- {% endif %}
-
-
-
-
{{ text.heading }}
-
-
-
-
{{ text.details }}
-
- {% if reason == "malicious" %}
- {{ bad_site_ahead()}}
- {% else %}
- {{ how_to_access() }}
- {% endif %}
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/viahtml/templates/viahtml/wrapper.html.jinja2 b/viahtml/templates/viahtml/wrapper.html.jinja2
deleted file mode 100644
index e9cb0c60..00000000
--- a/viahtml/templates/viahtml/wrapper.html.jinja2
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
- {% block title %}Via{% endblock %}
-
-
-
-
-
-
-
-
-
- {% block content %}
- {% endblock %}
-
-
-
diff --git a/viahtml/views/blocklist.py b/viahtml/views/blocklist.py
index f42f89b7..fbdd96ea 100644
--- a/viahtml/views/blocklist.py
+++ b/viahtml/views/blocklist.py
@@ -1,12 +1,9 @@
"""The blocklist view."""
-import os
import re
from logging import getLogger
from checkmatelib import CheckmateClient, CheckmateException
-from jinja2 import Environment, FileSystemLoader, select_autoescape
-from pkg_resources import resource_filename
LOG = getLogger(__name__)
@@ -16,13 +13,6 @@ class BlocklistView:
PROXY_PATTERN = re.compile(r"^/proxy/(?:[a-z]{2}_/)?(.*)$")
- JINJA_ENV = Environment(
- loader=FileSystemLoader(
- os.path.abspath(resource_filename("viahtml", "templates"))
- ),
- autoescape=select_autoescape(["html", "xml"]),
- )
-
def __init__(self, checkmate_host):
self.checkmate = CheckmateClient(checkmate_host)
@@ -49,16 +39,16 @@ def __call__(self, path, environ, start_response):
return None
try:
- hits = self.checkmate.check_url(url, allow_all=True)
+ blocked = self.checkmate.check_url(url, allow_all=True)
except CheckmateException as err:
LOG.warning("Failed to check URL against Checkmate: %s", err)
return None
- if not hits:
+ if not blocked:
return None
- start_response("403 Forbidden", [("Content-Type", "text/html; charset=utf-8")])
-
- template = self.JINJA_ENV.get_template("viahtml/blocked_page.html.jinja2")
- content = template.render(reason=hits.reason_codes[0], url_to_annotate=url)
- return [content.encode("utf-8")]
+ # Redirect the user to the presentation URL given to us by Checkmate
+ start_response(
+ "307 Temporary Redirect", [("Location", blocked.presentation_url)]
+ )
+ return []