Commit Graph

440 Commits

Author SHA1 Message Date
Miguel Jacq
4f768e8b77
Catch OSError when preparing the zip file during server start. Fixes #453 2017-12-12 17:02:11 +11:00
Miguel Jacq
661cf7f129
Fix the Bridges widgets so that they only appear when bundled Tor is chosen. Fixes all the other widget cramming issues. 2017-12-12 08:43:12 +11:00
Miguel Jacq
3f27b80154
experimenting with adjustSize() which seems to help the widget issue. Also adjust the custom Bridge parsing so that it injects the Bridge prefix automatically (means we can copy/pasta from https://bridges.torproject.org/bridges) 2017-12-11 17:58:53 +11:00
Miguel Jacq
b23a4f2bee
Improvements to the custom bridges textfield widget, still not perfect when used in conjunction with Tor socket/auth option widgets 2017-12-11 16:48:28 +11:00
Miguel Jacq
4674f7d97b
Add bridge support (obfs4 or user-supplied) 2017-12-11 14:53:13 +11:00
Miguel Jacq
8e89a65a22
set the 'Save Private Key' button to enabled when showing it, but when it's not already been pressed (in case private key is removed later via SettingsDialog) 2017-12-09 08:51:30 +11:00
Miguel Jacq
7edd693071
properly set saved private key/hidservauth string in settings_from_fields, so those values are populated when the SettingsDialog is saved 2017-12-09 08:11:04 +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
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
d69e93a5ba
emit to the status bar when the private key is saved to disk 2017-12-07 13:02:56 +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
Micah Lee
ed2c55c097
Merge branch 'no_available_port_error' of https://github.com/mig5/onionshare into mig5-no_available_port_error 2017-12-06 16:14:21 -08:00
Miguel Jacq
0aacfae925
Raise an error if we were unable to obtain a random port 2017-12-07 08:49:10 +11:00
Miguel Jacq
d500069398
Actually still uncheck the timer when the server stops, but *only* when it stops 2017-12-06 10:21:39 +11:00
Miguel Jacq
bddb9596d1
Don't uncheck the auto-stop timer when the server stops (adding new files before starting the share will otherwise uncheck it) 2017-12-06 10:02:22 +11:00
Micah Lee
58ec047a53
Merge branch '447_reload_tor_if_not_connected_and_settings_cancelled' of https://github.com/mig5/onionshare into mig5-447_reload_tor_if_not_connected_and_settings_cancelled 2017-12-05 14:05:16 -08:00
Micah Lee
44b5474249
Merge branch 'mig5-shutdown_timer' 2017-12-05 13:58:16 -08: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
fe311f591f
#447 show alert and exit if the Settings dialog is canceled yet Tor is still not connected 2017-12-04 18:43:40 +11:00
Miguel Jacq
17ba97becc
#431 Set minimum height of FileList to prevent resize bug affecting scrolling/visibility of bottom rows 2017-12-04 16:39:22 +11:00
Miguel Jacq
884d8389ed
Update comment to reflect that we don't hide the timer checkbox when checked anymore 2017-12-04 15:22:46 +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
Miguel Jacq
3b52f584a1
Don't auto-stop the share if a download is still in progress 2017-12-03 13:21:25 +11:00
Miguel Jacq
6ad2737d08
Properly stop the server when the timeout is reached (and reset the interface so we can share again) 2017-12-02 14:53:38 +11:00
Miguel Jacq
454a6a638b
Always show the shutdown timer checkbox, in case the user changes their mind and wants to unset it 2017-12-02 14:48:44 +11:00
Micah Lee
c664a9d3aa
Merge branch '468_canceled_feedback_on_stopped_server' of https://github.com/mig5/onionshare into mig5-468_canceled_feedback_on_stopped_server 2017-12-01 11:44:33 -08:00
Miguel Jacq
966beb9406
add missing arg to onion.connect() (config) which broke the Tor Connection progress dialog (regression from b19f8f) 2017-11-12 17:53:40 +11: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
882057eafc
only prevent the share from starting when the timeout has expired, if the timeout feature was even set at all 2017-11-09 18:23:11 +11:00
Miguel Jacq
ac0e375a4b
Various safety checks to prevent a share from starting after the timeout has expired. Also enforce that a timeout lands right on the minute and not precisely when the user clicks start (e.g mid-minute), to avoid confusion that a share might be lingering longer than desired 2017-11-09 17:26:32 +11:00
Miguel Jacq
9aabc51edc
On subsequent shares, the default time should nudge 5 minutes ahead of the current time again, instead of 5 minutes since the time OnionShare was opened 2017-11-09 12:52:44 +11:00
Miguel Jacq
b618d8c15d
Calculate the time difference in a more appropriate spot (rather than on clicking Start, but when the server is ready, as it may have taken some time, but should still stop at the nominated time) 2017-11-09 12:35:38 +11:00
Miguel Jacq
44fb6c69ae
set the timeout default to 5 minutes into the future for convenience 2017-11-09 11:56:02 +11:00
Miguel Jacq
2dd6c5527d
ensure the timeout checkbox is always shown if the server is stopped and it was not already checked 2017-11-09 11:49:01 +11:00
Miguel Jacq
d49e7cf1d1
more UI fixes - hide checkbox if server is working/started and it was not checked. Ensure we only set the timer if the timeout checkbox was checked to begin with 2017-11-09 11:46:26 +11:00
Miguel Jacq
9657df282e
ensure the shutdown timeout can't go backwards in time 2017-11-09 11:34:59 +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
5edd4dd22c
#468 If the server is stopped before a download is completed, emit the Canceled message in the progress bar 2017-11-03 12:58:45 +11:00
Micah Lee
4387589b4f
Merge branch 'mig5-440_settings_menu_button_disable' 2017-07-09 14:19:08 -07:00
Micah Lee
5435a4b046
Merge branch 'mig5-438_settings_icon_inactive' 2017-07-09 14:16:29 -07:00
Micah Lee
882ade94c7
Merge branch 'mig5-custom_config' 2017-07-09 14:12:49 -07:00
Micah Lee
dee616e8cb
Merge branch 'mig5-433_reset_downloads_on_fresh_share' 2017-07-09 13:19:26 -07:00
Miguel Jacq
fccec9737d
Need to actually ensure the dark settings icon is set back once server inactive again 2017-06-03 19:04:21 +10:00
Miguel Jacq
e9120fd87e
fix the settings icon so it only switches to inactive icon when server is active 2017-06-03 19:01:40 +10:00
Miguel Jacq
22971fc205
#440 disable the Settings menu action when server is active 2017-06-03 18:55:09 +10:00
Miguel Jacq
6626e7d67e
#438 Make settings icon lighter grey when inactive 2017-06-02 11:34:19 +10: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
Miguel Jacq
7e2d4d7888
Remove debug data 2017-05-31 19:44:53 +10:00
Miguel Jacq
3b359aec62
On a fresh share, delete any download progress bars of previous shares, and re-hide the downloads container 2017-05-31 17:35:16 +10:00
Miguel Jacq
64b5cc59bb
Ensure the self.filenames list is sorted internally.
This is important because even though the QListWidget UI is sorted
automatically, the list is not necessarily. Drag-drop events, depending
on the order in which items were highlighted before being dragged,
can result in a different or reversed order. This has implications for
popping the list later (e.g on delete events)
2017-05-31 11:17:15 +10:00
Micah Lee
c039ccd184
Merge branch 'single_add_button' of https://github.com/mig5/onionshare into mig5-single_add_button 2017-05-30 12:21:03 -07:00
Micah Lee
c532509626
Merge branch 'status_bar_no_borders' of https://github.com/mig5/onionshare into mig5-status_bar_no_borders 2017-05-30 12:12:52 -07:00
Micah Lee
3628b2ee3c
Merge branch 'pretty_progress_bar' of https://github.com/mig5/onionshare into mig5-pretty_progress_bar 2017-05-30 12:07:49 -07:00
Micah Lee
963ed0ef41
Merge branch 'delete_multiple_items' of https://github.com/mig5/onionshare into mig5-delete_multiple_items 2017-05-30 12:05:35 -07:00
Miguel Jacq
506cb55bc1
Revert "Make the tor connection progressBar similarly style as the others"
This reverts commit 6ad8b88832.
2017-05-29 15:46:28 +10:00
Miguel Jacq
6ad8b88832
Make the tor connection progressBar similarly style as the others 2017-05-29 15:44:04 +10:00
Miguel Jacq
63745f4d8e
reinstate the caption call 2017-05-29 13:50:46 +10:00
Miguel Jacq
8f79fc392d
Fix file dialog by subclassing/overriding it, which allows for single selection of a file or folder, as well as multiple 2017-05-29 13:47:05 +10:00
Miguel Jacq
68089a9850
Make adding of files/folders a single button 2017-05-29 10:22:16 +10:00
Miguel Jacq
84e167333e
Improve the Zip progressbar style a little bit 2017-05-29 09:14:23 +10:00
Miguel Jacq
0da4c87e5a
Remove border around items in the QStatusBar 2017-05-27 20:38:46 +10:00
Miguel Jacq
acf453e094
Style a prettier progress bar 2017-05-27 19:53:30 +10:00
Miguel Jacq
91cf9084aa
Make it possible to delete multiple items from the list with a shift-select 2017-05-27 17:27:57 +10:00
Miguel Jacq
cc73c92e4b
Adds Settings and Help menu items to the systray 2017-05-27 17:14:59 +10:00
Micah Lee
444f50868d
Remove the extra instances of the Settings object, and only use OnionShareGui.settings 2017-05-22 17:11:41 -07:00
Micah Lee
5846b06478
Reload Settings whenever the settings get saved in SettingsDialog 2017-05-22 17:08:05 -07:00
Micah Lee
e626a410f3
Merge branch 'fix_stay_open' of https://github.com/mig5/onionshare into mig5-fix_stay_open 2017-05-22 17:03:01 -07:00
Micah Lee
e97d1e6ce3
Merge branch 'add_help_button' of https://github.com/mig5/onionshare into mig5-add_help_button 2017-05-22 16:44:10 -07:00
Micah Lee
63e491bddf
Add a grayscale OnionShare logo for the systray icon in macOS 2017-05-22 16:23:19 -07:00
Micah Lee
65894e2e44
Make systray exit action call OnionShareGui.close() instead of sys.exit(), to give OnionShare a chance to warn users of open servers, and to gracefully shut down 2017-05-22 16:19:44 -07:00
Miguel Jacq
13a2ad2147
get settings from self rather than instantiate a new Settings object 2017-05-23 09:15:52 +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
e828b2f9cd
Use non-native QFileDialog for file selection as well as directory selection, to have a consistent UI 2017-05-22 16:10:55 -07:00
Micah Lee
9385487c10
Merge branch 'select_multiple_folders' of https://github.com/mig5/onionshare into mig5-select_multiple_folders 2017-05-22 16:04:56 -07:00
Miguel Jacq
8bc280ff7a
Refactor help button to use QDesktopServices.openUrl() 2017-05-23 08:30:24 +10:00
Micah Lee
0ab5b8b366
Merge branch 'fix_double_slash_in_update_checker_url' of https://github.com/mig5/onionshare into mig5-fix_double_slash_in_update_checker_url 2017-05-22 14:00:50 -07:00
Miguel Jacq
3766a6048d
Add desktop notification messages on download events (via systray) 2017-05-22 16:47:23 +10:00
Miguel Jacq
b35e3b76d5
Make it possible to select multiple folders by using non-native QFileDialog 2017-05-21 16:14:32 +10:00
Miguel Jacq
f446f6630d
Send stay_open variable in the right place, so that it really does stay open if we said so 2017-05-20 16:59:13 +10:00
Miguel Jacq
aa7e609e14
move the help button to the left 2017-05-20 14:04:52 +10:00
Miguel Jacq
2846798858
Add help button to settings dialog, which takes user to the wiki 2017-05-20 13:56:20 +10:00
Miguel Jacq
5a976a7aed
Fix double slash in URL of UpdateChecker debug message 2017-05-19 10:33:55 +10:00
Micah Lee
c4ad835322
Move the readable file check from FileSelection to FileList, so files you drag-and-drop into OnionShare get checked as well 2017-05-18 10:55:10 -07:00
Micah Lee
959f637b49
Merge branch '345_file_readability_fix' of https://github.com/mig5/onionshare into mig5-345_file_readability_fix 2017-05-18 10:43:29 -07:00
Miguel Jacq
8a1fad7a79
#345 - validate the readability of files before adding them 2017-05-18 18:09:49 +10:00
Miguel Jacq
f5ba307276
#386 - put the connection radio buttons into their own group, which by default forces autoExclusive, thus preventing them from being all unset 2017-05-18 17:10:47 +10:00
Micah Lee
f6eb178f7b
Display tor connection percent when testing bundled tor in settings 2017-05-17 12:09:56 -07:00
Micah Lee
22c13fc7bf
Fix bug with displaying error message 2017-05-17 11:36:32 -07:00
Micah Lee
66a012bf81
Make settings button flat 2017-05-16 17:36:53 -07:00
Micah Lee
8a8c2bd34b
Oops, set the TorConnectionDialog window title back 2017-05-16 17:30:54 -07:00
Micah Lee
24ccb3995f
Fix UpdateChecker and UpdateThread to work with refactor, now it pops up an update reminder 2017-05-16 17:29:02 -07:00
Micah Lee
ea745e63f3
Split SettingsDialog into two columns, because the layout didn't fit on my Mac 2017-05-16 17:02:00 -07:00
Micah Lee
010bddb066
When saving settings, if Tor settings changed or if Tor isn't connected, reboot the Onion object, so that it's always connected to Tor when using the app 2017-05-16 16:50:33 -07:00
Micah Lee
eb708973c8
Disable settings while an OnionShare server is active 2017-05-16 15:41:35 -07:00
Micah Lee
3e3d669a49
Remove the menu bar, and replace it with a settings button owned by the OnionShareGui object 2017-05-16 15:24:14 -07:00
Micah Lee
22fb34d50d
Fixed signal/slot/thread issue in TorConnectionDialog and TorConnectionThread, and updated the language of bundled Tor error messages 2017-05-16 13:09:27 -07:00
Micah Lee
4242097d7d
Fixed typo in signal name, error_connecting_to_tor instead of error_connection_to_tor 2017-05-16 11:50:13 -07:00
Micah Lee
388202e1ea
Move connecting to Tor into its own separate thread 2017-05-16 11:44:34 -07:00
Micah Lee
f90d49fa4b
Added debug logging to OnionShareGui, SettingsDialog, TorConnectionDialog, and Alert objects 2017-05-16 11:31:52 -07:00
Micah Lee
7003349873
Add log() method to onionshare.common, which logs to stdout if in debug mode 2017-05-16 11:12:55 -07:00
Micah Lee
1591888863
Renamed onionshare.helpers module to onionshare.common 2017-05-16 11:05:48 -07:00
Micah Lee
219c4351e1
Pass debug into the Onion and OnionShareGUI objects 2017-05-16 10:57:59 -07:00
Micah Lee
a9e822b222
Make UpdateChecker use the shared Onion object instead of creating a new one 2017-05-14 19:54:12 -07:00
Micah Lee
58f70b1d9b
Now when you cancel connecting to Tor, it prompts you if you want to quit or open settings 2017-05-14 19:21:33 -07:00
Micah Lee
ad2c5e94b4
OnionShare connects fine when connection_type isn't bundled_tor, and it now displays errors and opens Settings when it can't connect to Tor 2017-05-14 18:46:54 -07:00
Micah Lee
4d522e1e85
Fix Settings dialog, make it so testing Tor with bundled_tor settings works 2017-05-14 18:36:31 -07:00
Micah Lee
2ca92c52db
Move owernship of the TorConnetionDialog objection from __init__.py into the OnionShareGUI class, and make it so when the Tor connection gets canceled, OnionShare quits 2017-05-14 18:30:45 -07:00
Micah Lee
d112b35414
Make the Settings dialog's 'Test Tor Settings' button work again, with changes to the Onion object 2017-05-14 17:35:35 -07:00
Micah Lee
80af01e82d
Set the size of the TorConnectionDialog to avoid it resizing the window as elements are drawn 2017-05-14 17:27:05 -07:00
Micah Lee
dc23946fe8
Fixed various issues introduced by creating an singleton Onion object and passing it into the OnionShare object 2017-05-14 17:21:13 -07:00
Micah Lee
22485f7933
Import socks module included in the onionshare module, instead of the global one 2017-04-19 09:06:01 -07:00
Micah Lee
bcf2e518de Made clicking Exit in the TorConnectionDialog exit the app 2017-04-17 20:49:50 -07:00
Micah Lee
71dc65edee Began making a TorConnectionDialog, which handles connecting to the Tor network 2017-04-17 20:26:35 -07:00
Micah Lee
1519f3693d Capitalize comments 2017-04-17 19:38:42 -07:00
Micah Lee
18ad436ee2 Move OnionShareGui into its own file, so __init__ is just GUI logic 2017-04-17 19:36:02 -07:00
Micah Lee
bb990ff574 Removed transparent_torification from the full app, and refactored OnionShare class to get passed in an Onion, and doesn't get passed in stealth. 2017-04-17 19:12:02 -07:00
Micah Lee
dff13d9568 Made automatic check for update in a separate thread work 2017-04-17 13:22:33 -07:00
Micah Lee
da70c71d8a Make UpdateChecker use signals and slots to communicate tor status messages. And make the latest version http request differentiate between automatic requests and forced requests 2017-04-17 13:03:16 -07:00
Micah Lee
dc1418cc3b Added UpdateThread to update_checker module, which checks for updates in a separate thread. And started implementing this in the OnionShareGui class, but have no finished 2017-04-15 19:07:02 -07:00
Micah Lee
47c1488512 Refactor UpdateChecker into a class that's a QObject, and make it use signals and slots to communicate 2017-04-15 18:55:41 -07:00
Micah Lee
ca16600d29 Handle UpdateCheckerSOCKSHTTPError exception in the update_checker module 2017-04-15 18:15:01 -07:00
Micah Lee
a116d3ae60 Created update_checker module, and logic to load http://elx57ue5uyfplgva.onion/latest-version.txt (this is the OnionShare website's onion site) to check for updates. Also added UX in the settings dialog to force checking for updates. Does not actually do so automatically yet. 2017-04-15 18:04:05 -07:00
Micah Lee
fa12784f8b Added Tor SOCKS address and port settings 2017-04-15 16:33:41 -07:00
Micah Lee
4b11bd00c5 Added autoupdate settings to Settings, and also to the settings dialog 2017-04-15 15:24:08 -07:00
Micah Lee
62cc310d0a Rearranged settings layout so that all Tor-related settings are inside of the 'How should OnionShare connect to Tor?' box, including the Test Tor Settings button 2017-04-15 13:05:11 -07:00
Micah Lee
d5cae26b3e Change color of tor_status label in settings dialog to not be red, because nothing is actually wrong 2017-04-15 11:50:41 -07:00
Micah Lee
a462c567ff Added onionshare logo as settings window icon 2017-04-14 18:37:26 -07:00
Micah Lee
ffc2e23981
Connecting to Tor now times out of 10 seconds 2017-04-14 10:00:56 -07:00
Micah Lee
1fa88c3d07
Add Tor connection status to the main window status bar 2017-04-13 23:08:25 -07:00
Micah Lee
80d475f65b
In the settings dialog, show Tor connection status when the connection type is bundled 2017-04-13 22:56:47 -07:00
Micah Lee
169be518eb
Connecting to Tor in bundled mode now creates a temporary tor data dir, starts a new tor process, and connects to it. Also, refactored Settings dialog to allow Linux to use bundled tor as well 2017-04-13 22:22:34 -07:00
Micah Lee
dc82a99d2a Created a TorDialog class, and beginning to subprocess out to tor.exe 2017-04-08 19:00:31 -07:00
Micah Lee
da225ed7d1 Started to implement Bundled Tor connection settings 2017-04-08 18:10:17 -07:00
Micah Lee
8280b1b5d8 Add bundled Tor to Tor connection settings, and make it only work in Windows and Mac, and not in dev mode 2017-04-08 17:48:58 -07:00
Micah Lee
2053c6fab2 Make onionshare respect settings that come from the Settings object, instead of the options dialog 2017-04-08 15:05:50 -07:00
Micah Lee
e71cdd6c8e Remove options from the main window 2017-04-08 14:50:17 -07:00
Micah Lee
848d8db34e Added close_after_first_download and use_stealth to settings, and also to the GUI settings dialog 2017-04-08 13:42:07 -07:00
Micah Lee
34301d3088
Catch Tor protocol error exceptions when starting an onion service (#344) 2017-02-22 16:45:52 -08:00
Micah Lee
6370139d2e
Rip out support for non-ephemeral onion services 2017-02-22 14:10:06 -08:00
Micah Lee
12acb893f8
Add new AuthenticationFailure exception, and make the Onion/stem code catch more exceptions when connecting to a Tor controller 2017-01-07 17:31:26 -08:00
Micah Lee
db052ce85f
Moved onionshare and onionshare_gui logic directly into __init__.py files 2017-01-06 19:00:08 -08:00
Micah Lee
f8005a63ea
Change GPL copyright from 2016 to 2017 2017-01-06 18:58:15 -08:00
Micah Lee
0ab29ff8af
When a share is active, disable the full advanced options group, not just the stealth checkbox 2016-12-29 14:35:57 -08:00
Micah Lee
cd63dc37f1
Remove the alert function, replace it with the Alert class 2016-12-29 14:23:19 -08:00