Merge branch 'obfuscation_gateway_pinning' into 'master'1.1.5RC1

Beta Release - Obfuscation gateway pinning

See merge request leap/bitmask_android!201

2 files changed, 57 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java b/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java
index b34a31eb..8fbac35e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java
@@ -45,6 +45,14 @@ public interface Constants {
     String PREFER_UDP = "prefer_UDP";
     String GATEWAY_PINNING = "gateway_pinning";
     String ALLOW_EXPERIMENTAL_TRANSPORTS = "allow_experimental_transports";
+    String USE_OBFUSCATION_PINNING = "use_obfuscation_pinning";
+    String OBFUSCATION_PINNING_IP = "obfuscation_pinning_ip";
+    String OBFUSCATION_PINNING_PORT = "obfuscation_pinning_port";
+    String OBFUSCATION_PINNING_CERT = "obfuscation_pinning_cert";
+    String OBFUSCATION_PINNING_KCP = "obfuscation_pinning_udp";
+    String OBFUSCATION_PINNING_GW_HOST = "obfuscation_pinning_gw_host";
+    String OBFUSCATION_PINNING_GW_IP = "obfuscation_pinning_gw_ip";
+    String OBFUSCATION_PINNING_LOCATION = "obfuscation_pinning_location";
 
 
      //////////////////////////////////////////////
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/Transport.java b/app/src/main/java/se/leap/bitmaskclient/base/models/Transport.java
new file mode 100644
index 00000000..90a033dd
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/Transport.java
@@ -0,0 +1,49 @@
+package se.leap.bitmaskclient.base.models;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import org.json.JSONObject;
+
+public class Transport {
+    private String type;
+    private String[] protocols;
+    private String[] ports;
+    private Options options;
+
+    public Transport(String type, String[] protocols, String[] ports, String cert) {
+        this.type = type;
+        this.protocols = protocols;
+        this.ports = ports;
+        this.options = new Options(cert);
+    }
+
+    @Override
+    public String toString() {
+        return new Gson().toJson(this);
+    }
+
+    public static Transport fromJson(JSONObject json) {
+        GsonBuilder builder = new GsonBuilder();
+        return builder.create().fromJson(json.toString(), Transport.class);
+    }
+
+    public static class Options {
+        private String cert;
+        private String iatMode;
+
+        public Options(String cert) {
+            this.cert = cert;
+            this.iatMode = "0";
+        }
+
+        @Override
+        public String toString() {
+            return new Gson().toJson(this);
+        }
+    }
+
+
+}
+
+