Conjure merge to Master

README.md

@@ -1,8 +1,8 @@
 <p align="center">
 <a href="https://refraction.network"><img src="https://user-images.githubusercontent.com/5443147/30133006-7c3019f4-930f-11e7-9f60-3df45ee13d9d.png" alt="refract"></a>
-<h1 class="header-title" align="center">TapDance Client</h1>
+<h1 class="header-title" align="center">Refraction Networking Client</h1>
 
-<p align="center">TapDance is a free-to-use anti-censorship technology, protected from enumeration attacks.</p>
+<p align="center">Refraction Networking is a free-to-use anti-censorship technology, that places proxies at Internet Service Providers, so they are harder to block. This client includes support for both the TapDance and Conjure protocols</p>
 <p align="center">
 <a href="https://travis-ci.org/refraction-networking/gotapdance"><img src="https://travis-ci.org/refraction-networking/gotapdance.svg?branch=master"></a>
 <a href="https://godoc.org/github.com/refraction-networking/gotapdance/tapdance"><img src="https://img.shields.io/badge/godoc-reference-blue.svg"></a>

build-apk.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+
+REPO_DIR=$GOPATH/src/github.com/refraction-networking/gotapdance/
+
+#sed -i.bak "s/buildInfo = \"\"/buildInfo = \"$TRAVIS_BRANCH-$TRAVIS_COMMIT\"/" tapdance/logger.go
+git clone https://github.com/Psiphon-Labs/psiphon-tunnel-core.git $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core
+cd $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core && git checkout -b build-refraction-networking
+
+
+go get github.com/kardianos/govendor
+cd $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core && $GOPATH/bin/govendor remove github.com/refraction-networking/gotapdance/...
+
+sed -i.bak 's/refraction_networking_tapdance.Logger().Out = ioutil.Discard//' $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/tapdance/tapdance.go
+
+
+# Conjure APK
+echo "Conjure APK before_Script"
+
+cd $GOPATH/src/github.com/refraction-networking/gotapdance
+
+docker pull refraction/psiandroid:latest
+
+mkdir -p $GOPATH/src/bitbucket.org/psiphon
+hg clone https://bitbucket.org/psiphon/psiphon-circumvention-system $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system
+
+cd $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system #&& hg checkout
+
+# Use modified EmbeddedValues.java for TapDance
+cd $GOPATH/src/github.com/refraction-networking/gotapdance
+/usr/local/ssl/bin/openssl enc -nosalt -aes-256-cbc -md sha512 -pbkdf2 -iter 1000 -pass pass:$aes_cbc_passwd  -d -in build/EmbeddedValues.java.enc -out $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android/app/src/main/java/com/psiphon3/psiphonlibrary/EmbeddedValues.java
+
+echo "patching..."
+# Patched tunneling protocol for TapDance
+patch $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android/app/src/main/java/com/psiphon3/psiphonlibrary/TunnelManager.java build/TunnelManager.java.patch
+
+# Patch the Psiphon app's gradle build for java 1.8 compatibility [TODO]{priority:later} remove this when psiphon merges it themselves
+patch $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android/app/build.gradle build/PsiphonCoreGradle.patch
+
+# Add dialer options to enable Conjure
+patch $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/tapdance/tapdance.go build/conjure.golang.patch
+
+echo "digesting..."
+# Digest this branch's ClientConf into Psiphon's embedded_config
+./test_scripts/psiphon_digest_cc.sh ./assets/ClientConf $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/tapdance/embedded_config.go
+
+echo "Conjure APK script"
+cd $REPO_DIR
+
+# Build Psiphon Android Library ca.psiphon.aar
+#docker run -v $DOCKER_DIR:$GOPATH/go/src/github.com/refraction-networking/gotapdance -v $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core:$GOPATH/go/src/github.com/Psiphon-Labs/psiphon-tunnel-core refraction/psiandroid /bin/bash -c 'cd $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core/MobileLibrary/Android && ./make.bash "TAPDANCE"'
+docker run -v $REPO_DIR:/go/src/github.com/refraction-networking/gotapdance -v $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core:/go/src/github.com/Psiphon-Labs/psiphon-tunnel-core refraction/psiandroid /bin/bash -c 'cd /go/src/github.com/Psiphon-Labs/psiphon-tunnel-core/MobileLibrary/Android && ./make.bash "TAPDANCE"'
+
+echo "moving .aar"
+cd $GOPATH/src/github.com/refraction-networking/gotapdance
+mv $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core/MobileLibrary/Android/ca.psiphon.aar build/
+
+# Build Psiphon Android App PsiphonAndroid-debug.apk
+cp -f build/ca.psiphon.aar $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android/app/libs/
+
+cd $GOPATH/src/github.com/refraction-networking/gotapdance
+echo "docker run gradlew assembleDebug.."
+#docker run -v $DOCKER_DIR:/go/src/github.com/refraction-networking/gotapdance -v $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android:/go/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android refraction/psiandroid /bin/bash -c 'yes | /android-sdk-linux/tools/bin/sdkmanager --update && cd /go/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android && ./gradlew assembleDebug'
+docker run -v $REPO_DIR:/go/src/github.com/refraction-networking/gotapdance -v $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android:/go/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android refraction/psiandroid /bin/bash -c 'yes | /android-sdk-linux/tools/bin/sdkmanager --update && cd /go/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android && ./gradlew assembleDebug'
+
+cp $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android/app/build/outputs/apk/debug/PsiphonAndroid-debug.apk build/PsiphonAndroid-CJ-debug.apk
+
+pwd
+echo "build/PsiphonAndroid-CJ-debug.apk"

build/PsiphonCoreGradle.patch

@@ -0,0 +1,15 @@
+diff -r 00488348a5f0 Android/app/build.gradle
+--- a/Android/app/build.gradle	Tue Oct 22 15:38:52 2019 -0400
++++ b/Android/app/build.gradle	Wed Oct 30 14:28:38 2019 -0600
+@@ -40,6 +40,11 @@
+         release
+     }
+
++    compileOptions {
++        sourceCompatibility JavaVersion.VERSION_1_8
++        targetCompatibility JavaVersion.VERSION_1_8
++    }
++
+     buildTypes {
+         debug {
+             pseudoLocalesEnabled true

build/conjure.golang.patch

@@ -0,0 +1,34 @@
+diff --git a/psiphon/common/tapdance/tapdance.go b/psiphon/common/tapdance/tapdance.go
+index de08e792..1df69252 100644
+--- a/psiphon/common/tapdance/tapdance.go
++++ b/psiphon/common/tapdance/tapdance.go
+@@ -40,6 +40,7 @@ import (
+ 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common"
+ 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/errors"
+ 	"github.com/armon/go-proxyproto"
++	refraction_networking_proto "github.com/refraction-networking/gotapdance/protobuf"
+ 	refraction_networking_tapdance "github.com/refraction-networking/gotapdance/tapdance"
+ )
+
+@@ -327,8 +328,20 @@ func Dial(
+
+ 	manager := newDialManager(netDialer.DialContext)
+
++	registrar := refraction_networking_tapdance.APIRegistrar{
++		Endpoint:           "https://registration.refraction.network/api/register",
++		ConnectionDelay:    750 * time.Millisecond,
++		MaxRetries:         3,
++		SecondaryRegistrar: refraction_networking_tapdance.DecoyRegistrar{},
++	}
++
+ 	tapdanceDialer := &refraction_networking_tapdance.Dialer{
+-		TcpDialer: manager.dial,
++		TcpDialer:          manager.dial,
++		DarkDecoy:          true,
++		UseProxyHeader:     true,
++		Width:              5,
++		DarkDecoyRegistrar: registrar,
++		Transport:          refraction_networking_proto.TransportType_Min,
+ 	}
+
+ 	// If the dial context is cancelled, use dialManager to interrupt