Micah Lee
174de57405
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
7c5d154519
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
c3755389dd
Fix conflict
2018-09-18 10:26:16 +10:00
Micah Lee
6efc281fbb
Merge branch 'develop' into receiver-mode-gui
2018-09-17 16:15:08 -07:00
Micah Lee
359e470383
Make what's this links use the same string, and change their style
2018-09-17 16:11:52 -07:00
Miguel Jacq
7e875e021a
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
b06fd8af26
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
f90e96e21a
Monkeypatch flask to suppress output that isn't applicable to OnionShare
2018-09-15 22:04:08 -07:00
Miguel Jacq
3a7ae401af
Fix conflicts
2018-09-16 13:37:22 +10:00
Micah Lee
9815c612eb
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
8bb75cc530
Fix conflict in tests
2018-09-15 12:07:01 +10:00
Micah Lee
8312058fcc
Merge branch 'develop' into receiver-mode-gui
2018-09-14 18:59:36 -07:00
Micah Lee
2605967011
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
e54a1473ce
Don't check slug candidate in public mode
2018-09-15 11:36:34 +10:00
Miguel Jacq
25eed81b00
Fixing a future check for persistent v3 onions (still disabled for now)
2018-09-13 16:35:24 +10:00
Miguel Jacq
0b0eef7245
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
8955ce0699
Refactor the onionkey stuff to be more like @maqp's revised version (thanks)
2018-09-13 12:21:38 +10:00
Miguel Jacq
45a5a2ae63
Use the distribution's PySocks module instead of our custom version
2018-09-04 14:26:47 +10:00
Miguel Jacq
11bf059015
Fix conflict from receiver-mode-gui branch
2018-09-04 11:48:39 +10:00
Micah Lee
f83aa3cffb
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
5c8b0d7796
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
2de9359629
Introduce v3 onion support
2018-08-21 19:31:02 +10:00
Miguel Jacq
3b45f93dbe
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
a830eb57fe
#691 remove meek_lite Amazon
2018-07-21 15:52:11 +10:00
Miguel Jacq
4092a65e0c
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
69ae29272c
Fix minor spelling/grammar issues
2018-07-14 16:43:21 +10:00
Micah Lee
1ad68c46d4
Merge branch 'license' into develop
2018-06-18 19:29:03 -07:00
Micah Lee
9344fbd274
Update OnionShare copyright year to 2018
2018-06-17 16:53:44 -07:00
Micah Lee
96a680e05d
Improve the CLI output for receive mode
2018-05-20 15:20:21 -07:00
Micah Lee
d6ce902eb6
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
18573ba49c
Remove REQUEST_UPLOAD_NEW_FILE_STARTED event, because it's not actually needed
2018-05-20 12:07:15 -07:00
Micah Lee
9857d9fce8
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
7a571764ef
Allow file uploads to finish, and improve uploads styling
2018-05-19 22:58:55 -07:00
Micah Lee
ee9c0d0abb
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
caf87b8d96
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
db7d5a6552
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
c23ab77a58
Move downloads dir validation into Common
2018-05-19 20:51:01 -07:00
Micah Lee
841e47b234
ReceiveModeRequest should only deal with upload_ids for upload requests, not for other requests
2018-05-08 13:35:50 -07:00
Micah Lee
eb3d6f2171
Start making Web events actually put Upload objects into Uploads
2018-05-07 23:07:11 -07:00
Micah Lee
591e97a57a
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
4d5f1a34cd
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
7b25ae1d6b
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
Micah Lee
e32e850548
Fix stay_open regression bug. Before, it was closing automatically even when the setting wasn't set. Also, remove the --stay-open option from the GUI, since GUI settings are set in the settings dialog not cli args
2018-05-04 16:35:32 -07:00
Micah Lee
86f1fb223e
Add a few receive mode web tests, to test the receive_allow_receiver_shutdown and receive_public_mode settings
2018-04-29 18:19:00 -07:00
Micah Lee
7ec993d2e0
Implemented test: test_share_mode_close_after_first_download
2018-04-29 18:00:10 -07:00
Micah Lee
b6a15cf6c7
Display the URL without the slug for receive_public_mode in the CLI
2018-04-29 16:44:45 -07:00
Micah Lee
9a076635c5
Make the "download page loaded" and "upload page loaded" messages displayed as systray notifications instead of in the status bar, and make it work for Receive Mode
2018-04-29 16:41:05 -07:00
Micah Lee
4f89082f18
Add support for receive mode's "public mode", which doesn't use a slug. Still needs more testing
2018-04-29 16:33:48 -07:00
Micah Lee
6cfb7026da
Display desktop notification to the user when the receiver closes the server, and finish up closing the server
2018-04-29 15:49:18 -07:00
Micah Lee
996df24646
Make receive_allow_receiver_shutdown setting work
2018-04-29 15:34:11 -07:00
Micah Lee
6632a4b426
Add two new receive mode settings: receive_allow_receiver_shutdown and receive_public_mode
2018-04-28 21:08:53 -07:00
Micah Lee
1a4aaa70fa
Fix a race condition where the URL was sometimes getting copied to the clipboard before it was actually generated, causing a crash
2018-04-28 15:00:23 -07:00
Micah Lee
1456361566
Generalize the handling of Tor exceptions, more logging in Web
2018-04-28 13:59:36 -07:00
Micah Lee
406515085e
Fixed crash when starting recieve mode server
2018-04-27 23:19:46 -07:00
Micah Lee
c6a2cab529
Make Web's the REQUEST_ constants static attributes
2018-04-26 11:00:59 -07:00
Micah Lee
9e9f65572b
Instead of creating a Web object and passing it into OnionShareGui, now each mode creates its own separate Web object, instantiated in its own way
2018-04-26 09:30:53 -07:00
Micah Lee
4b957f3271
Merge branch 'receiver-mode' into receiver-mode-gui
2018-04-24 17:22:06 -07:00
Micah Lee
aa8c07c434
In CLI recieve mode, tell the user where to look for uploaded files
2018-04-24 17:18:18 -07:00
Micah Lee
b6b61f753d
Update GPL copyright year
2018-04-24 10:07:59 -07:00
Micah Lee
2ee7e74236
Remove the desktop notification setting -- everyone gets them now
2018-04-24 09:26:06 -07:00
Micah Lee
91536ea571
Fix a few bugs that I missed when merging in develop
2018-04-22 17:46:14 -07:00
Micah Lee
bd7305ab16
Add new WSGI middleware just to attach the Web object to environ, and improve the UI of file upload progress
2018-03-21 18:27:42 -07:00
Micah Lee
f7640416eb
Remove the WSGI middleware, because I'm solving the problem in a different way
2018-03-21 17:51:42 -07:00
Micah Lee
facd441caf
For receive mode, use a custom flask Request, and a custom TemporaryFile, in order to keep track of file upload progress
2018-03-21 17:34:11 -07:00
Micah Lee
aafa9b1543
Add WSGI middleware in order to capture the progress of POST request uploads
2018-03-19 02:25:22 -07:00
Micah Lee
fee1d49563
Fix bug with shutdown_slug
2018-03-14 08:33:25 -07:00
Micah Lee
72698a7247
Display a template after closing the server, and standardize the style of other simple templates
2018-03-14 08:30:14 -07:00
Micah Lee
01f86daf8f
In receive mode, allow uploader to close the server when they are done
2018-03-14 08:16:09 -07:00
Micah Lee
0b10e71547
Add receive mode warning, and print notification for each upload, in CLI mode
2018-03-14 07:35:04 -07:00
Micah Lee
01dd16d92f
Uploading files works in CLI
2018-03-14 04:03:50 -07:00
Micah Lee
000d9620c1
Add flash messages to receive template, and begin implementing upload POST
2018-03-13 05:50:26 -07:00
Micah Lee
8e82c07039
Fixed bug in validating downloads dir related to moving settings into common
2018-03-13 03:59:52 -07:00
Micah Lee
76d299a6c9
Move settings into the Common object, so the settings are available to all objects (including Web, which is required for receive mode)
2018-03-13 03:28:47 -07:00
Micah Lee
c2fecf8aa4
Fix tests after refactoring Common
2018-03-13 02:22:26 -07:00
Micah Lee
50409167d4
Completely refactor common to make a Common class, and pass that class down into all parts of the program
2018-03-08 10:18:31 -08:00
Micah Lee
49e352d131
Rename close_after_seconds class to ShutdownTimer
2018-03-08 05:50:23 -08:00
Micah Lee
2e6538b7f8
Move ZipWriter from common into web, because that's the only place it's used
2018-03-08 05:45:07 -08:00
Micah Lee
878dd4f880
In CLI, validate downloads_dir when starting in receive mode
2018-03-06 07:40:57 -08:00
Micah Lee
e980bc153b
Change default receive mode download directory to ~/OnionShare
2018-03-06 05:25:49 -08:00
Micah Lee
5d42e76eb8
Show different message for receive mode than for send mode
2018-03-06 03:24:17 -08:00
Micah Lee
649afa2fad
Move (optional) javascript into file, and use CSP to ban inline js
2018-03-06 03:17:54 -08:00
Micah Lee
4606a3ad3a
Stop using inline css, and reorganize static folder
2018-03-06 03:03:24 -08:00
Micah Lee
ce852fc60a
Create separate templates and static folder, and make the web app use both of these. Yay, now we have real static resources
2018-03-06 02:54:12 -08:00
Micah Lee
baede53632
Make separate template for send and receive mode
2018-03-06 02:06:44 -08:00
Micah Lee
fa9f714651
Make separate routes for send and receive modes
2018-03-06 01:50:43 -08:00
Micah Lee
4a0c6e8dcd
Refactor OnionShareGui to use new Web class
2018-03-06 00:56:40 -08:00
Micah Lee
0cec696055
Refactor web.py to move all the web logic into the Web class, and refactor onionshare (cli) to work with it -- but onionshare_gui is currently broken
2018-03-05 11:06:59 -08:00
Micah Lee
cd1a1d9638
Web needs to know about receive mode, not the OnionShare object
2018-03-05 08:48:04 -08:00
Micah Lee
383ccb94fc
Add downloads_dir to settings, make it default to ~/Downloads
2018-03-05 07:52:51 -08:00
Micah Lee
18ac830a9e
Add command line flag for receive mode
2018-03-05 07:45:10 -08:00
Micah Lee
49fa2805e7
Merge branch 'cancel_share' of https://github.com/mig5/onionshare into mig5-cancel_share
2018-02-25 16:14:59 -08:00
Miguel Jacq
096c202362
Add ability to cancel a share
2018-02-25 17:44:27 +11:00
Micah Lee
79b461d071
Merge branch 'develop' into 641_fix_images_windows
2018-02-24 19:40:23 -08:00
Micah Lee
3797e9e203
When using <img>, put the src in quotes. Otherwise the filename is likely to have spaces in it, and the <img> src will break. Also, in Windows use backslashes for local resources instead of forward slashes
2018-02-24 18:38:40 -08:00
Micah Lee
e76b1e0c28
Merge branch 'remove_platform_re' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-remove_platform_re
2018-02-24 17:56:35 -08:00
Miguel Jacq
cff267c09c
Revert the cancel feature that causes issues at least on macOS ( #637 )
2018-02-25 12:31:32 +11:00
delirious-lettuce
641fec7c05
Remove use of re module by using str.endswith
2018-02-24 15:44:23 -07:00
Miguel Jacq
dface51dd0
Merge pull request #588 from micahflee/ux-update
...
Major user experience update
2018-02-25 08:27:46 +11:00
Micah Lee
bb3f18ee00
Merge branch 'develop' of https://github.com/irykoon/onionshare into irykoon-develop
2018-02-22 16:57:06 -08:00
Micah Lee
3d1c0eabc4
Merge branch 'develop' into mig5-info_widgets_download_info
2018-02-19 18:02:51 -08:00
Micah Lee
5ac6bb783f
Merge branch 'sortable_tables' of https://github.com/mig5/onionshare into mig5-sortable_tables
2018-02-19 16:45:58 -08:00
Miguel Jacq
b7df7f8dc9
merge ux-update in, and fix conflict
2018-02-20 07:47:21 +11:00
Miguel Jacq
6791e59aa5
reset done to False if a download is still in progress
2018-02-19 12:47:21 +11:00
irykoon
b2c310f2e0
Support meek_lite Pluggable Transport
...
Currently, meek/meek_lite is one of the few, if not only, mature pluggable transport that works in some heavily cenosored areas, for example, China. Therefore, this can be a nice feature to have.
2018-02-15 23:19:53 +00:00
Miguel Jacq
062101fcbf
Make table sortable with javascript (if enabled)
2018-02-14 16:56:03 +11:00
Miguel Jacq
267aa7dfec
Pass the correct parameter to remove_ephemeral_hidden_service()
...
Add debug logs to verify if an onion was successfully deleted or not
2018-02-12 13:43:36 +11:00
Miguel Jacq
145293d3cc
Fix function name remove_ephemeral_onion_service
2018-02-12 13:17:31 +11:00
Micah Lee
d3848a25ec
Redesigned HTML/CSS download page
2018-02-10 16:19:23 -08:00
Micah Lee
a7ab1d7e6e
Add onionshare favicon to all HTML pages
2018-02-10 12:50:23 -08:00
Miguel Jacq
39954c6ee8
Allow the user to cancel a share that is still starting up
2018-02-09 18:43:57 +11:00
Micah Lee
05633673fc
Move auto-stop timer into settings, so its UI does not show up unless the user specifically enables that feature
2018-02-07 09:55:55 -08:00
Miguel Jacq
d1ce17cf5f
Merge pull request #585 from torbsd/openbsd-port-patches-2
...
Second attempt at patches for an OpenBSD port
2018-02-07 16:54:00 +11:00
attila
bc8f233db9
Update patch as per the suggestion by @mig5 on
...
https://github.com/micahflee/onionshare/pull/585
Tested on current snapshot, both gui and cli work
2018-02-06 16:39:04 -05:00
attila
ae494c8e33
Second attempt at patches for an OpenBSD port, this time based off of 1.2
...
and after feedback from the upstream and other contributors at
https://github.com/micahflee/onionshare/pull/489
2018-02-05 18:06:37 -05:00
Miguel Jacq
16bd3291e3
Support for obfs4 in custom bridges
2018-01-19 15:31:11 +11:00
Miguel Jacq
206472cb78
load Settings in onionshare/__init__.py before we initiate the web thread, since it needs to send the saved slug to the web server
2018-01-18 22:42:43 +11:00
Micah Lee
f499b126cc
Temporary fix for #550
2018-01-17 18:53:45 -08:00
Micah Lee
713e45084a
Merge branch '435_support_bridges' of https://github.com/mig5/onionshare into mig5-435_support_bridges
2018-01-17 16:19:30 -08:00
Miguel Jacq
9ed748db86
load the Settings in onionshare/__init__.py later, so that when saving slug, the private_key/hidservauth string have already been saved by the Onion object
2018-01-18 08:14:36 +11:00
Miguel Jacq
40ee114803
Extract tor and obfs4proxy executables from the main TorBrowser executable with 7-zip on Windows
2018-01-17 12:45:37 +11:00
Miguel Jacq
76cf0ae107
Fix conflicts arising from the reuse_private_key branch
2018-01-16 15:30:36 +11:00
Micah Lee
808c4cfac2
Merge branch 'check_is_valid_file' of https://github.com/mig5/onionshare into mig5-check_is_valid_file
2018-01-14 18:54:48 -08:00
Miguel Jacq
284213aa2d
support obfs4 via obfs4proxy on macOS
2018-01-15 12:49:29 +11:00
Miguel Jacq
3e7d4c64ff
Save the slug when using a persistent private key
2018-01-15 10:01:34 +11:00
Miguel Jacq
f656bafd4c
Catch the OSError in CLI mode when a file/folder can't be zipped up, and error out more gracefully
2018-01-14 20:36:43 +11:00
Miguel Jacq
d9e6650a19
Merge branch 'master' into check_is_valid_file
2018-01-14 20:24:02 +11:00
Miguel Jacq
bdb10b7eeb
Resolve conflict with upstream's onion.py
2018-01-14 18:53:46 +11:00
Miguel Jacq
448f6af796
Resolve conflict with upstream's onion.py
2018-01-14 18:49:49 +11:00
Miguel Jacq
4da5ddf2c9
Resolve conflict with upstream's onion.py
2018-01-14 18:45:10 +11:00
Micah Lee
a75faea407
Merge branch 'mig5-493_500_detect_broken_tor_connection'
2018-01-13 22:50:57 -08:00
Micah Lee
a73f1471a2
Better way to get the onion service_id
2018-01-13 19:18:33 -08:00
Micah Lee
597008d380
Merge branch '525_catch_failure_to_obtain_service_id' of https://github.com/mig5/onionshare into mig5-525_catch_failure_to_obtain_service_id
2018-01-13 19:09:03 -08:00
Micah Lee
ebbe490a65
Merge branch '493_500_detect_broken_tor_connection' of https://github.com/mig5/onionshare into mig5-493_500_detect_broken_tor_connection
2018-01-13 16:32:56 -08:00
Micah Lee
5e98a9c283
Merge branch 'Increasing-the-timeout' of https://github.com/Baccount/onionshare into Baccount-Increasing-the-timeout
2018-01-13 13:46:51 -08:00
Miguel Jacq
e90908c5b0
Move the saving of private key into the SettingsDialog and Onion objects entirely (no QPushButton to save it)
2018-01-13 20:58:24 +11:00
Micah Lee
36968a45cb
Merge branch 'master' of https://github.com/wondratsch/onionshare
2018-01-12 18:58:41 -08:00
Miguel Jacq
9b3963799e
catch error in start_onion_service in case we somehow failed to parse a service_id in Stem controller response
2018-01-02 16:35:48 +11:00
Miguel Jacq
2e5b9b37a9
4096 byte dir check is not consistent across platforms, remove it for now
2018-01-02 09:46:00 +11:00
Miguel Jacq
9154faf351
Check the file is a valid file or dir (not just that it exists)
2018-01-02 09:36:57 +11:00
Baccount
c324cd55da
Update onion.py
2017-12-26 22:53:44 -08:00
Miguel Jacq
6f4d7f7f44
Fixes for the edge case where Tor connection dialog is canceled, but the Tor process remains open in the background, which was causing onion.is_authenticated() to True. Remove excessive alerts
2017-12-21 14:08:13 +11:00
Miguel Jacq
b442b5d41b
Ensure we don't consider the Tor connection 'lost' if we're still in the connection dialog process (wait for that thread to finish).
...
Also various implementations of onion.is_authenticated() for a more robust check than onion.connected_to_tor,
which seemed to help some corner cases
2017-12-21 12:15:23 +11:00
Miguel Jacq
bcd4363769
#493 , #500 - detect if the Tor connection (bundled, TorBrowser or otherwise) has been lost while the app is open. Stop a running share if so
2017-12-21 09:22:53 +11:00
Miguel Jacq
890acf9f38
Let the Tor connection take a little longer (60s) if bridges are in use
2017-12-14 17:31:15 +11:00
Miguel Jacq
2a52b1a6ac
Forgot the UseBridges line for custom bridges
2017-12-11 16:20:42 +11:00
Miguel Jacq
4674f7d97b
Add bridge support (obfs4 or user-supplied)
2017-12-11 14:53:13 +11:00
Miguel Jacq
bec03bb10e
only set self.private_key after the Onion service has started, if we received a new one
2017-12-09 08:18:06 +11:00
Miguel Jacq
08c2e106f8
Save the HidServAuth string to settings when private key is also saved. Allow to copy it to clipboard from the SettingsDialog too.
2017-12-09 06:49:34 +11:00
wondratsch
8a905bc04c
add FreeBSD Support
2017-12-07 11:51:32 +01:00
Miguel Jacq
a12f9ed4d8
cleanup the ephemeral hidden service when GUI server is stopped, but don't disconnect from Tor
2017-12-07 16:10:52 +11:00
Miguel Jacq
e7dd78dba7
cleanup the ephemeral hidden service when GUI server is stopped, but don't disconnect from Tor
2017-12-07 16:08:03 +11:00
Miguel Jacq
796a4b3b5d
try and fix tests
2017-12-07 15:33:12 +11:00
Miguel Jacq
3a056803a9
Optionally save the private key of a running share to settings for reuse
2017-12-07 12:45:34 +11:00
Miguel Jacq
0aacfae925
Raise an error if we were unable to obtain a random port
2017-12-07 08:49:10 +11:00
wondratsch
1efe4a6949
fix typo
2017-12-06 12:57:47 +01:00
wondratsch
787877c12b
add OpenBSD Support
2017-12-06 12:47:47 +01:00
Miguel Jacq
eaa37206e5
Let the timer stop the share if there were no downloads, or all downloads are done
2017-12-05 11:18:26 +11:00
Miguel Jacq
91a0c60189
Better fix for preventing timeout firing if a download is not yet done (works for CLI as well as GUI)
2017-12-04 15:03:28 +11:00
Miguel Jacq
2eb7bca242
Merge master branch and fix conflicts
2017-12-03 17:06:33 +11:00
Micah Lee
9910ea5c72
Allow for localization for "Share via OnionShare" string in the nautilus extension
2017-12-01 12:57:18 -08:00
Micah Lee
e7a2b0a277
Merge branch '404_response' of https://github.com/mig5/onionshare into mig5-404_response
2017-11-30 18:01:18 -08:00
Micah Lee
2ab4b68bb7
Merge branch '442_use_looseversion' of https://github.com/mig5/onionshare into mig5-442_use_looseversion
2017-11-30 17:58:25 -08:00
Micah Lee
2da13ba1fa
Merge branch 'fixes' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-fixes
2017-11-30 17:54:24 -08:00
Micah Lee
d544a0341f
Allow tests to find share folders when building .deb
2017-11-20 16:19:04 -08:00
Miguel Jacq
624028e49f
Format the argparser output better, to deal with the longer argument names
2017-11-12 10:40:04 +11:00
Miguel Jacq
275f345604
better metavar for --shutdown-timeout arg
2017-11-11 17:12:10 +11:00
Miguel Jacq
f220058c63
No longer treating shutdown_timeout as a float, but an int of seconds
2017-11-09 19:50:50 +11:00
Miguel Jacq
877459a560
undo removal of newline in web.py
2017-11-09 18:01:09 +11:00
Miguel Jacq
bb46c2de99
send a HTTP 404 code instead of 200, on 404 pages
2017-11-09 17:51:34 +11:00
Miguel Jacq
481f33c822
use QDateTimeEdit instead of a spinbox for selecting a future date/time to auto-stop share
2017-11-09 11:29:55 +11:00
Miguel Jacq
a4b8a71c68
remove shutdown_timeout logic in the web server, it's not actually needed
2017-11-09 07:12:00 +11:00
Miguel Jacq
32108dcca2
Implements a shutdown timer to stop a share automatically (downloaded or not) after N hours
2017-11-08 20:25:59 +11:00
Miguel Jacq
53faa043f9
use LooseVersion instead of StrictVersion, so that upstream versions of Flask that contain -dev will still work. Fixes #442
2017-11-06 09:16:55 +11:00
Delirious Lettuce
0fb556baf2
Delete temporary tor data directory during cleanup
2017-07-13 18:14:49 -06:00
Delirious Lettuce
18545b7aa2
Reorder imports, spacing, use tempfile.gettempdir
2017-07-10 20:40:01 -06:00
Delirious Lettuce
56109a7012
Reorder imports, use json.load(f)
2017-07-10 20:13:30 -06:00
Delirious Lettuce
301465a49a
Reorder imports, remove p, use ext, use json.load(f)
2017-07-10 20:11:04 -06:00
Delirious Lettuce
52d16d21f7
Remove: unused import, round, formatting indexes. Use tuple
2017-07-10 20:00:19 -06:00
Miguel Jacq
b19f8fce52
Make it possible to supply a custom json settings file from somewhere else
2017-06-01 17:35:27 +10:00
Micah Lee
cd5d95a75d
Merge branch 'hmac_compare_digest' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-hmac_compare_digest
2017-05-30 14:50:19 -07:00
Micah Lee
da0a2d1930
Merge branch 'format_seconds' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-format_seconds
2017-05-30 11:44:44 -07:00
Delirious Lettuce
dfd40798fe
Remove constant_time_compare to use hmac.compare_digest
2017-05-28 13:38:33 -06:00
Delirious Lettuce
5880741c9d
Fix issue mentioned by @mig5
2017-05-26 10:12:11 -06:00
Delirious Lettuce
979242b478
Use divmod to simplify the calculations, seconds==0 -> '0s'
2017-05-24 22:20:50 -06:00
Delirious Lettuce
d4477ff617
* Use context manager inside of get_available_port
...
* Rearrange imports, one per line
* Reuse original `import random` for `random.SystemRandom` (instead of a separate `from random import SystemRandom`)
* Two blank lines above each function definition
2017-05-24 21:20:07 -06:00
Micah Lee
5c02bbffa3
Merge branch 'build_slug' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-build_slug
2017-05-24 14:04:06 -07:00
Micah Lee
3e329b1bac
Merge branch 'fix_shutdown_from_gui' of https://github.com/mig5/onionshare into mig5-fix_shutdown_from_gui
2017-05-24 14:00:50 -07:00
Delirious Lettuce
bf7735821c
Removing '\n' arg negates the need for wordlist.remove(), renamed unused variable 'x' to '_'
2017-05-24 13:22:41 -06:00
Micah Lee
befc253d4b
Fix indenting
2017-05-23 15:16:27 -07:00
Miguel Jacq
36de1951e7
open files via the 'with' statement, to avoid ResourceWarnings on unclosed files
2017-05-23 21:22:14 +10:00
Micah Lee
02216f246b
Merge branch '285_systray_notifications' of https://github.com/mig5/onionshare into mig5-285_systray_notifications
2017-05-22 16:15:06 -07:00
Micah Lee
a513c8b6df
Don't load strings directly in the web module. It isn't needed anymore, and it's preventing tests from passing in travis-ci
2017-05-22 15:02:22 -07:00
Micah Lee
174c03e892
Remove version string from http response headers, to avoid any information disclosure about the sender's server
2017-05-22 14:58:23 -07:00
Micah Lee
e01716bca9
Merge branch '253-security-headers' of https://github.com/mig5/onionshare into mig5-253-security-headers
2017-05-22 14:56:32 -07:00
Miguel Jacq
3766a6048d
Add desktop notification messages on download events (via systray)
2017-05-22 16:47:23 +10:00
Miguel Jacq
16f4d5f3ca
use the actual OnionShare version as the Server header string
2017-05-21 10:30:37 +10:00
Miguel Jacq
38ee7fde21
Remove duplication of security headers
2017-05-21 10:03:18 +10:00
Miguel Jacq
3641f376b7
Reinstate the alternative method of shutting down the web server - necessary for clicking 'Stop sharing' from GUI
2017-05-20 17:37:12 +10:00
Miguel Jacq
6c52988842
Harden some response headers
2017-05-20 12:34:00 +10:00
Miguel Jacq
55cb3b78cf
Remove onionshare-gui symlink pointing to itself
2017-05-19 14:15:54 +10:00
