Obfuscation with V2Ray

.github/workflows/build.yml

@@ -25,6 +25,20 @@ jobs:
 
     - name: Install liboqs dependencies
       run: sudo apt-get update && sudo apt-get install -y astyle cmake gcc ninja-build libssl-dev python3-pytest python3-pytest-xdist unzip xsltproc doxygen graphviz python3-yaml valgrind
+
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.19
+
+    - name: Install Gomobile
+      run: |
+          go install golang.org/x/mobile/cmd/gomobile@latest
+          go install golang.org/x/mobile/cmd/gobind@latest
+          gomobile init
+
+    - name: Build V2Ray
+      run: ./v2ray/build.sh
 
     - name: Set up JDK 17
       uses: actions/setup-java@v3

.github/workflows/codeql.yml

@@ -35,6 +35,20 @@ jobs:
 
     - name: Checkout submodules
       run: git submodule update --init --recursive
+
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.19
+
+    - name: Install Gomobile
+      run: |
+          go install golang.org/x/mobile/cmd/gomobile@latest
+          go install golang.org/x/mobile/cmd/gobind@latest
+          gomobile init
+
+    - name: Build V2Ray
+      run: ./v2ray/build.sh
 
     - name: Set up JDK 17
       uses: actions/setup-java@v3

.gitignore

@@ -13,6 +13,7 @@ keystore.properties
 /.idea/
 /core/.cxx/
 core/.cxx/
+v2ray/libs/
 /store/production/
 /production/
 liboqs-android/**/*.so

core/build.gradle

@@ -140,6 +140,7 @@ def File registerGenTask(variantName, variantDirName) {
 def kemScript = "./../liboqs-android/jni/liboqs/scripts/build-android.sh"
 def kemPlatform = "android-21"
 def kemMechanisms = "KEM_kyber_1024;"
+def v2rayScript = "./../v2ray/build.sh"
 
 tasks.register("buildLiboqsARM64", Exec) {
     commandLine kemScript, android.ndkDirectory, "-a", "arm64-v8a", "-p", kemPlatform, "-m", kemMechanisms
@@ -157,26 +158,33 @@ tasks.register("buildLiboqsX86", Exec) {
     commandLine kemScript, android.ndkDirectory, "-a", "x86", "-p", kemPlatform, "-m", kemMechanisms
 }
 
+tasks.register("buildV2ray", Exec) {
+    commandLine v2rayScript
+}
+
 android.libraryVariants.all { variant ->
     def sourceDir = registerGenTask(variant.name, variant.baseName.replace("-", "/"))
     def generateOpenVPN3Swig = tasks.named("generateOpenVPN3Swig${variant.name}").get()
     def buildLiboqsARM64 = tasks.named("buildLiboqsARM64").get()
     def buildLiboqsARM = tasks.named("buildLiboqsARM").get()
     def buildLiboqsX8664 = tasks.named("buildLiboqsX8664").get()
     def buildLiboqsX86 = tasks.named("buildLiboqsX86").get()
+    def buildV2ray = tasks.named("buildV2ray").get()
     variant.registerJavaGeneratingTask(generateOpenVPN3Swig, sourceDir)
     variant.registerJavaGeneratingTask(buildLiboqsARM64, sourceDir)
     variant.registerJavaGeneratingTask(buildLiboqsARM, sourceDir)
     variant.registerJavaGeneratingTask(buildLiboqsX8664, sourceDir)
     variant.registerJavaGeneratingTask(buildLiboqsX86, sourceDir)
+    variant.registerJavaGeneratingTask(buildV2ray, sourceDir)
 }
 
 project.afterEvaluate {
     preBuild.dependsOn(
         tasks.named("buildLiboqsARM64").get(),
         tasks.named("buildLiboqsARM").get(),
         tasks.named("buildLiboqsX8664").get(),
-        tasks.named("buildLiboqsX86").get()
+        tasks.named("buildLiboqsX86").get(),
+        tasks.named("buildV2ray").get()
     )
 }
 
@@ -278,6 +286,9 @@ dependencies {
     // liboqs
     implementation project(path: ':liboqs-android')
 
+    // V2Ray
+    implementation project(path: ':v2ray')
+
     // For crash logging.
     implementation 'io.sentry:sentry-android:4.3.0'
     implementation "androidx.multidex:multidex:2.0.1"

core/src/main/assets/v2ray-config.json

@@ -0,0 +1,70 @@
+{
+  "log":{
+    "loglevel":"debug"
+  },
+  "inbounds":[
+    {
+      "tag":"vpn",
+      "port":"16661",
+      "listen":"127.0.0.1",
+      "protocol":"dokodemo-door",
+      "settings":{
+        "address":"",
+        "port":0,
+        "network":"udp"
+      }
+    }
+  ],
+  "outbounds":[
+    {
+      "tag":"proxy",
+      "protocol":"vmess",
+      "settings":{
+        "vnext":[
+          {
+            "address":"",
+            "port":0,
+            "users":[
+              {
+                "id":"",
+                "alterId":0,
+                "security":"none"
+              }
+            ]
+          }
+        ]
+      },
+      "streamSettings":{
+        "network":"quic",
+        "security":"tls",
+        "quicSettings":{
+          "security":"",
+          "key":"",
+          "header":{
+            "type":"srtp"
+          }
+        },
+        "tlsSettings":{
+          "serverName":"xb1.gw.inet-telecom.com"
+        },
+        "tcpSettings":{
+          "header":{
+            "type":"http",
+            "request":{
+              "version":"1.1",
+              "method":"GET",
+              "path":["/"],
+              "headers":{
+                "Host":["www.inet-telecom.com"],
+                "User-Agent":["Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.75 Safari/537.36", "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46"],
+                "Accept-Encoding":["gzip, deflate"],
+                "Connection":["keep-alive"],
+                "Pragma":"no-cache"
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

core/src/main/java/net/ivpn/core/common/Mapper.kt

@@ -25,6 +25,7 @@ package net.ivpn.core.common
 import com.google.gson.Gson
 import com.google.gson.JsonSyntaxException
 import com.google.gson.reflect.TypeToken
+import net.ivpn.core.common.v2ray.V2RaySettings
 import net.ivpn.core.rest.data.ServersListResponse
 import net.ivpn.core.rest.data.model.AntiTracker
 import net.ivpn.core.rest.data.model.Port
@@ -91,6 +92,15 @@ object Mapper {
         return Gson().toJson(dns)
     }
 
+    fun v2raySettingsFrom(json: String?): V2RaySettings {
+        val type = object : TypeToken<V2RaySettings>() {}.type
+        return Gson().fromJson(json, type)
+    }
+
+    fun stringFromV2raySettings(settings: V2RaySettings?): String {
+        return Gson().toJson(settings)
+    }
+
     fun stringFromIps(ips: List<String>?): String? {
         if (ips == null) return null
         return Gson().toJson(ips)

core/src/main/java/net/ivpn/core/common/prefs/EncryptedSettingsPreference.kt

@@ -56,6 +56,8 @@ class EncryptedSettingsPreference @Inject constructor(val preference: Preference
         private const val SETTINGS_MOCK_LOCATION = "SETTINGS_MOCK_LOCATION"
         private const val SETTINGS_BYPASS_LOCAL = "SETTINGS_BYPASS_LOCAL"
         private const val SETTINGS_IPV6 = "SETTINGS_IPV6"
+        private const val SETTINGS_V2RAY = "SETTINGS_V2RAY"
+        private const val SETTINGS_V2RAY_PROTOCOL = "SETTINGS_V2RAY_PROTOCOL"
         private const val IPV6_SHOW_ALL_SERVERS = "IPV6_SHOW_ALL_SERVERS"
 
         private const val OV_PORT = "OV_PORT"
@@ -75,6 +77,7 @@ class EncryptedSettingsPreference @Inject constructor(val preference: Preference
         private const val LAST_USED_IP = "LAST_USED_IP"
         private const val ANTITRACKER_LIST = "ANTITRACKER_LIST"
         private const val ANTITRACKER_DNS = "ANTITRACKER_DNS"
+        private const val V2RAY_SETTINGS = "V2RAY_SETTINGS"
     }
 
     private val sharedPreferences: SharedPreferences = preference.settingsPreference
@@ -109,6 +112,26 @@ class EncryptedSettingsPreference @Inject constructor(val preference: Preference
                     .apply()
         }
 
+    var v2ray: Boolean
+        get() {
+            return sharedPreferences.getBoolean(SETTINGS_V2RAY, false)
+        }
+        set(value) {
+            sharedPreferences.edit()
+                .putBoolean(SETTINGS_V2RAY, value)
+                .apply()
+        }
+
+    var v2rayProtocol: String?
+        get() {
+            return sharedPreferences.getString(SETTINGS_V2RAY_PROTOCOL, "")
+        }
+        set(value) {
+            sharedPreferences.edit()
+                .putString(SETTINGS_V2RAY_PROTOCOL, value)
+                .apply()
+        }
+
     var killSwitch: Boolean
         get() {
             return sharedPreferences.getBoolean(SETTINGS_KILL_SWITCH, false)
@@ -492,6 +515,16 @@ class EncryptedSettingsPreference @Inject constructor(val preference: Preference
         return sharedPreferences.getString(ANTITRACKER_DNS, "")
     }
 
+    fun setV2raySettings(json: String?) {
+        sharedPreferences.edit()
+            .putString(V2RAY_SETTINGS, json)
+            .apply()
+    }
+
+    fun getV2raySettings(): String? {
+        return sharedPreferences.getString(V2RAY_SETTINGS, "")
+    }
+
     private fun putIsMigrated(isMigrated: Boolean) {
         sharedPreferences.edit()
                 .putBoolean(IS_MIGRATED, isMigrated)

core/src/main/java/net/ivpn/core/common/prefs/ServersRepository.kt

@@ -188,6 +188,8 @@ class ServersRepository @Inject constructor(
                 settings.wireGuardPortRanges = response.config.ports.wireguard.filter { it.range != null }
                 settings.openVpnPortRanges = response.config.ports.openvpn.filter { it.range != null }
                 settings.antiTrackerList = response.config.antiTrackerPlus.list
+                settings.v2raySettings = response.config.ports.v2ray
+
                 if (settings.antiTracker == null) {
                     val defaultDns = AntiTracker()
                     settings.antiTracker = defaultDns.getDefaultList(settings.antiTrackerList, settings, userPreference)
@@ -270,6 +272,7 @@ class ServersRepository @Inject constructor(
             settings.wireGuardPortRanges = response.config.ports.wireguard.filter { it.range != null }
             settings.openVpnPortRanges = response.config.ports.openvpn.filter { it.range != null }
             settings.antiTrackerList = response.config.antiTrackerPlus.list
+            settings.v2raySettings = response.config.ports.v2ray
             if (settings.antiTracker == null) {
                 val defaultDns = AntiTracker()
                 settings.antiTracker = defaultDns.getDefaultList(settings.antiTrackerList, settings, userPreference)
@@ -289,6 +292,7 @@ class ServersRepository @Inject constructor(
             settings.wireGuardPortRanges = response.config.ports.wireguard.filter { it.range != null }
             settings.openVpnPortRanges = response.config.ports.openvpn.filter { it.range != null }
             settings.antiTrackerList = response.config.antiTrackerPlus.list
+            settings.v2raySettings = response.config.ports.v2ray
             if (settings.antiTracker == null) {
                 val defaultDns = AntiTracker()
                 settings.antiTracker = defaultDns.getDefaultList(settings.antiTrackerList, settings, userPreference)

core/src/main/java/net/ivpn/core/common/prefs/Settings.kt

@@ -29,6 +29,7 @@ import net.ivpn.core.common.BuildController
 import net.ivpn.core.common.Mapper
 import net.ivpn.core.common.dagger.ApplicationScope
 import net.ivpn.core.common.nightmode.NightMode
+import net.ivpn.core.common.v2ray.V2RaySettings
 import net.ivpn.core.rest.data.model.AntiTracker
 import net.ivpn.core.rest.data.model.Port
 import net.ivpn.core.v2.serverlist.dialog.Filters
@@ -310,6 +311,27 @@ class Settings @Inject constructor(
             settingsPreference.setAntiTracker(Mapper.stringFromAntiTracker(dns))
         }
 
+    var v2ray: Boolean
+        get() = settingsPreference.v2ray
+        set(v2ray) {
+            settingsPreference.v2ray = v2ray
+        }
+
+    var v2rayProtocol: String
+        get() = settingsPreference.v2rayProtocol ?: "udp"
+        set(v2rayProtocol) {
+            settingsPreference.v2rayProtocol = v2rayProtocol
+        }
+
+    var v2raySettings: V2RaySettings?
+        get() {
+            val json = settingsPreference.getV2raySettings()
+            return if (json!!.isEmpty()) null else Mapper.v2raySettingsFrom(json)
+        }
+        set(settings) {
+            settingsPreference.setV2raySettings(Mapper.stringFromV2raySettings(settings))
+        }
+
     fun nextPort() {
         val protocol = stickyPreference.currentProtocol
         if (protocol == Protocol.OPENVPN) {