514 Commits

Author SHA1 Message Date
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
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
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
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
Miguel Jacq
4a55b7a13b Refactor the onionkey stuff to be more like @maqp's revised version (thanks) 2018-09-13 12:21:38 +10:00
Miguel Jacq
1e29a12221 Use the distribution's PySocks module instead of our custom version 2018-09-04 14:26:47 +10:00
Miguel Jacq
b0d2183a3e Fix conflict from receiver-mode-gui branch 2018-09-04 11:48:39 +10:00
Micah Lee
b37f9272c7 Merge branch 'receive_mode_styling' of https://github.com/mig5/onionshare into mig5-receive_mode_styling 2018-09-02 23:01:06 -07:00
Miguel Jacq
8c31505b90 Rather than hide persistence/stealth mode altogether if the Tor version is high enough for v3, give the user the option to 'use legacy v2 onions' in Settings dialog, so that they may continue to use persistence etc 2018-08-22 11:45:08 +10:00
Miguel Jacq
5252d5d94a Introduce v3 onion support 2018-08-21 19:31:02 +10:00
Miguel Jacq
e89a74729b Expand 'public mode' (optional slugs) to be possible for sharing too, not just receiving, with no rate-limiting/self-destruct on invalid routes. 2018-07-21 17:06:11 +10:00
Miguel Jacq
a6bc01533b #691 remove meek_lite Amazon 2018-07-21 15:52:11 +10:00
Miguel Jacq
194478f346 Improve styling of flash() messages by using categories, and style the closed.html. Replace references to 'Uploading' with 'Sending' for consistency 2018-07-17 11:45:14 +10:00
Miguel Jacq
cb47c34942 Fix minor spelling/grammar issues 2018-07-14 16:43:21 +10:00
Micah Lee
48e9beb1bb Merge branch 'license' into develop 2018-06-18 19:29:03 -07:00
Micah Lee
e05cee19bc Update OnionShare copyright year to 2018 2018-06-17 16:53:44 -07:00
Micah Lee
e1958193ff Improve the CLI output for receive mode 2018-05-20 15:20:21 -07:00
Micah Lee
4505b348d9 Only mark a file upload complete when it closes, which makes the open folder button appear 2018-05-20 13:13:06 -07:00
Micah Lee
9f4e287b4b Remove REQUEST_UPLOAD_NEW_FILE_STARTED event, because it's not actually needed 2018-05-20 12:07:15 -07:00
Micah Lee
e5ff9c225f Make the receive.html template not use slugs if receive_public_mode is True, and fix some bugs with receive routes 2018-05-20 11:16:09 -07:00
Micah Lee
d8d1dc800d Allow file uploads to finish, and improve uploads styling 2018-05-19 22:58:55 -07:00
Micah Lee
28fe7a4cf5 Refactor uploads GUI so that each upload POST has one progess bar, and a list of files, with partial styling 2018-05-19 22:36:08 -07:00
Micah Lee
9ec783c6a2 Fix bug where ReceiveModeRequest was not recognizing an upload request if the POST included a slug when receive_public_mode == True 2018-05-19 21:20:51 -07:00
Micah Lee
0b5a5d08dd Move downloads_dir validation into the /upload request in Web, and display an error in both CLI and GUI 2018-05-19 21:11:57 -07:00
Micah Lee
f9f0086226 Move downloads dir validation into Common 2018-05-19 20:51:01 -07:00
Micah Lee
833c02b4d5 ReceiveModeRequest should only deal with upload_ids for upload requests, not for other requests 2018-05-08 13:35:50 -07:00
Micah Lee
1db37e13f5 Start making Web events actually put Upload objects into Uploads 2018-05-07 23:07:11 -07:00
Micah Lee
26a94fa161 Make receive mode events just like share mode, and rename REQUEST_DOWNLOAD to REQUEST_SHARE 2018-05-07 22:15:29 -07:00
Micah Lee
613c3dfbd6 Move all stylesheets definitions into Common, so now we no longer have blocks of css spread across the GUI code, and it's easier to re-use stylesheets 2018-05-07 16:21:22 -07:00
Micah Lee
7a71c4376a Remove --shutdown-timeout as an option for onionshare_gui, since GUI options are set in the settings dialog. Also fixed a bug where --local-only and --shutdown-timeout were not compatible in onionshare CLI 2018-05-04 16:43:30 -07:00