Commit Graph

167 Commits

Author SHA1 Message Date
Micah Lee
aee2922c36
Remove unused dependency python-psutil 2017-01-26 20:22:31 -08:00
Naru Trey
abd2bea7b7
Formatting error text for easier translation 2016-12-03 20:32:52 +04:00
Naru Trey
16297e6251
gettext: changed directory with locale on a system-wide
Using a non-standard directory unfounded
2016-12-03 20:32:32 +04:00
sedrubal
6951561126
Use relative import
I'm not really sure with these imports but it worked for me with python2
and 3 😉
2016-11-09 03:08:34 +01:00
sedrubal
570e972793
Use octal numbers for mkdir
Behavior will be changed in python3

See #214
2016-11-09 02:57:52 +01:00
sedrubal
bace7de8fe
Use print_function from __future__
To get compatible to python3

See #214
2016-11-09 02:54:37 +01:00
Micah Lee
8280e90b54
Fix settings crash related to #241 2016-07-22 16:04:48 -04:00
Micah Lee
eb549c294e
Remove some verbose output 2016-07-08 16:44:40 -07:00
Micah Lee
0bb3764b9f
Read gpg output a line at a time, looking for status-fd output 2016-07-08 16:39:43 -07:00
Micah Lee
3dc82e10de
Merge branch 'fix/137' of https://github.com/isislovecruft/torbrowser-launcher into isislovecruft-fix/137 2016-07-08 16:33:57 -07:00
Micah Lee
43a549c17c
If a download results in a 404 and the language is not en-US, try downloading the en-US Tor Browser instead 2016-07-08 14:37:31 -07:00
Micah Lee
0446ea9c88
Add 'Force downloading English version of Tor Browser' setting 2016-07-08 14:27:45 -07:00
Micah Lee
7c1f21e415
Update the default mirror 2016-07-08 13:24:40 -07:00
Micah Lee
709aee4623
If installed version is older than min_version, download fresh copy 2016-07-08 12:42:58 -07:00
Nicolas Braud-Santoni
c5cc6b3d8a Bump min_version to 6.0.2 2016-06-28 01:29:39 +02:00
Micah Lee
d0de37769a
Merge branch 'master' of https://github.com/jgriffiths/torbrowser-launcher into jgriffiths-master 2016-06-23 12:08:22 -07:00
Jon Griffiths
a414f7e061 Avoid re-downloading the tbb tarball if it is already present
If the tarball is present but corrupt it will be re-downloaded.
2016-05-15 22:27:15 +12:00
Dhole
b2c8f0d239 Remove unused dependency of IPolicyForHTTPS
In d054f2a the certificate pinning was removed (#224) so IPolicyForHTTPS
is no longer requiered.  This is requiered to make torbrowser-launcher
work with python-twisted packages where IPolicyForHTTPS is not yet
implemented such as the one shipped with Ubuntu 14.04
2016-04-13 23:44:18 +02:00
Micah Lee
7f9f55b9e3 Prevent attempts at directory traversal attacks, even though they do not look exploitable 2016-03-13 14:56:42 -07:00
Micah Lee
e5d3cbb0a3 Prevent signature verification attack by passing both data file as well as sig file into gpg (fixes #229) 2016-03-13 14:51:08 -07:00
Micah Lee
b702ed1784 Make icon a png instead of xpm (fixes #226) 2016-03-04 15:15:44 +01:00
Micah Lee
d42d84b3b6 Renamed "Exit" to "Cancel". Fixes #225 2016-03-03 16:07:50 +01:00
Holger Levsen
89b79e03a6 error message for socks failures (Closes: #797337)
thanks to Michael Gold <michael@bitplane.org>
2016-03-02 15:58:43 +01:00
Holger Levsen
a34eacfb06 make socks4 port configurable. (Closes: #797339)
Thanks to Michael Gold <michael@bitplane.org> for the original patch
2016-03-02 15:50:06 +01:00
Micah Lee
a8d1e80379 Fail to launch Tor Browser if its version is earlier than the minimum version (#224) 2016-03-01 17:37:00 +01:00
Micah Lee
d054f2a03e Remove certificate pinning (#224) 2016-03-01 16:26:39 +01:00
Micah Lee
7c89672530 Fix issue with detecting language (fixes #220) 2016-03-01 13:14:15 +01:00
Micah Lee
bc349cdc60 If Tor Browser is not installed, detect version, download, verify sig, install, and launch. Otherwise just launch. No more checking for updates. (#198) 2015-11-08 20:18:07 -08:00
Micah Lee
255ab9cc9e Update default settings, and settings GUI (#198) 2015-11-08 19:44:18 -08:00
Micah Lee
dd86ff7e40 Remove code to bring windows to front, and to get pid of processes, because these stopped working long ago. Also remove wmctrl dependency. 2015-11-08 17:30:47 -08:00
Micah Lee
94d184a26b Only convert unicode URLs to strings if they are actually unicode (#205) 2015-11-08 16:27:03 -08:00
Micah Lee
1ff10552d0 Force download URLs to be strings and not unicode (#205) 2015-11-08 16:23:30 -08:00
Micah Lee
ef2c17a34d Eek, removed testing code that never should have been committed 2015-11-08 16:22:06 -08:00
Micah Lee
17437215a2 Revert "Ensure that the version is a string, not unicode (#205)"
This reverts commit 83c5b1917d.
2015-11-08 16:16:20 -08:00
Micah Lee
83c5b1917d Ensure that the version is a string, not unicode (#205) 2015-11-08 16:11:43 -08:00
Micah Lee
ab141ee869 Stop using sha256sums.txt and sha256sums.txt.asc (fixes #180) 2015-11-05 19:39:16 -08:00
Micah Lee
5bed87dbd2 Merge branch 'use_torbrowser_updates_xml' of https://github.com/boklm/torbrowser-launcher into boklm-use_torbrowser_updates_xml
Conflicts:
	torbrowser_launcher/common.py
2015-11-05 19:17:49 -08:00
Micah Lee
a0634fa8b3 Merge pull request #196 from kraai/master
Use IPolicyForHTTPS
2015-11-05 19:00:45 -08:00
Micah Lee
509d2d52e9 Removed Erinn's signing key, because she no longer signs TBB releases 2015-11-05 18:20:32 -08:00
Micah Lee
3aaab8d0a2 Switch settings file from pickle format to json (fixes #201) 2015-11-05 18:13:57 -08:00
Nicolas Vigier
e07beac325
Get stable version using torbrowser updater xml
The RecommendedTBBVersions file contains current versions of Tor Browser
from all channels, including alpha or beta.

Instead of this, we can use xml file used by Tor Browser's updater in
the "release" channel:
https://dist.torproject.org/torbrowser/update_2/release/Linux_x86_64-gcc3/x/en-US
2015-11-05 23:50:11 +01:00
Matt Kraai
301ae3193e Use IPolicyForHTTPS 2015-09-07 05:58:34 -07:00
Micah Lee
5f833d7329 execute ./start-tor-browser.desktop instead of ./Browser/start-tor-browser (#176) 2015-05-11 19:20:51 -04:00
Micah Lee
77a179d766 Stop printing so much console output (fixes #173) 2015-05-11 15:22:46 -07:00
Micah Lee
3d9f4edc20 Update location of start-tor-browser for TBB 4.5, and remove accept_links feature #176 2015-05-11 14:04:01 -07:00
Micah Lee
3f1146e1a0 add option to disable accepting links (partial fix for #157) 2015-01-21 11:54:03 -08:00
Micah Lee
143cbf4ee1 fixing how alphas/betas are removed from available versions list, because formatting changed in RecommendedTBBVersions 2015-01-19 13:00:47 -08:00
Micah Lee
d17a82ec10 remove debug output that makes it look like something went wrong 2015-01-07 17:46:52 -08:00
Micah Lee
bc226c8ded typo (#161) 2015-01-07 17:44:53 -08:00
Micah Lee
7863b16728 adding new TBB signing key (#161) 2015-01-07 17:41:53 -08:00
Anton Nesterov
de134835a0 Fix opening new tab in already runned TBB (always -allow-remote) 2014-12-10 02:38:36 +03:00
Micah Lee
028bc225ac you can pass URLs into torbrowser-launcher now (#103) 2014-11-24 22:53:05 -08:00
Micah Lee
013584d9e6 switched to using argparse to parse arguements, and made settings open with "--settings" instead of "-settings" 2014-11-24 22:39:56 -08:00
Micah Lee
d89fe1ed1e only hide window if there is a window to hide (#151) 2014-11-24 22:37:55 -08:00
Micah Lee
99fac15206 hides TBL window before launching TBB (#151) 2014-11-24 22:19:59 -08:00
Micah Lee
1c0babb150 it looks like the linux filter is still necessary after TBB 4.0 2014-11-24 21:38:04 -08:00
Isis Lovecruft
b337b3de8a
Check that GnuPG key import was successful.
Rather than checking the GnuPG process exit code, a more robust way to
handle determining whether or not a GnuPG process behaved as was
intended is to check GnuPG's status-fd output. [0]

In the case of key import, the particular status-fd flag we're looking
for is `IMPORT_OK` followed by a "reason", then the expected
fingerprint. [1]  Because the "reason"s are integers which may be ORed,
and we are never expecting private keys to be within the file, we can
assume the reason to be `[0, 15]` inclusive.

While it's not strictly necessary to hardcode Erinn's key fingerprint
within the code because the keyfiles are safely distributed along with
the source code, doing so adds a simple defense-in-depth mechanism for
the unlikely case that a user's torbrowser-launcher package/source
download was compromised.  As such, and because it was a trivial
addition which will also assist with checking that a signature was made
by the key with the expected fingerprint [2], I've gone ahead and added
a `common.fingerprints` dictionary whose keys match the names of the
`common.paths` keyfile for their respective key (i.e. the fingerprint
for `common.paths['erinn_key']` is stored at
`common.fingerprints['erinn_key']`) in order to facilitate extensibility
in the event that torbrowser-launcher should add new keyfiles in the
future.  This may be removed, if undesirable.

 * ADD `common.gnupg_import_ok_pattern`, a compiled regex for
   determining if a key import was successful.
 * ADD new class attribute, `common.Common.fingerprints` for storing
   fingerprints.
 * ADD new method, `common.Common.import_key_and_check_status()`, which
   imports a GnuPG key, and then checks that the key was successfully
   imported.
 * CHANGE `common.Common.import_keys()` method to make adding
   new/additional keys easier.
 * FIXES https://github.com/micahflee/torbrowser-launcher/issues/137

[0]: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=doc/DETAILS;hb=HEAD#l323
[1]: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=doc/DETAILS;hb=HEAD#l713
[2]: https://github.com/micahflee/torbrowser-launcher/issues/147
2014-10-27 22:20:08 +00:00
Isis Lovecruft
6e59517aa7
Switch to using new Tor Project dist URL.
If I recall correctly, weasel (Tor Project's volunteer lead sysadmin)
tried to switch everything to using https://dist.torproject.org/ last
week, and then added an Apache redirect from
https://www.torproject.org/dist to https://dist.torproject.org after
discovering that some things were still trying to use the old URL. We
should switch to the new one, so that someday weasel can remove the
redirect.

 * CHANGE `default_mirror` to https://dist.torproject.org/
2014-10-27 20:05:16 +00:00
Micah Lee
38e67303b2 fixes versions path for TBB 4.x that was forcing TBL to try to always upgrade (#139) 2014-10-16 10:05:39 -07:00
Micah Lee
8e12a81897 license is actually MIT 2014-10-11 14:33:05 -07:00
Micah Lee
e3f49c29e6 license changed to BSD a long time ago, but never updated it here 2014-10-11 13:15:36 -07:00
Micah Lee
8972c6ba4d no longer detach start-tor-browser process, and play modem sound in a separate thread to prevent blocking 2014-10-01 00:46:21 +00:00
Micah Lee
876eb0bdc3 tbl_bin was getting set wrong since TBL was split into multiple files 2014-10-01 00:38:13 +00:00
Micah Lee
e25fbc5a73 display more verbose info when downloading TBB for the first time or updating (#135) 2014-09-30 23:44:38 +00:00
Micah Lee
97ccbd3f8e must not strip the "-Linux" from the latest version number if it isnt there already (#132) 2014-09-30 23:26:01 +00:00
Micah Lee
c536f50466 prepare for TBB 4 series change to RecommendedTBBVersion (#132) 2014-09-30 23:10:05 +00:00
Micah Lee
5469027886 split torbrowser-launcher into several files 2014-09-03 11:24:28 -07:00