Update common, Proxyguard support

app/proguard-rules.pro

@@ -1,3 +1,6 @@
+# This will allow us to get the correct file line numbers to the errors
+-keepattributes SourceFile,LineNumberTable
+
 -dontwarn com.google.errorprone.annotations.*
 -dontwarn org.bouncycastle.jsse.**
 -dontwarn org.conscrypt.*

app/src/androidTest/java/nl/eduvpn/app/service/SerializerServiceTest.java

@@ -62,12 +62,12 @@ public void testAppSettingsSerialization() throws SerializerService.UnknownForma
         Settings settings = new Settings(true, true);
         JSONObject jsonObject = _serializerService.serializeAppSettings(settings);
         Settings deserializedSettings = _serializerService.deserializeAppSettings(jsonObject);
-        assertEquals(settings.forceTcp(), deserializedSettings.forceTcp());
+        assertEquals(settings.preferTcp(), deserializedSettings.preferTcp());
         assertEquals(settings.useCustomTabs(), deserializedSettings.useCustomTabs());
         settings = new Settings(false, false);
         jsonObject = _serializerService.serializeAppSettings(settings);
         deserializedSettings = _serializerService.deserializeAppSettings(jsonObject);
-        assertEquals(settings.forceTcp(), deserializedSettings.forceTcp());
+        assertEquals(settings.preferTcp(), deserializedSettings.preferTcp());
         assertEquals(settings.useCustomTabs(), deserializedSettings.useCustomTabs());
     }
 

app/src/main/java/nl/eduvpn/app/MainActivity.kt

@@ -122,7 +122,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                 }
 
                 is MainViewModel.MainParentAction.ConnectWithConfig -> {
-                    viewModel.parseConfigAndStartConnection(this, parentAction.config, parentAction.forceTCP)
+                    viewModel.parseConfigAndStartConnection(this, parentAction.config, parentAction.preferTcp)
                     openFragment(ConnectionStatusFragment(), false)
                 }
 
@@ -169,7 +169,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             .setItems(instancesWithNames.map { it.second }.toTypedArray()) { _, which ->
                 val selectedInstance = instancesWithNames[which]
                 selectedInstance.first.countryCode?.let { countryCode ->
-                    viewModel.onCountrySelected(cookie, countryCode)
+                    viewModel.onCountrySelected(cookie, selectedInstance.first.baseURI, countryCode)
                 }
             }.show()
     }

app/src/main/java/nl/eduvpn/app/entity/CookieAndProfileMapData.kt

@@ -20,7 +20,6 @@ data class ProfileWithoutIdMap(
             Profile(
                 profileId = it.key,
                 displayName = it.value.displayName,
-                vpnProtocolList = it.value.supportedProtocols
             )
         } ?: emptyList()
     }
@@ -32,7 +31,4 @@ data class ProfileWithoutIdMap(
 data class ProfileWithoutId(
     @SerialName("display_name")
     val displayName: TranslatableString,
-
-    @SerialName("supported_protocols")
-    val supportedProtocols: List<Int>,
 )

app/src/main/java/nl/eduvpn/app/entity/Profile.kt

@@ -14,7 +14,4 @@ data class Profile (
 
     @SerialName("display_name")
     val displayName: TranslatableString,
-
-    @SerialName("vpn_proto_list")
-    val vpnProtocolList: List<Int>,
 ) : Parcelable

app/src/main/java/nl/eduvpn/app/entity/SerializedVpnConfig.kt

@@ -9,5 +9,16 @@ data class SerializedVpnConfig(
     val config: String,
     val protocol: Int,
     @SerialName("default_gateway")
-    val defaultGateway: Boolean
+    val defaultGateway: Boolean,
+    @SerialName("should_failover")
+    val shouldFailover: Boolean = false,
+    val proxy: ProxySettings? = null
+)
+
+@Serializable
+data class ProxySettings(
+    @SerialName("source_port")
+    val sourcePort: Int,
+    val listen: String,
+    val peer: String
 )

app/src/main/java/nl/eduvpn/app/entity/Settings.java

@@ -24,22 +24,22 @@
 public class Settings {
 
     public static final boolean USE_CUSTOM_TABS_DEFAULT_VALUE = true;
-    public static final boolean FORCE_TCP_DEFAULT_VALUE = false;
+    public static final boolean PREFER_TCP_DEFAULT_VALUE = false;
 
     private boolean _useCustomTabs;
-    private boolean _forceTcp;
+    private boolean _preferTcp;
 
-    public Settings(boolean useCustomTabs, boolean forceTcp) {
+    public Settings(boolean useCustomTabs, boolean preferTcp) {
         _useCustomTabs = useCustomTabs;
-        _forceTcp = forceTcp;
+        _preferTcp = preferTcp;
     }
 
     public boolean useCustomTabs() {
         return _useCustomTabs;
     }
 
-    public boolean forceTcp() {
-        return _forceTcp;
+    public boolean preferTcp() {
+        return _preferTcp;
     }
 
 }

app/src/main/java/nl/eduvpn/app/fragment/ConnectionStatusFragment.kt

@@ -204,6 +204,7 @@ class ConnectionStatusFragment : BaseFragment<FragmentConnectionStatusBinding>()
         }
         viewModel.timer.observe(viewLifecycleOwner, updateCertExpiryObserver)
         val vpnStatusObserver = { vpnStatus: VPNStatus ->
+            viewModel.notifyVpnStatus(vpnStatus)
             binding.connectionStatus.setText(VPNConnectionService.vpnStatusToStringID(vpnStatus))
             when (vpnStatus) {
                 VPNStatus.CONNECTED -> {

app/src/main/java/nl/eduvpn/app/fragment/SettingsFragment.kt

@@ -33,10 +33,7 @@ import nl.eduvpn.app.SettingsActivity
 import nl.eduvpn.app.base.BaseFragment
 import nl.eduvpn.app.databinding.FragmentSettingsBinding
 import nl.eduvpn.app.entity.Settings
-import nl.eduvpn.app.service.HistoryService
-import nl.eduvpn.app.service.PreferencesService
 import nl.eduvpn.app.viewmodel.SettingsViewModel
-import javax.inject.Inject
 
 /**
  * Fragment which displays the available settings to the user.
@@ -53,9 +50,9 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding>() {
         EduVPNApplication.get(view.context).component().inject(this)
         val originalSettings = viewModel.appSettings
         binding.useCustomTabsSwitch.isChecked = originalSettings.useCustomTabs()
-        binding.forceTcpSwitch.isChecked = originalSettings.forceTcp()
+        binding.preferTcpSwitch.isChecked = originalSettings.preferTcp()
         binding.useCustomTabsSwitch.setOnClickListener { saveSettings() }
-        binding.forceTcpSwitch.setOnClickListener { saveSettings() }
+        binding.preferTcpSwitch.setOnClickListener { saveSettings() }
         binding.licensesButton.setOnClickListener {
             startActivity(
                 Intent(
@@ -114,7 +111,7 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding>() {
 
     private fun saveSettings() {
         val useCustomTabs = binding.useCustomTabsSwitch.isChecked
-        val forceTcp = binding.forceTcpSwitch.isChecked
-        viewModel.storeAppSettings(Settings(useCustomTabs, forceTcp))
+        val preferTcp = binding.preferTcpSwitch.isChecked
+        viewModel.storeAppSettings(Settings(useCustomTabs, preferTcp))
     }
 }

app/src/main/java/nl/eduvpn/app/inject/ApplicationModule.kt

@@ -32,6 +32,7 @@ import nl.eduvpn.app.utils.Log
 import okhttp3.Cache
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
+import org.eduvpn.common.Protocol
 import java.io.IOException
 import java.net.ConnectException
 import java.net.SocketTimeoutException
@@ -147,8 +148,8 @@ class ApplicationModule(private val application: EduVPNApplication) {
         wireGuardServiceProvider: Provider<WireGuardService>
     ): Optional<VPNService> {
         return when (preferencesService.getCurrentProtocol()) {
-            org.eduvpn.common.Protocol.OpenVPN.nativeValue -> Optional.of(eduOpenVPNServiceProvider.get())
-            org.eduvpn.common.Protocol.WireGuard.nativeValue -> Optional.of(wireGuardServiceProvider.get())
+            Protocol.OpenVPN.nativeValue -> Optional.of(eduOpenVPNServiceProvider.get())
+            Protocol.WireGuard.nativeValue, Protocol.WireGuardWithProxyGuard.nativeValue -> Optional.of(wireGuardServiceProvider.get())
             else -> Optional.empty()
         }
     }

app/src/main/java/nl/eduvpn/app/service/BackendService.kt

@@ -14,6 +14,7 @@ import nl.eduvpn.app.entity.CertExpiryTimes
 import nl.eduvpn.app.entity.CurrentServer
 import nl.eduvpn.app.entity.Instance
 import nl.eduvpn.app.entity.Profile
+import nl.eduvpn.app.entity.ProxySettings
 import nl.eduvpn.app.entity.SerializedVpnConfig
 import nl.eduvpn.app.entity.exception.CommonException
 import nl.eduvpn.app.service.SerializerService.UnknownFormatException
@@ -22,6 +23,7 @@ import org.eduvpn.common.GoBackend
 import org.eduvpn.common.GoBackend.Callback
 import org.eduvpn.common.ServerType
 import java.io.File
+import java.io.FileDescriptor
 import java.net.InetAddress
 import java.net.NetworkInterface
 import java.util.Collections
@@ -42,9 +44,9 @@ class BackendService(
     }
 
     enum class State(val nativeValue: Int) {
-        ASK_LOCATION(2),
-        OAUTH_STARTED(6),
-        ASK_PROFILE(9)
+        OAUTH_STARTED(3),
+        ASK_LOCATION(5),
+        ASK_PROFILE(6)
     }
 
     private val goBackend = GoBackend()
@@ -60,30 +62,26 @@ class BackendService(
         selectProfiles: (List<Profile>) -> Unit,
         selectCountry: (Int?) -> Unit,
         connectWithConfig: (SerializedVpnConfig, Boolean) -> Unit,
-        showError: (Throwable) -> Unit
+        showError: (Throwable) -> Unit,
+        protectSocket: (Int) -> Unit
     ): String? {
-        onConfigReady = { config, forceTcp ->
-            connectWithConfig(config, forceTcp)
+        onConfigReady = { config, preferTcp ->
+            connectWithConfig(config, preferTcp)
         }
         GoBackend.callbackFunction = object : Callback {
 
             // The library wants to get a token from our internal storage
-            override fun getToken(serverJson: String): String? {
-                // Find out the serverId
-                val parsedServer = serializerService.deserializeCurrentServer(serverJson)
-                parsedServer.getUniqueId()?.let { uniqueId ->
-                    return preferencesService.getToken(uniqueId)
-                }
-                return null
+            override fun getToken(serverId: String): String? {
+                return preferencesService.getToken(serverId)
             }
 
             // The library wants to save a token in our internal storage
-            override fun setToken(serverJson: String, token: String?) {
-                // Find out the serverId
-                val parsedServer = serializerService.deserializeCurrentServer(serverJson)
-                parsedServer.getUniqueId()?.let { uniqueId ->
-                    preferencesService.setToken(uniqueId, token)
-                }
+            override fun setToken(serverId: String, token: String?) {
+                preferencesService.setToken(serverId, token)
+            }
+
+            override fun onProxyFileDescriptor(fileDescriptor: Int) {
+                protectSocket(fileDescriptor)
             }
 
             // Called when the native state machine changes
@@ -246,19 +244,19 @@ class BackendService(
     }
 
     @kotlin.jvm.Throws(CommonException::class, UnknownFormatException::class)
-    suspend fun getConfig(instance: Instance, forceTCP: Boolean) = withContext(Dispatchers.IO) {
+    suspend fun getConfig(instance: Instance, preferTcp: Boolean) = withContext(Dispatchers.IO) {
         val dataErrorTuple = goBackend.getProfiles(
             instance.authorizationType.toNativeServerType().nativeValue,
             instance.baseURI,
-            forceTCP,
+            preferTcp,
             false
         )
 
         if (dataErrorTuple.isError) {
             throw CommonException(dataErrorTuple.error)
         }
         val config = serializerService.deserializeSerializedVpnConfig(dataErrorTuple.data)
-        onConfigReady?.invoke(config, forceTCP)
+        onConfigReady?.invoke(config, preferTcp)
     }
 
     @kotlin.jvm.Throws(CommonException::class)
@@ -282,11 +280,11 @@ class BackendService(
         }
     }
 
-    fun selectCountry(cookie: Int?, countryCode: String) {
+    fun selectCountry(cookie: Int?, organizationId: String, countryCode: String) {
         val errorString = if (cookie != null) {
             goBackend.cookieReply(cookie, countryCode)
         } else {
-            goBackend.selectCountry(countryCode)
+            goBackend.selectCountry(organizationId, countryCode)
         }
         if (errorString != null) {
             throw CommonException(errorString)
@@ -313,6 +311,22 @@ class BackendService(
         }
     }
 
+    fun notifyConnecting() {
+        goBackend.notifyConnecting()
+    }
+
+    fun notifyConnected () {
+        goBackend.notifyConnected()
+    }
+
+    fun notifyDisconnecting() {
+        goBackend.notifyDisconnecting()
+    }
+
+    fun notifyDisconnected() {
+        goBackend.notifyDisconnected()
+    }
+
     fun getLogFile() : File? {
         val configDirectory = File(context.cacheDir, DIRECTORY_BACKEND_CONFIG_FILES)
         val configFile = File(configDirectory, "log")
@@ -371,5 +385,14 @@ class BackendService(
             }
         }
     }
+
+
+    @Throws(CommonException::class)
+    suspend fun startProxyguard(proxy: ProxySettings) = withContext(Dispatchers.IO) {
+        val result = goBackend.startProxyGuard(proxy.sourcePort, proxy.listen, proxy.peer)
+        if (!result.isNullOrEmpty()) {
+            throw CommonException(result)
+        }
+    }
 }
 

app/src/main/java/nl/eduvpn/app/service/EduVPNOpenVPNService.java

@@ -33,7 +33,6 @@
 import androidx.lifecycle.LiveData;
 
 import org.eduvpn.common.Protocol;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -200,12 +199,12 @@ public VpnProfile importConfig(String configString, String preferredName) {
      */
     public void connect(@NonNull Activity activity, @NonNull VpnProfile vpnProfile) {
         Log.i(TAG, "Initiating connection with profile:" + vpnProfile.getUUIDString());
-        boolean forceTcp = _preferencesService.getAppSettings().forceTcp();
-        Log.i(TAG, "Force TCP: " + forceTcp);
+        boolean preferTcp = _preferencesService.getAppSettings().preferTcp();
+        Log.i(TAG, "Prefet TCP: " + preferTcp);
         // If force TCP is enabled, disable the UDP connections
         for (Connection connection : vpnProfile.mConnections) {
             if (connection.mUseUdp) {
-                connection.mEnabled = !forceTcp;
+                connection.mEnabled = !preferTcp;
             }
         }
         // Make sure these changes are NOT saved, since we don't want the config changes to be permanent.

app/src/main/java/nl/eduvpn/app/service/PreferencesService.kt

@@ -146,13 +146,6 @@ class PreferencesService(
                     }
                 }
             }
-
-            val editor = insecurePreferences.edit()
-            editor.putInt(KEY_STORAGE_VERSION, STORAGE_VERSION)
-            editor.commit()
-            if (Constants.DEBUG) {
-                Log.d(TAG, "Migrated over to storage version v4.")
-            }
         }
         if (version < 5) {
             securePreferences.edit()
@@ -165,6 +158,12 @@ class PreferencesService(
                 Log.d(TAG, "Migrated over to storage version v5.")
             }
         }
+        val editor = insecurePreferences.edit()
+        editor.putInt(KEY_STORAGE_VERSION, STORAGE_VERSION)
+        editor.commit()
+        if (Constants.DEBUG) {
+            Log.d(TAG, "Migrated over to storage version v4.")
+        }
     }
 
     /**
@@ -235,7 +234,7 @@ class PreferencesService(
      */
     fun getAppSettings(): Settings {
         val defaultSettings =
-            Settings(Settings.USE_CUSTOM_TABS_DEFAULT_VALUE, Settings.FORCE_TCP_DEFAULT_VALUE)
+            Settings(Settings.USE_CUSTOM_TABS_DEFAULT_VALUE, Settings.PREFER_TCP_DEFAULT_VALUE)
         val serializedSettings = getSharedPreferences().getString(KEY_APP_SETTINGS, null)
         return if (serializedSettings == null) {
             // Default settings.