Skip to content
Snippets Groups Projects
Commit 0c364851 authored by Richard Pospesel's avatar Richard Pospesel
Browse files

Removed Webtunnel and Conjure PTs as they are alpha only for now

parent 1472747b
Branches
No related tags found
1 merge request!741Bug 40730: Tor Browser 12.5.0
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 198 deletions
projects/browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
+ 0
− 6
View file @ 0c364851
......@@ -3,9 +3,3 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser
## snowflake configuration
ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client
## webtunnel configuration
ClientTransportPlugin webtunnel exec ./TorBrowser/Tor/PluggableTransports/webtunnel-client
## conjure configuration
ClientTransportPlugin conjure exec ./TorBrowser/Tor/PluggableTransports/conjure-client -registerURL https://registration.refraction.network/api
projects/browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
+ 0
− 6
View file @ 0c364851
......@@ -3,9 +3,3 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec PluggableTra
## snowflake configuration
ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client
## webtunnel configuration
ClientTransportPlugin webtunnel exec PluggableTransports/webtunnel-client
## conjure configuration
ClientTransportPlugin conjure exec PluggableTransports/conjure-client -registerURL https://registration.refraction.network/api
projects/browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix
+ 0
− 6
View file @ 0c364851
......@@ -3,9 +3,3 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\T
## snowflake configuration
ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe
## webtunnel configuration
ClientTransportPlugin webtunnel exec TorBrowser\Tor\PluggableTransports\webtunnel-client.exe
## conjure configuration
ClientTransportPlugin conjure exec TorBrowser\Tor\PluggableTransports\conjure-client.exe -registerURL https://registration.refraction.network/api
projects/browser/build
+ 0
− 4
View file @ 0c364851
......@@ -109,11 +109,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b
# Move READMEs from tor-expert-bundle to the doc dir
mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %]
mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %]
mkdir -p "$TBDIR/$DOCSPATH/conjure" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/conjure"[% END %]
mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md"
mv_tbdir tor/pluggable_transports/README.WEBTUNNEL.md "$DOCSPATH/webtunnel/README.md"
mv_tbdir tor/pluggable_transports/README.CONJURE.md "$DOCSPATH/conjure/README.md"
# Move the PTs to where TB expects them
mkdir -p "$TBDIR/$TORBINPATH" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$TORBINPATH"[% END %]
......
......
projects/tor-android-service/config
+ 1
− 1
View file @ 0c364851
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]'
git_hash: 0438a9a4ce1548be08dd2df891a38987bb313d22
git_hash: f324999c1773a8d8c83c50106a2cac30be93aabf
git_url: https://gitlab.torproject.org/tpo/applications/tor-android-service.git
git_submodule: 1
container:
......
......
projects/tor-expert-bundle/build
+ 0
− 2
View file @ 0c364851
......@@ -11,8 +11,6 @@ mkdir pluggable_transports && cd pluggable_transports
tar -xkf $rootdir/[% c('input_files_by_name/lyrebird') %]
tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]
tar -xkf $rootdir/[% c('input_files_by_name/webtunnel') %]
tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]
# copy in bridge lines for each pluggable transport
mv $rootdir/bridges_list.obfs4.txt .
......
......
projects/tor-expert-bundle/config
+ 0
− 4
View file @ 0c364851
......@@ -18,10 +18,6 @@ input_files:
project: lyrebird
- name: snowflake
project: snowflake
- project: webtunnel
name: webtunnel
- name: conjure
project: conjure
- filename: pt_config.json
- filename: bridges_list.obfs4.txt
- filename: bridges_list.meek-azure.txt
......
......
projects/tor-expert-bundle/pt_config.json
+ 1
− 3
View file @ 0c364851
......@@ -2,9 +2,7 @@
"recommendedDefault" : "obfs4",
"pluggableTransports" : {
"lyrebird" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}lyrebird${pt_extension}",
"snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}",
"webtunnel" : "ClientTransportPlugin webtunnel exec ${pt_path}webtunnel-client${pt_extension}",
"conjure" : "ClientTransportPlugin conjure exec ${pt_path}conjure-client${pt_extension} -registerURL https://registration.refraction.network/api"
"snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}"
},
"bridges" : {
"meek-azure" : [
......
......
projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch deleted 100644 → 0
+ 0
− 74
View file @ 1472747b
From 3a6f835e8089dd15f5cd6487b5cfbdfafe7422f8 Mon Sep 17 00:00:00 2001
From: Shelikhoo <xiaokangwang@outlook.com>
Date: Tue, 14 Feb 2023 16:59:59 +0000
Subject: [PATCH] add WebTunnel Support
---
android/build.gradle | 3 +++
.../thali/toronionproxy/TorConfigBuilder.java | 19 +++++++++++++++----
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/android/build.gradle b/android/build.gradle
index e107e8e..acd92c1 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -102,6 +102,9 @@ task copyPluggableTransports(type: Copy) {
rename { filename ->
filename.replace 'conjure-client', 'libConjure.so'
}
+ rename { filename ->
+ filename.replace 'webtunnel-client', 'libWebtunnel.so'
+ }
}
gradle.projectsEvaluated {
diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
index b87993d..5e6d6c5 100644
--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
@@ -109,8 +109,8 @@ public final class TorConfigBuilder {
return this;
}
- public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure) throws IOException {
- if (pluggableTransportObfs == null || pluggableTransportSnow == null || pluggableTransportConjure == null) {
+ public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure, File pluggableTransportWebtunnel) throws IOException {
+ if (pluggableTransportObfs == null || pluggableTransportSnow == null || pluggableTransportConjure == null || pluggableTransportWebtunnel == null) {
return this;
}
@@ -144,7 +144,17 @@ public final class TorConfigBuilder {
.getCanonicalPath());
}
- transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath());
+ if (!pluggableTransportWebtunnel.exists()) {
+ throw new IOException("Webtunnel binary does not exist: " + pluggableTransportWebtunnel
+ .getCanonicalPath());
+ }
+
+ if (!pluggableTransportWebtunnel.canExecute()) {
+ throw new IOException("Webtunnel binary is not executable: " + pluggableTransportWebtunnel
+ .getCanonicalPath());
+ }
+
+ transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath(), pluggableTransportWebtunnel.getCanonicalPath());
return this;
}
@@ -511,10 +521,11 @@ public final class TorConfigBuilder {
return transPort(settings.transPort());
}
- public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) {
+ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath, String webtunnelPath) {
buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n');
buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n");
buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api\n");
+ buffer.append("ClientTransportPlugin webtunnel exec ").append(webtunnelPath).append('\n');
return this;
}
--
2.34.1
projects/tor-onion-proxy-library/0001-Bug-41361-Add-conjure-support.patch deleted 100644 → 0
+ 0
− 80
View file @ 1472747b
From edf4337158df11da3b6ef6d30050e2441cfeafeb Mon Sep 17 00:00:00 2001
From: Cecylia Bocovich <cohosh@torproject.org>
Date: Thu, 13 Oct 2022 10:20:59 -0400
Subject: [PATCH] Bug 41361: Add conjure support
---
android/build.gradle | 3 +++
.../thali/toronionproxy/TorConfigBuilder.java | 18 ++++++++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/android/build.gradle b/android/build.gradle
index 2392731..b1aca0a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -96,6 +96,9 @@ task copyPluggableTransports(type: Copy) {
rename { filename ->
filename.replace 'snowflake-client', 'libSnowflake.so'
}
+ rename { filename ->
+ filename.replace 'conjure-client', 'libConjure.so'
+ }
}
gradle.projectsEvaluated {
diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
index cc10783..c7e20c0 100644
--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
@@ -109,8 +109,8 @@ public final class TorConfigBuilder {
return this;
}
- public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow) throws IOException {
- if (pluggableTransportObfs == null || pluggableTransportSnow == null) {
+ public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure) throws IOException {
+ if (pluggableTransportObfs == null || pluggableTransportSnow == null || pluggableTransportConjure == null) {
return this;
}
@@ -124,6 +124,11 @@ public final class TorConfigBuilder {
.getCanonicalPath());
}
+ if (!pluggableTransportConjure.exists()) {
+ throw new IOException("Conjure binary does not exist: " + pluggableTransportConjure
+ .getCanonicalPath());
+ }
+
if (!pluggableTransportObfs.canExecute()) {
throw new IOException("Obfs4proxy binary is not executable: " + pluggableTransportObfs
.getCanonicalPath());
@@ -134,8 +139,12 @@ public final class TorConfigBuilder {
.getCanonicalPath());
}
+ if (!pluggableTransportConjure.canExecute()) {
+ throw new IOException("Conjure binary is not executable: " + pluggableTransportConjure
+ .getCanonicalPath());
+ }
- transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath());
+ transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath());
return this;
}
@@ -502,9 +511,10 @@ public final class TorConfigBuilder {
return transPort(settings.transPort());
}
- public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) {
+ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) {
buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n');
buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n");
+ buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api\n");
return this;
}
--
2.37.2
projects/tor-onion-proxy-library/build
+ 0
− 10
View file @ 0c364851
......@@ -24,8 +24,6 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
patch -p1 < $rootdir/gradle.patch
patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch
patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch
patch -p1 < $rootdir/0001-Bug-41361-Add-conjure-support.patch
patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch
[% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%]
# Extract tor-expert-bundle
......@@ -40,20 +38,12 @@ patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch
cp $ptdir/lyrebird external/pluto/bin/armeabi/obfs4proxy
cp $ptdir/snowflake-client external/pluto/bin/armeabi-v7a/
cp $ptdir/snowflake-client external/pluto/bin/armeabi/
cp $ptdir/conjure-client external/pluto/bin/armeabi-v7a/
cp $ptdir/conjure-client external/pluto/bin/armeabi/
cp $ptdir/webtunnel-client external/pluto/bin/armeabi-v7a/
cp $ptdir/webtunnel-client external/pluto/bin/armeabi/
[% ELSIF arch == "aarch64" -%]
cp $ptdir/lyrebird external/pluto/bin/arm64-v8a/obfs4proxy
cp $ptdir/snowflake-client external/pluto/bin/arm64-v8a/
cp $ptdir/conjure-client external/pluto/bin/arm64-v8a/
cp $ptdir/webtunnel-client external/pluto/bin/arm64-v8a/
[% ELSE -%]
cp $ptdir/lyrebird external/pluto/bin/[% arch %]/obfs4proxy
cp $ptdir/snowflake-client external/pluto/bin/[% arch %]/
cp $ptdir/conjure-client external/pluto/bin/[% arch %]/
cp $ptdir/webtunnel-client external/pluto/bin/[% arch %]/
[% END -%]
[% END -%]
......
......
projects/tor-onion-proxy-library/config
+ 0
− 2
View file @ 0c364851
......@@ -40,5 +40,3 @@ input_files:
- filename: gradle.patch
- filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch
- filename: 0001-Bug-30318-Add-snowflake-support.patch
- filename: 0001-Bug-41361-Add-conjure-support.patch
- filename: 0001-Bug-40800-Add-WebTunnel-support.patch
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment