540 Commits

Author SHA1 Message Date
Miguel Jacq
80a70a6fc6 remove unused variable 2018-10-02 07:33:13 +10:00
Miguel Jacq
7fc4f97b2a remove uploads_in_progress list from web side 2018-10-01 19:18:50 +10:00
Miguel Jacq
c8fc6d7f85 Another unused variable 2018-10-01 19:17:50 +10:00
Miguel Jacq
eeedd32793 remove unused variable, whitespace 2018-10-01 19:15:58 +10:00
Miguel Jacq
d267cc597d Fix logic for handling an upload still in progress when timer runs out. Show thankyou page for last uploader post-timer expiry 2018-10-01 18:42:53 +10:00
Miguel Jacq
d69bba4c9d Merge develop in and fix upload/timer functionality so that it works as described. Still needs fixing to not throw a connection error to the lucky last uploader after their upload completes and server stops due to expiry having passed 2018-10-01 16:42:54 +10:00
Micah Lee
bdf91361b4 Keep trying ports until it finds a free one 2018-09-27 21:22:10 -07:00
Micah Lee
c7901e1628 Merge pull request #789 from mig5/show_v3_onion_support
Show whether Tor version supports next-gen onion support
2018-09-26 17:09:34 -07:00
Miguel Jacq
112a7a25d1 Show whether Tor version supports next-gen onion support 2018-09-25 15:26:19 +10:00
Miguel Jacq
b465d9db85 Analyse the right file size to determine if the download has finished in the UI (in order to decide whether to stop server yet) 2018-09-25 14:40:10 +10:00
Micah Lee
a8779d9c4f Access .upload_count from the correct object after the web refactor 2018-09-21 17:42:36 -07:00
Micah Lee
b96b36122d Actually tell the GUI the progess 2018-09-21 17:08:11 -07:00
Micah Lee
33d7e112b7 Merge branch 'develop' into 663_zip_away 2018-09-21 16:23:49 -07:00
Micah Lee
fa20d7685b Dynamically figure out the total size of the download based on the whether or not the client making the http request accepts gzip 2018-09-21 16:22:37 -07:00
Micah Lee
5e942152a2 Remove the 'using_ephemeral' string 2018-09-21 15:11:18 -07:00
Micah Lee
20d950e142 Remove no_filenames string, and instead display CLI usage if you don't specify filenames 2018-09-21 13:58:42 -07:00
Micah Lee
e941ce0fd7 If only sharing one file, compress it with gzip, and serve it with gzip compression if the browser supports it 2018-09-21 12:29:23 -07:00
Micah Lee
5003d44cfb Pass common into ShareModeWeb and ReceiveModeWeb 2018-09-21 11:41:49 -07:00
Micah Lee
4127aa4d71 Move more mode-specific logic out of the Web class and into the approprate mode web classes 2018-09-21 11:36:19 -07:00
Micah Lee
05a2ee0559 Refactor the CLI main function to explicitly use 'share' or 'receive' mode 2018-09-21 11:19:36 -07:00
Micah Lee
916c5ed197 Refactor web even more to all of the share and receive web logic into ShareModeWeb and ReceiveModeWeb classes 2018-09-21 11:14:32 -07:00
Micah Lee
4f27fac840 Refactor web to push share and receive mode logic into their respective files 2018-09-20 23:58:27 -07:00
Micah Lee
48ec4ad583 Split the web module into different files for receive mode and share mode logic 2018-09-20 23:43:04 -07:00
Micah Lee
fe0657128b Make web a module, so I can split it into multiple files 2018-09-20 23:31:52 -07:00
Micah Lee
0ea31d39f7 Only add the download_filename to cleanup_filenames (which get deleted) if the file is zipped up. Otherwise, OnionShare deletes the original file 2018-09-20 23:18:17 -07:00
Micah Lee
017ee5250d When there is only 1 file being shared, don't zip it 2018-09-20 09:14:56 -07:00
Miguel Jacq
dddf5a9a09 Throw a 403 on the index pages if the timer has run out but an upload is in progress 2018-09-20 11:33:37 +10:00
Miguel Jacq
4ebb0a3d57 Log the public_mode flag as well 2018-09-19 14:53:33 +10:00
Miguel Jacq
43a8afae9c Merge pull request #758 from micahflee/665_cancel_compression
Fix zip progress bar not canceling problem
2018-09-19 10:59:11 +10:00
Micah Lee
04432a5cfa Tor version must actually be 0.3.3.1 for ephemeral v3 onion services 2018-09-18 17:31:40 -07:00
Micah Lee
739d48a183 Properly handle exceptions in CLI, and pass the actual exception message in TorErrorProtocolError exceptions 2018-09-18 17:17:25 -07:00
Micah Lee
f3998d2f3d Remove some debug logs 2018-09-18 16:58:16 -07:00
Micah Lee
901ecb6adc Set self.cancel_compression to false in the set_file_info() function instead of Web's constructor, so it gets reset every time 2018-09-18 16:28:54 -07:00
Micah Lee
1dab03abbd Make Web.set_file_info return False on cancel 2018-09-18 13:42:13 -07:00
Micah Lee
0dc03ecd4c Refactor all of the threading.Threads into QThreads, and quit them all when canceling the server. When canceling the compression thread, specifically mass a cancel message into the Web and ZipWriter objects to make the bail out on compression early 2018-09-17 20:55:54 -07:00
Micah Lee
06463bab7b Make separate function for comparing the slug and comparing the shutdown_slug, to prevent 404 errors on the shutdown request 2018-09-17 17:42:21 -07:00
Miguel Jacq
58259d4500 Fix conflict 2018-09-18 10:26:16 +10:00
Micah Lee
6f93000724 Merge branch 'develop' into receiver-mode-gui 2018-09-17 16:15:08 -07:00
Micah Lee
2c80a74467 Make what's this links use the same string, and change their style 2018-09-17 16:11:52 -07:00
Miguel Jacq
551e7e97ca 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)" 2018-09-18 08:36:07 +10:00
Miguel Jacq
2e6bd74fa8 Hold a share open if its timer hsa expired but a file is still uploading. Don't allow other uploads during this time 2018-09-17 17:42:04 +10:00
Micah Lee
e4d5a74cca Monkeypatch flask to suppress output that isn't applicable to OnionShare 2018-09-15 22:04:08 -07:00
Miguel Jacq
10771de2f8 Fix conflicts 2018-09-16 13:37:22 +10:00
Micah Lee
8769cf7c97 Check for public_mode in the check_slug_candidate function, to make 404 errors work again during public mode 2018-09-15 19:47:42 -07:00
Miguel Jacq
3a9c4fa165 Fix conflict in tests 2018-09-15 12:07:01 +10:00
Micah Lee
905a444099 Merge branch 'develop' into receiver-mode-gui 2018-09-14 18:59:36 -07:00
Micah Lee
5661015acb Merge branch '685_use_dist_socks' of https://github.com/mig5/onionshare into mig5-685_use_dist_socks 2018-09-14 18:40:26 -07:00
Miguel Jacq
6586cf6df9 Don't check slug candidate in public mode 2018-09-15 11:36:34 +10:00
Miguel Jacq
ab80440a3c Fixing a future check for persistent v3 onions (still disabled for now) 2018-09-13 16:35:24 +10:00
Miguel Jacq
81db9d3264 More clarity for the returned values in generate_v3_private_key(), also more consistent with generate_v2_private_key() 2018-09-13 12:29:48 +10:00