summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2018-02-22 15:31:44 +0100
committeranonym <anonym@riseup.net>2018-02-22 15:36:11 +0100
commitfe03bad9209ca97f2b72ddab6af7beab469dd650 (patch)
tree7350c94971b719459554d1fd7bb77dfb6df6ca7a
parentacd8344f1f29792471daba5e122d89d41c4e31ad (diff)
WIP: real meek for moatfeature/15331-moat
-rwxr-xr-xconfig/chroot_local-hooks/10-tbb5
-rwxr-xr-xconfig/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh1
-rw-r--r--config/chroot_local-includes/etc/onion-grater.d/tor-launcher.yml1
3 files changed, 7 insertions, 0 deletions
diff --git a/config/chroot_local-hooks/10-tbb b/config/chroot_local-hooks/10-tbb
index a564ca5..0c1b605 100755
--- a/config/chroot_local-hooks/10-tbb
+++ b/config/chroot_local-hooks/10-tbb
@@ -74,6 +74,11 @@ install_tor_browser() {
# instead of the system one.
cp "${prep}"/TorBrowser/Tor/libstdc++.so.6 "${prep}"
+ mv "${prep}"/TorBrowser/Tor/PluggableTransports /usr/local/lib/meek
+ chmod -R a+rX /usr/local/lib/meek
+ chown -R root:root /usr/local/lib/meek
+ sed -i 's/attach_disconnected/attach_disconnected,complain/' /etc/apparmor.d/system_tor
+
# We don't need the Tor binary, the shared libraries Tor needs
# (but Firefox doesn't) and documentation shipped in the TBB.
rm -r "${prep}"/TorBrowser/Tor "${prep}"/TorBrowser/Docs
diff --git a/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh b/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh
index 123dbe8..f6b559e 100755
--- a/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh
+++ b/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh
@@ -85,6 +85,7 @@ EOF
# when bridge mode is not enabled, since we then use seccomp
# sandboxing.
tor_control_setconf 'ClientTransportPlugin="obfs2,obfs3,obfs4,meek_lite exec /usr/bin/obfs4proxy managed"'
+ tor_control_setconf 'ClientTransportPlugin="meek exec /usr/local/lib/meek/meek-client-torbrowser -- /usr/local/lib/meek/meek-client"'
/usr/local/sbin/tails-tor-launcher &
diff --git a/config/chroot_local-includes/etc/onion-grater.d/tor-launcher.yml b/config/chroot_local-includes/etc/onion-grater.d/tor-launcher.yml
index f26c0f0..67971b9 100644
--- a/config/chroot_local-includes/etc/onion-grater.d/tor-launcher.yml
+++ b/config/chroot_local-includes/etc/onion-grater.d/tor-launcher.yml
@@ -9,6 +9,7 @@
GETINFO:
- 'status/bootstrap-phase'
confs:
+ ClientTransportPlugin:
UseBridges: ['', '.*']
Bridge: ['', '.*']
Socks4Proxy: ['', '.*']