From 9e7317c9e8323c0a97bca05548928ab0a5f0900d Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 13 Apr 2023 13:52:53 +0200
Subject: Assume port hopping only in case of a missing endpoints json for
 obfs4-hop. The gateway IP and the cert json field in options substitute the
 missing endpoints json

---
 .../pluggableTransports/HoppingConfig.java           | 20 ++++++++++++++------
 .../pluggableTransports/HoppingObfsVpnClient.java    |  8 +-------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/pluggableTransports')

diff --git a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/HoppingConfig.java b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/HoppingConfig.java
index e885166a..3780b7dc 100644
--- a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/HoppingConfig.java
+++ b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/HoppingConfig.java
@@ -20,17 +20,25 @@ public class HoppingConfig {
 
     public HoppingConfig(boolean kcp,
                          String proxyAddr,
-                         Transport transport,
+                         Obfs4Options options,
                          int minHopSeconds,
                          int hopJitter) {
         this.kcp = kcp;
         this.proxyAddr = proxyAddr;
+        Transport transport = options.transport;
         Transport.Endpoint[] endpoints = transport.getOptions().getEndpoints();
-        this.remotes = new String[endpoints.length];
-        this.certs = new String[endpoints.length];
-        for (int i = 0; i < remotes.length; i++) {
-            remotes[i] = endpoints[i].getIp();
-            certs[i] = endpoints[i].getCert();
+        if (endpoints == null) {
+            // only port hopping, we assume the gateway IP as hopping PT's IP
+            this.remotes = new String[]{ options.gatewayIP };
+            this.certs = new String[] { transport.getOptions().getCert() };
+        } else {
+            // port+ip hopping
+            this.remotes = new String[endpoints.length];
+            this.certs = new String[endpoints.length];
+            for (int i = 0; i < remotes.length; i++) {
+                remotes[i] = endpoints[i].getIp();
+                certs[i] = endpoints[i].getCert();
+            }
         }
         this.portSeed = transport.getOptions().getPortSeed();
         this.portCount = transport.getOptions().getPortCount();
diff --git a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/HoppingObfsVpnClient.java b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/HoppingObfsVpnClient.java
index 1b19213f..751208ba 100644
--- a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/HoppingObfsVpnClient.java
+++ b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/HoppingObfsVpnClient.java
@@ -1,7 +1,5 @@
 package se.leap.bitmaskclient.pluggableTransports;
 
-import static de.blinkt.openvpn.core.connection.Connection.TransportProtocol.KCP;
-
 import client.Client;
 import client.HopClient;
 import de.blinkt.openvpn.core.VpnStatus;
@@ -21,11 +19,7 @@ public class HoppingObfsVpnClient implements PtClientInterface {
         //if so, we stick to it, otherwise we flip the flag
         boolean kcp = Constants.KCP.equals(options.transport.getProtocols()[0]);
 
-        if (options.transport.getOptions().getEndpoints() == null) {
-            throw new IllegalStateException("No Endpoints for hopping pt detected!");
-        }
-
-        HoppingConfig hoppingConfig = new HoppingConfig(kcp,IP+":"+PORT, options.transport, 10, 10);
+        HoppingConfig hoppingConfig = new HoppingConfig(kcp,IP+":"+PORT, options, 10, 10);
         try {
             client = Client.newFFIHopClient(hoppingConfig.toString());
         } catch (Exception e) {
-- 
cgit v1.2.3