Commit Graph

189 Commits

Author SHA1 Message Date
Micah Lee
2ce32e2327 Make hidserv_dir a class variable so it can be cleaned up (fixes #232), and refactor _hsdic2list (#199) 2015-12-06 13:51:42 -08:00
Micah Lee
9723270794 Revert "Refactored non-ephemeral hidden services to use get_hidden_service_conf and set_hidden_service_conf rather than get_conf_map and set_options. So much cleaner this way. (fixes #216)"
I'm reverting this it's causing #232.

This reverts commit df8e4f6cd4.
2015-12-06 13:40:35 -08:00
Micah Lee
f4780813d6 Decorator is expecting argument to be named slug_candidate, not shutdown_slug_candidate (#200) 2015-12-04 13:17:45 -08:00
Micah Lee
9d1abf668a Merge branch 'slug_decorator' of https://github.com/pwplus/onionshare into pwplus-slug_decorator 2015-12-04 12:46:51 -08:00
Micah Lee
f2389cc602 Remove all language and localization from download page, to prevent leaking the sender's locale (fixes #228) 2015-12-04 12:43:12 -08:00
Micah Lee
e6e323fc9a Don't access self.hs when using --local-only 2015-12-04 12:37:51 -08:00
Micah Lee
df8e4f6cd4 Refactored non-ephemeral hidden services to use get_hidden_service_conf and set_hidden_service_conf rather than get_conf_map and set_options. So much cleaner this way. (fixes #216) 2015-11-20 17:47:42 -08:00
Micah Lee
8f8e38b11d Refactored _hsdic2list method. It it much easier to understand now. (fixes #199) 2015-11-20 14:20:29 -08:00
Micah Lee
76d65c678b Changed 404 page to just say "404" (fixes #225) 2015-11-20 12:50:34 -08:00
Micah Lee
35c1c9cbcb When looking for a Tor to use, prefer (in this order): Tor Browser, Tor Messenger, system Tor (fixes #215) 2015-11-20 12:43:08 -08:00
Will Plusnick
42d7dd4181 Add a decorator to check the slug
This commit will add a decorator to the check the slug rather than copy
and pasting the same lines of code at the begining of every route.
2015-11-16 02:09:51 -06:00
Micah Lee
dc58921187 Add docstrings to all classes and methods (fix #198) 2015-11-15 19:01:20 -08:00
Micah Lee
a5aff46050 Cleanup ephemeral hidden services 2015-11-15 16:26:44 -08:00
Micah Lee
fd39f84bff Merge branch 'master' into ephemeral
Conflicts:
	onionshare/helpers.py
	onionshare/onionshare.py
2015-11-15 15:35:59 -08:00
Micah Lee
34591b5634 Merge branch 'master' of https://github.com/jvoisin/onionshare into jvoisin-master
Conflicts:
	onionshare/socks.py
2015-11-08 15:53:41 -08:00
Micah Lee
d67ca2c406 Merge pull request #207 from lazlolazlolazlo/docstrings
Add some missing docstrings.
2015-11-08 12:44:30 -08:00
Micah Lee
55c4c0fac1 Updated onionshare-gui to support ephemeral hidden services 2015-09-08 18:12:24 -07:00
Micah Lee
82e0c4e122 No need to pass transparent_torification into wait_for_hs 2015-09-08 17:48:16 -07:00
Micah Lee
1a4cb26f5d Move wait_for_hs() function into the HS class 2015-09-08 17:42:08 -07:00
Micah Lee
629a70c249 Fixed call to create_ephemeral_hidden_service, and also await_publication=True to make the app.wait_for_hs() call obsolete 2015-09-08 17:28:23 -07:00
Micah Lee
eba6dbb843 Moved hidden service login into separate file. Prefer to use ephemeral hidden services now if they are available. Ephermal does not yet work, but old hidservdir still works. 2015-09-07 22:34:54 -07:00
Micah Lee
bbee1599c5 Updated copyright year to 2015 2015-09-07 21:48:49 -07:00
Micah Lee
5d37d9b7b2 Removed all of the Tails-specific code. If we use ephemeral hidden services, we no longer need to touch the filesystem, and hopefully no longer need root in Tails. 2015-09-07 21:44:29 -07:00
jvoisin
ac97ddf7d0 Various fixes
- more pep8
- add some forgotten deps in setup.py
2015-07-25 11:22:24 +02:00
Lazlo Westerhof
7446cee655 Fix some codestyle issues according to pep8. 2015-06-26 19:38:22 +02:00
Lazlo Westerhof
7fada800f3 Add some missing docstrings. 2015-06-25 21:55:29 +02:00
Micah Lee
19fac71a3e figure out the osx_resource_dir only once, to fix issue with cli version in OSX 2015-06-16 14:30:09 -07:00
Micah Lee
ba424fa427 suppress download progress output to stdout in OSX (fixes #203) 2015-06-16 13:03:04 -07:00
Micah Lee
0350cb3cdc catch exceptions when cleaning up hidden services 2015-06-16 12:33:56 -07:00
Micah Lee
210448d6c9 In Linux, create HS dir in /tmp/onionshare/* (#185), and also connect to Tor control port more robustly 2015-05-19 13:34:36 -07:00
Micah Lee
1f52c9b565 Handles a new exception that gets thrown in Tails using a bridge while waiting for the HS 2015-05-18 20:54:04 +00:00
Micah Lee
815c2a8741 changed cwd in onionshare CLI script for OSX in the right places to support both loading strings and relative paths for files to share (#132) 2015-05-16 13:37:28 -07:00
Micah Lee
ccc8b87b9a CLI version of onionshare in OSX now works when symlinked (closes #132) 2015-05-15 19:07:41 -07:00
Micah Lee
2ea0c6aef3 moving platform-specific scripts into install folder, and making onionshare CLI work in OSX (#132) 2015-05-15 18:52:20 -07:00
Micah Lee
ad553146c7 adding html files to Resources, loading them from the correct path, and make sure to include jinja2 extension in py2app (#151) 2015-05-15 17:43:01 -07:00
Micah Lee
a86cda4549 Ripping out dmg code, replacing pyinstaller with py2app for OSX -- still in progress (#151) 2015-05-15 16:56:22 -07:00
Micah Lee
669750be37 specify types in all str.format() calls (fixes #169) 2015-05-15 12:26:58 -07:00
Micah Lee
e78e21ac47 create the ZipFile with allowZip64=True. fixes #173 2015-02-12 17:03:56 -08:00
Micah Lee
027d77416e fix Windows path to prevent Tor control port from breaking 2014-12-09 19:06:59 -08:00
Micah Lee
21e2546435 In Tails OnionShare now creates HS directory in /var/lib/tor, to obey AppArmor rules (fixes #166) 2014-12-10 02:09:10 +00:00
Micah Lee
ee98e1b024 removed helpers.get_tmp_dir() in favor of tempdir module 2014-12-10 00:50:19 +00:00
Thomas Waldmann
087102bde4 pep8: too long lines, reformat lines to < 120 chars. removed redundancy from long_description in setup.py.
note: pep8 usually recommends 80 chars, but I find that impractical and unnecessary - it's not 1980 any more when code was edited on 80x25 terminals.

i was a bit wondering about onionshare-launcher.py - it does a lot of imports, but does not use the imported names.
2014-11-18 18:59:48 +01:00
Thomas Waldmann
f5889d96dd pep8: remove unexpected spaces around "=" in function/method head 2014-11-18 18:43:35 +01:00
Thomas Waldmann
152bc32ba7 pep8: no space after {[ or before ]}, reindent 2014-11-18 18:41:45 +01:00
Thomas Waldmann
aa2b59ec5d pep8: 2 spaces before inline comments 2014-11-18 18:37:17 +01:00
Thomas Waldmann
63965fd2d9 pep8: blank after comma and colon 2014-11-18 18:35:09 +01:00
Thomas Waldmann
179eefae29 pep8: fix empty line counts
top level: 2, else 1

I also advice to not put "pass" into empty classes, but rather a docstring instead of "pass".
2014-11-18 18:29:32 +01:00
Thomas Waldmann
5deb3f9e0f pep8: fix indentation to be a multiple of four
note: i used pycharm "reformat file", so there are other reformattings also
2014-11-18 18:03:34 +01:00
Thomas Waldmann
d51f762ddd pep8: use triple double-quotes for docstrings 2014-11-18 17:39:04 +01:00
Micah Lee
0812e371aa Merge pull request #161 from ThomasWaldmann/fixes
some minor fixes
2014-11-17 10:58:29 -08:00