diff --git a/onionshare/web/web.py b/onionshare/web/web.py index 1e040b54..1d2a3fec 100644 --- a/onionshare/web/web.py +++ b/onionshare/web/web.py @@ -164,15 +164,6 @@ class Web(object): return "" abort(404) - @self.app.route("/noscript-xss-instructions") - def noscript_xss_instructions(): - """ - Display instructions for disabling Tor Browser's NoScript XSS setting - """ - r = make_response(render_template('receive_noscript_xss.html', - static_url_path=self.static_url_path)) - return self.add_security_headers(r) - def error401(self): auth = request.authorization if auth: diff --git a/share/static/css/style.css b/share/static/css/style.css index e445e5de..f2ded524 100644 --- a/share/static/css/style.css +++ b/share/static/css/style.css @@ -222,20 +222,3 @@ li.info { color: #666666; margin: 0 0 20px 0; } - -div#noscript { - text-align: center; - color: #d709df; - padding: 1em; - line-height: 150%; - margin: 0 auto; -} - -div#noscript a, div#noscript a:visited { - color: #d709df; -} - -.disable-noscript-xss-wrapper { - max-width: 900px; - margin: 0 auto; -} diff --git a/share/static/img/warning.png b/share/static/img/warning.png deleted file mode 100644 index 9be8cbaf..00000000 Binary files a/share/static/img/warning.png and /dev/null differ diff --git a/share/static/js/receive-noscript.js b/share/static/js/receive-noscript.js deleted file mode 100644 index 0f4ac1bc..00000000 --- a/share/static/js/receive-noscript.js +++ /dev/null @@ -1,2 +0,0 @@ -// Hide the noscript div, because our javascript is executing -document.getElementById('noscript').style.display = 'none'; diff --git a/share/templates/receive.html b/share/templates/receive.html index 23242501..59a3ebe4 100644 --- a/share/templates/receive.html +++ b/share/templates/receive.html @@ -13,19 +13,6 @@
- Warning: Due to a bug in Tor Browser and Firefox, uploads
- sometimes never finish. To upload reliably, either set your Tor Browser
- security slider
- to Standard or
- turn off your Tor Browser's NoScript XSS setting.
Send Files
@@ -51,7 +38,6 @@If your security slider is set to Safest, JavaScript is disabled so XSS vulnerabilities won't affect you, - which makes it safe to disable NoScript's XSS protections.
- -Here is how to disable this setting:
- -If you'd like to learn technical details about this issue, check - this issue - on GitHub.
-diff --git a/share/templates/receive_noscript_xss.html b/share/templates/receive_noscript_xss.html deleted file mode 100644 index 84d35ba1..00000000 --- a/share/templates/receive_noscript_xss.html +++ /dev/null @@ -1,35 +0,0 @@ - - -
-
- - - -
-