diff options
| author | Micah Lee <micah@micahflee.com> | 2019-05-20 19:04:50 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2019-05-20 19:04:50 -0700 |
| commit | 79b87c3e30480708af6d824a19430d24d2693dd4 (patch) | |
| tree | 62e221785ef80d963138c062575e2bcdf3240748 /onionshare_gui | |
| parent | 2a50bbc3bc3324d9aca3b1ac3e57ae8fd9eee08c (diff) | |
| download | onionshare-79b87c3e30480708af6d824a19430d24d2693dd4.tar.gz onionshare-79b87c3e30480708af6d824a19430d24d2693dd4.zip | |
Add an error 401 handler, and make it start counting invalid password guesses instead of 404 errors for rate limiting
Diffstat (limited to 'onionshare_gui')
| -rw-r--r-- | onionshare_gui/mode/receive_mode/__init__.py | 2 | ||||
| -rw-r--r-- | onionshare_gui/mode/share_mode/__init__.py | 2 | ||||
| -rw-r--r-- | onionshare_gui/mode/website_mode/__init__.py | 2 | ||||
| -rw-r--r-- | onionshare_gui/onionshare_gui.py | 5 |
4 files changed, 7 insertions, 4 deletions
diff --git a/onionshare_gui/mode/receive_mode/__init__.py b/onionshare_gui/mode/receive_mode/__init__.py index 4c0b49ba..d6b1c0f3 100644 --- a/onionshare_gui/mode/receive_mode/__init__.py +++ b/onionshare_gui/mode/receive_mode/__init__.py @@ -113,7 +113,7 @@ class ReceiveMode(Mode): """ # Reset web counters self.web.receive_mode.upload_count = 0 - self.web.error404_count = 0 + self.web.reset_invalid_slugs() # Hide and reset the uploads if we have previously shared self.reset_info_counters() diff --git a/onionshare_gui/mode/share_mode/__init__.py b/onionshare_gui/mode/share_mode/__init__.py index 1ee40ca3..f51fd0bb 100644 --- a/onionshare_gui/mode/share_mode/__init__.py +++ b/onionshare_gui/mode/share_mode/__init__.py @@ -147,7 +147,7 @@ class ShareMode(Mode): """ # Reset web counters self.web.share_mode.download_count = 0 - self.web.error404_count = 0 + self.web.reset_invalid_slugs() # Hide and reset the downloads if we have previously shared self.reset_info_counters() diff --git a/onionshare_gui/mode/website_mode/__init__.py b/onionshare_gui/mode/website_mode/__init__.py index 9018f5cb..c6009ebe 100644 --- a/onionshare_gui/mode/website_mode/__init__.py +++ b/onionshare_gui/mode/website_mode/__init__.py @@ -143,7 +143,7 @@ class WebsiteMode(Mode): """ # Reset web counters self.web.website_mode.visit_count = 0 - self.web.error404_count = 0 + self.web.reset_invalid_slugs() # Hide and reset the downloads if we have previously shared self.reset_info_counters() diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index 9fdf9395..4945ca7e 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -472,7 +472,10 @@ class OnionShareGui(QtWidgets.QMainWindow): if event["type"] == Web.REQUEST_OTHER: if event["path"] != '/favicon.ico' and event["path"] != "/{}/shutdown".format(mode.web.shutdown_slug): - self.status_bar.showMessage('[#{0:d}] {1:s}: {2:s}'.format(mode.web.error404_count, strings._('other_page_loaded'), event["path"])) + self.status_bar.showMessage('{0:s}: {1:s}'.format(strings._('other_page_loaded'), event["path"])) + + if event["type"] == Web.REQUEST_INVALID_SLUG: + self.status_bar.showMessage('[#{0:d}] {1:s}: {2:s}'.format(mode.web.invalid_slugs_count, strings._('invalid_slug_guess'), event["data"])) mode.timer_callback() |