-go_vendor-webtunnel: submodule-update

-	$(rbm) build webtunnel --step go_vendor --target alpha --target torbrowser-linux-x86_64

-

-

-  mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %]

-  mv_tbdir tor/pluggable_transports/README.WEBTUNNEL.md "$DOCSPATH/webtunnel/README.md"

-version: 0.1.0

-  go_vendor_sha256sum: d95d1fa8ce3904b76395b20ef169e8ef2b039fa485764b74739bb6290631537d

-git_hash: 0438a9a4ce1548be08dd2df891a38987bb313d22

-tar -xkf $rootdir/[% c('input_files_by_name/webtunnel') %]

-  cp -a tor/pluggable_transports/webtunnel-client aar/jni/[% c('arch') %]/libWebtunnel.so

-  - project: webtunnel

-    name: webtunnel

-    "lyrebird" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}lyrebird${pt_extension}",

-    "webtunnel" : "ClientTransportPlugin webtunnel exec ${pt_path}webtunnel-client${pt_extension}",

-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('\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

-

-patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch

-    cp $ptdir/webtunnel-client external/pluto/bin/armeabi-v7a/

-    cp $ptdir/webtunnel-client external/pluto/bin/armeabi/

-    cp $ptdir/webtunnel-client external/pluto/bin/arm64-v8a/

-    cp $ptdir/webtunnel-client external/pluto/bin/[% arch %]/

-  - filename: 0001-Bug-40800-Add-WebTunnel-support.patch

-#!/bin/bash

-[% c("var/set_default_env") -%]

-[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %]

-distdir=/var/tmp/dist/[% project %]

-mkdir -p $distdir

-

-[% IF c("var/android") -%]

-  [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]

-  # We need to explicitly set CGO_ENABLED with Go 1.13.x as the Android build

-  # breaks otherwise.

-  export CGO_ENABLED=1

-[% END -%]

-

-mkdir -p /var/tmp/build

-tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]

-cd /var/tmp/build/[% project %]-[% c('version') %]

-

-tar -xf $rootdir/[% c('input_files_by_name/go_vendor') %]

-

-cd main/client

-go build -ldflags '-s'

-cp -a client[% IF c("var/windows") %].exe[% END %] $distdir/webtunnel-client[% IF c("var/windows") %].exe[% END %]

-

-cd /var/tmp/build/[% project %]-[% c('version') %]

-cp -a README.md $distdir/README.WEBTUNNEL.md

-

-cd $distdir

-[% c('tar', {

-        tar_src => [ '.' ],

-        tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),

-    }) %]

-# vim: filetype=yaml sw=2

-version: '[% c("abbrev") %]'

-git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel.git

-git_hash: 38eb55054a5c3c072acc1d8f9a9afa36e3a5c9b7

-container:

-  use_container: 1

-

-steps:

-  build:

-    filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'

-    input_files:

-      - project: container-image

-      - name: go

-        project: go

-      - name: '[% c("var/compiler") %]'

-        project: '[% c("var/compiler") %]'

-        enable: '[% c("var/android") %]'

-      - name: go_vendor

-        pkg_type: go_vendor

-        project: webtunnel

-        norec:

-          sha256sum: e3b5a9b3c3939aafa5389246f3a7a7e78d70fe623bed495f99c39cc37bbbe645

-        target_replace:

-          '^torbrowser-(?!testbuild).*': 'torbrowser-linux-x86_64'