summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorMiguel Jacq <mig@mig5.net>2018-09-18 08:35:58 +1000
committerMiguel Jacq <mig@mig5.net>2018-09-18 08:36:07 +1000
commit7e875e021a34bc63ddee8d48b32c918d9561f7c0 (patch)
treeb96f0b74720dc47b244e6f29f8b31216eaf82185 /share
parentb06fd8af26682f394ad1f075fce41ce9aeea04a1 (diff)
downloadonionshare-7e875e021a34bc63ddee8d48b32c918d9561f7c0.tar.gz
onionshare-7e875e021a34bc63ddee8d48b32c918d9561f7c0.zip
Remove unnecessary loop. Remove the Close route/setting which can DoS another running upload. Fix detecting whether any uploads are still in progress before terminating the service after timer expires. Don't register 404s for uploads after expiry has finished (throw a 403 instead)"
Diffstat (limited to 'share')
-rw-r--r--share/locale/en.json1
-rw-r--r--share/templates/403.html16
-rw-r--r--share/templates/receive.html9
3 files changed, 16 insertions, 10 deletions
diff --git a/share/locale/en.json b/share/locale/en.json
index beebac77..98addae9 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -168,7 +168,6 @@
"gui_settings_receiving_label": "Receiving options",
"gui_settings_downloads_label": "Save files to",
"gui_settings_downloads_button": "Browse",
- "gui_settings_receive_allow_receiver_shutdown_checkbox": "Receive mode can be stopped by the sender",
"gui_settings_public_mode_checkbox": "OnionShare is open to the public\n(don't prevent people from guessing the OnionShare address)",
"systray_close_server_title": "OnionShare Server Closed",
"systray_close_server_message": "A user closed the server",
diff --git a/share/templates/403.html b/share/templates/403.html
new file mode 100644
index 00000000..df81f3e7
--- /dev/null
+++ b/share/templates/403.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>OnionShare: 403 Forbidden</title>
+ <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" />
+ <link href="/static/css/style.css" rel="stylesheet" type="text/css" />
+ </head>
+ <body>
+ <div class="info-wrapper">
+ <div class="info">
+ <p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p>
+ <p class="info-header">You are not allowed to perform that action at this time.</p>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/share/templates/receive.html b/share/templates/receive.html
index d8b02f73..e85b6ff9 100644
--- a/share/templates/receive.html
+++ b/share/templates/receive.html
@@ -34,14 +34,5 @@
</form>
</div>
</div>
- {% if receive_allow_receiver_shutdown %}
- {% with messages = get_flashed_messages() %}
- {% if messages %}
- <form method="post" action="{{ close_action }}">
- <input type="submit" class="close-button" value="I'm Finished Sending" />
- </form>
- {% endif %}
- {% endwith %}
- {% endif %}
</body>
</html>