352 Commits

Author SHA1 Message Date
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
Delirious Lettuce
b59a442bf1 Reorder imports, remove p, use ext, use json.load(f) 2017-07-10 20:11:04 -06:00
Delirious Lettuce
edf1d62737 Remove: unused import, round, formatting indexes. Use tuple 2017-07-10 20:00:19 -06:00
Miguel Jacq
e8304b861f Make it possible to supply a custom json settings file from somewhere else 2017-06-01 17:35:27 +10:00
Micah Lee
74c5722b09 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
294f093f9b 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
a50d1207c3 Remove constant_time_compare to use hmac.compare_digest 2017-05-28 13:38:33 -06:00
Delirious Lettuce
20f1f352a0 Fix issue mentioned by @mig5 2017-05-26 10:12:11 -06:00
Delirious Lettuce
882ac942fe Use divmod to simplify the calculations, seconds==0 -> '0s' 2017-05-24 22:20:50 -06:00
Delirious Lettuce
9f35ebc287 * 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
bfd7352781 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
47a53f2d36 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
7df189dd24 Removing '\n' arg negates the need for wordlist.remove(), renamed unused variable 'x' to '_' 2017-05-24 13:22:41 -06:00
Micah Lee
36a27b3b7d Fix indenting 2017-05-23 15:16:27 -07:00
Miguel Jacq
b97db1339d open files via the 'with' statement, to avoid ResourceWarnings on unclosed files 2017-05-23 21:22:14 +10:00
Micah Lee
d1512dcd9c 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
e5e7add40f 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
91bb0eefa5 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
36d3fac5c9 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
5a166e9fc1 Add desktop notification messages on download events (via systray) 2017-05-22 16:47:23 +10:00
Miguel Jacq
8539adb343 use the actual OnionShare version as the Server header string 2017-05-21 10:30:37 +10:00
Miguel Jacq
fdf6b46e58 Remove duplication of security headers 2017-05-21 10:03:18 +10:00
Miguel Jacq
eeb463b0c8 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
33c690b22c Harden some response headers 2017-05-20 12:34:00 +10:00
Miguel Jacq
90d6919cc9 Remove onionshare-gui symlink pointing to itself 2017-05-19 14:15:54 +10:00
Micah Lee
8ef6d3d076 In bundled Tor mode, wait 2 full seconds before connecting to the Tor controller 2017-05-18 17:34:36 -07:00
Miguel Jacq
ec82f06394 Wait a bit longer before attempting to connect to the Tor controller 2017-05-19 09:45:54 +10:00
Micah Lee
6b41441706 Update get-tor-osx.py to grab the Tor binary from Tor Browser 6.5.2 instead of 6.5.1, and make it retain the same directory structure in OnionShare as it uses in Tor Browser, including copying libevent-2.0.5.dylib, which was missing before (#385) 2017-05-18 11:22:50 -07:00
Miguel Jacq
5f92e3d606 #345 - validate the readability of files before adding them 2017-05-18 18:09:49 +10:00