Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-03-19 20:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,143 Commits 36 Branches 46 Tags
Commit Graph

380 Commits

Author SHA1 Message Date
Micah Lee
d0c07266bb 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
e8a4d513b4 Save the slug when using a persistent private key 2018-01-15 10:01:34 +11:00
Miguel Jacq
2c22fcc2e0 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
a7edf810c8 Merge branch 'master' into check_is_valid_file 2018-01-14 20:24:02 +11:00
Miguel Jacq
e97bee96fe Resolve conflict with upstream's onion.py 2018-01-14 18:49:49 +11:00
Miguel Jacq
3d6ccac376 Resolve conflict with upstream's onion.py 2018-01-14 18:45:10 +11:00
Micah Lee
8664b98b1a Merge branch 'mig5-493_500_detect_broken_tor_connection' 2018-01-13 22:50:57 -08:00
Micah Lee
ac29bdb5df Better way to get the onion service_id 2018-01-13 19:18:33 -08:00
Micah Lee
861c4a7244 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
7c653b6a8d 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
46eccb53f2 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
eff94d7bfd 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
0ba357eb73 Merge branch 'master' of https://github.com/wondratsch/onionshare 2018-01-12 18:58:41 -08:00
Miguel Jacq
ffa7f97905 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
d6677060af 4096 byte dir check is not consistent across platforms, remove it for now 2018-01-02 09:46:00 +11:00
Miguel Jacq
4079704be5 Check the file is a valid file or dir (not just that it exists) 2018-01-02 09:36:57 +11:00
Baccount
f96ff3328f Update onion.py 2017-12-26 22:53:44 -08:00
Miguel Jacq
c3c50c0955 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
2b36938d53 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
6e64f08f08 #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
d5140be046 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
ebf0d694f3 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
1f9ee70efe add FreeBSD Support 2017-12-07 11:51:32 +01:00
Miguel Jacq
433c7c754e 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
3a4b56b7b4 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
90807727c8 try and fix tests 2017-12-07 15:33:12 +11:00
Miguel Jacq
289dbad71f Optionally save the private key of a running share to settings for reuse 2017-12-07 12:45:34 +11:00
Miguel Jacq
9052a6c33f Raise an error if we were unable to obtain a random port 2017-12-07 08:49:10 +11:00
wondratsch
b469e44033 fix typo 2017-12-06 12:57:47 +01:00
wondratsch
1837084119 add OpenBSD Support 2017-12-06 12:47:47 +01:00
Miguel Jacq
721ac80c84 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
6d02d2ef91 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
f6763b25ef Merge master branch and fix conflicts 2017-12-03 17:06:33 +11:00
Micah Lee
e54836a69a Allow for localization for "Share via OnionShare" string in the nautilus extension 2017-12-01 12:57:18 -08:00
Micah Lee
df49baaadd Merge branch '404_response' of https://github.com/mig5/onionshare into mig5-404_response 2017-11-30 18:01:18 -08:00
Micah Lee
d5d8d2495a 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
4c3dcf50ea Merge branch 'fixes' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-fixes 2017-11-30 17:54:24 -08:00
Micah Lee
f56df5be46 Allow tests to find share folders when building .deb 2017-11-20 16:19:04 -08:00
Miguel Jacq
bcb61f3627 Format the argparser output better, to deal with the longer argument names 2017-11-12 10:40:04 +11:00
Miguel Jacq
a4a4035e10 better metavar for --shutdown-timeout arg 2017-11-11 17:12:10 +11:00
Miguel Jacq
ee9dfb7a8b No longer treating shutdown_timeout as a float, but an int of seconds 2017-11-09 19:50:50 +11:00
Miguel Jacq
183b149bc6 undo removal of newline in web.py 2017-11-09 18:01:09 +11:00
Miguel Jacq
f9d7cce90a send a HTTP 404 code instead of 200, on 404 pages 2017-11-09 17:51:34 +11:00
Miguel Jacq
f5b45539b0 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
89129a2ca7 remove shutdown_timeout logic in the web server, it's not actually needed 2017-11-09 07:12:00 +11:00
Miguel Jacq
c6f36e2086 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
263d0a102b 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
ca4f10d35c Delete temporary tor data directory during cleanup 2017-07-13 18:14:49 -06:00
Delirious Lettuce
5aedac5143 Reorder imports, spacing, use tempfile.gettempdir 2017-07-10 20:40:01 -06:00
Delirious Lettuce
5fd3973983 Reorder imports, use json.load(f) 2017-07-10 20:13:30 -06:00