Miguel Jacq
284213aa2d
support obfs4 via obfs4proxy on macOS
2018-01-15 12:49:29 +11:00
Miguel Jacq
bdb10b7eeb
Resolve conflict with upstream's onion.py
2018-01-14 18:53:46 +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
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
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
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
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
