From 93fe05806856897749846203f832867327d14352 Mon Sep 17 00:00:00 2001 From: cyberta Date: Mon, 21 Nov 2022 15:49:52 +0100 Subject: fix bitmaskcore builds on macOS, rename Shapeshifter to ShapeshifterClient as part of this gombile JNI generation fix --- .../de/blinkt/openvpn/core/OpenVPNService.java | 6 +- .../openvpn/core/connection/Obfs4Connection.java | 4 +- .../leap/bitmaskclient/eip/VpnConfigGenerator.java | 5 +- .../pluggableTransports/Shapeshifter.java | 142 --------------------- .../pluggableTransports/ShapeshifterClient.java | 141 ++++++++++++++++++++ bitmaskcore | 2 +- 6 files changed, 149 insertions(+), 151 deletions(-) delete mode 100644 app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java create mode 100644 app/src/main/java/se/leap/bitmaskclient/pluggableTransports/ShapeshifterClient.java diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java index 4b394136..88a85de3 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -54,7 +54,7 @@ import se.leap.bitmaskclient.eip.EipStatus; import se.leap.bitmaskclient.eip.VpnNotificationManager; import se.leap.bitmaskclient.firewall.FirewallManager; import se.leap.bitmaskclient.pluggableTransports.ObfsVpnClient; -import se.leap.bitmaskclient.pluggableTransports.Shapeshifter; +import se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient; public class OpenVPNService extends VpnService implements StateListener, Callback, ByteCountListener, IOpenVPNServiceInternal, VpnNotificationManager.VpnServiceCallback { @@ -90,7 +90,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac private Toast mlastToast; private Runnable mOpenVPNThread; private VpnNotificationManager notificationManager; - private Shapeshifter shapeshifter; + private ShapeshifterClient shapeshifter; private ObfsVpnClient obfsVpnClient; private FirewallManager firewallManager; @@ -426,7 +426,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac int runningSocksPort = obfsVpnClient.start(); connection.setProxyPort(String.valueOf(runningSocksPort)); } else if (shapeshifter == null) { - shapeshifter = new Shapeshifter(obfs4Connection.getDispatcherOptions()); + shapeshifter = new ShapeshifterClient(obfs4Connection.getDispatcherOptions()); shapeshifter.start(); } } diff --git a/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java b/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java index 5189afcc..c77c23fd 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java +++ b/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java @@ -1,8 +1,8 @@ package de.blinkt.openvpn.core.connection; import static se.leap.bitmaskclient.base.utils.ConfigHelper.ObfsVpnHelper.useObfsVpn; -import static se.leap.bitmaskclient.pluggableTransports.Shapeshifter.DISPATCHER_IP; -import static se.leap.bitmaskclient.pluggableTransports.Shapeshifter.DISPATCHER_PORT; +import static se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient.DISPATCHER_IP; +import static se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient.DISPATCHER_PORT; import se.leap.bitmaskclient.pluggableTransports.Obfs4Options; import se.leap.bitmaskclient.pluggableTransports.ObfsVpnClient; diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java index f60d89ce..72a0d80a 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java @@ -33,8 +33,8 @@ import static se.leap.bitmaskclient.base.models.Constants.TRANSPORT; import static se.leap.bitmaskclient.base.models.Constants.TYPE; import static se.leap.bitmaskclient.base.models.Constants.UDP; import static se.leap.bitmaskclient.base.utils.ConfigHelper.ObfsVpnHelper.useObfsVpn; -import static se.leap.bitmaskclient.pluggableTransports.Shapeshifter.DISPATCHER_IP; -import static se.leap.bitmaskclient.pluggableTransports.Shapeshifter.DISPATCHER_PORT; +import static se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient.DISPATCHER_IP; +import static se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient.DISPATCHER_PORT; import androidx.annotation.VisibleForTesting; @@ -55,7 +55,6 @@ import de.blinkt.openvpn.core.VpnStatus; import de.blinkt.openvpn.core.connection.Connection; import de.blinkt.openvpn.core.connection.Connection.TransportType; import se.leap.bitmaskclient.base.models.Provider; -import se.leap.bitmaskclient.base.models.Transport; import se.leap.bitmaskclient.base.utils.ConfigHelper; import se.leap.bitmaskclient.pluggableTransports.Obfs4Options; diff --git a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java deleted file mode 100644 index 9bd61859..00000000 --- a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java +++ /dev/null @@ -1,142 +0,0 @@ -/** - * Copyright (c) 2020 LEAP Encryption Access Project and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package se.leap.bitmaskclient.pluggableTransports; - -import android.os.Handler; -import android.os.Looper; -import android.util.Log; - -import java.util.Observable; -import java.util.Observer; - -import de.blinkt.openvpn.core.ConnectionStatus; -import de.blinkt.openvpn.core.VpnStatus; -import se.leap.bitmaskclient.eip.EipStatus; -import shapeshifter.ShapeShifter; - -public class Shapeshifter implements Observer { - - public static final String DISPATCHER_PORT = "4430"; - public static final String DISPATCHER_IP = "127.0.0.1"; - private static final int MAX_RETRY = 5; - private static final int RETRY_TIME = 4000; - private static final String TAG = Shapeshifter.class.getSimpleName(); - - private final shapeshifter.ShapeShifter shapeShifter; - private boolean isErrorHandling; - private boolean noNetwork; - private int retry = 0; - private final Handler reconnectHandler; - - public class ShapeshifterLogger implements shapeshifter.Logger { - @Override - public void log(String s) { - Log.e(TAG, "SHAPESHIFTER ERROR: " + s); - VpnStatus.logError(s); - isErrorHandling = true; - close(); - - if (retry < MAX_RETRY && !noNetwork) { - retry++; - reconnectHandler.postDelayed(Shapeshifter.this::reconnect, RETRY_TIME); - } else { - VpnStatus.logError(VpnStatus.ErrorType.SHAPESHIFTER); - } - } - } - - public Shapeshifter(Obfs4Options options) { - shapeShifter = new ShapeShifter(); - shapeShifter.setLogger(new ShapeshifterLogger()); - setup(options); - Looper.prepare(); - reconnectHandler = new Handler(); - EipStatus.getInstance().addObserver(this); - Log.d(TAG, "shapeshifter initialized with: \n" + shapeShifter.toString()); - } - - private void setup(Obfs4Options options) { - shapeShifter.setSocksAddr(DISPATCHER_IP+":"+DISPATCHER_PORT); - shapeShifter.setTarget(options.remoteIP+":"+options.remotePort); - shapeShifter.setCert(options.cert); - } - - public void setOptions(Obfs4Options options) { - setup(options); - } - - public void start() { - try { - shapeShifter.open(); - } catch (Exception e) { - e.printStackTrace(); - Log.e(TAG, "SHAPESHIFTER ERROR: " + e.getLocalizedMessage()); - VpnStatus.logError(VpnStatus.ErrorType.SHAPESHIFTER); - VpnStatus.logError(e.getLocalizedMessage()); - } - } - - private void close() { - try { - shapeShifter.close(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - private void reconnect() { - try { - shapeShifter.open(); - retry = 0; - isErrorHandling = false; - } catch (Exception e) { - e.printStackTrace(); - Log.e(TAG, "SHAPESHIFTER RECONNECTION ERROR: " + e.getLocalizedMessage()); - VpnStatus.logError("Unable to reconnect shapeshifter: " + e.getLocalizedMessage()); - } - } - - public boolean stop() { - try { - shapeShifter.close(); - return true; - } catch (Exception e) { - e.printStackTrace(); - VpnStatus.logError(e.getLocalizedMessage()); - } - EipStatus.getInstance().deleteObserver(this); - return false; - } - - @Override - public void update(Observable observable, Object arg) { - if (observable instanceof EipStatus) { - EipStatus status = (EipStatus) observable; - if (status.getLevel() == ConnectionStatus.LEVEL_NONETWORK) { - noNetwork = true; - } else { - noNetwork = false; - if (isErrorHandling) { - isErrorHandling = false; - close(); - start(); - } - } - } - } -} diff --git a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/ShapeshifterClient.java b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/ShapeshifterClient.java new file mode 100644 index 00000000..f1eb0f1b --- /dev/null +++ b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/ShapeshifterClient.java @@ -0,0 +1,141 @@ +/** + * Copyright (c) 2020 LEAP Encryption Access Project and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package se.leap.bitmaskclient.pluggableTransports; + +import android.os.Handler; +import android.os.Looper; +import android.util.Log; + +import java.util.Observable; +import java.util.Observer; + +import de.blinkt.openvpn.core.ConnectionStatus; +import de.blinkt.openvpn.core.VpnStatus; +import se.leap.bitmaskclient.eip.EipStatus; + +public class ShapeshifterClient implements Observer { + + public static final String DISPATCHER_PORT = "4430"; + public static final String DISPATCHER_IP = "127.0.0.1"; + private static final int MAX_RETRY = 5; + private static final int RETRY_TIME = 4000; + private static final String TAG = ShapeshifterClient.class.getSimpleName(); + + private final shapeshifter.Shapeshifter_ shapeShifter; + private boolean isErrorHandling; + private boolean noNetwork; + private int retry = 0; + private final Handler reconnectHandler; + + public class ShapeshifterLogger implements shapeshifter.Logger { + @Override + public void log(String s) { + Log.e(TAG, "SHAPESHIFTER ERROR: " + s); + VpnStatus.logError(s); + isErrorHandling = true; + close(); + + if (retry < MAX_RETRY && !noNetwork) { + retry++; + reconnectHandler.postDelayed(ShapeshifterClient.this::reconnect, RETRY_TIME); + } else { + VpnStatus.logError(VpnStatus.ErrorType.SHAPESHIFTER); + } + } + } + + public ShapeshifterClient(Obfs4Options options) { + shapeShifter = new shapeshifter.Shapeshifter_(); + shapeShifter.setLogger(new ShapeshifterLogger()); + setup(options); + Looper.prepare(); + reconnectHandler = new Handler(); + EipStatus.getInstance().addObserver(this); + Log.d(TAG, "shapeshifter initialized with: \n" + shapeShifter.toString()); + } + + private void setup(Obfs4Options options) { + shapeShifter.setSocksAddr(DISPATCHER_IP+":"+DISPATCHER_PORT); + shapeShifter.setTarget(options.remoteIP+":"+options.remotePort); + shapeShifter.setCert(options.cert); + } + + public void setOptions(Obfs4Options options) { + setup(options); + } + + public void start() { + try { + shapeShifter.open(); + } catch (Exception e) { + e.printStackTrace(); + Log.e(TAG, "SHAPESHIFTER ERROR: " + e.getLocalizedMessage()); + VpnStatus.logError(VpnStatus.ErrorType.SHAPESHIFTER); + VpnStatus.logError(e.getLocalizedMessage()); + } + } + + private void close() { + try { + shapeShifter.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private void reconnect() { + try { + shapeShifter.open(); + retry = 0; + isErrorHandling = false; + } catch (Exception e) { + e.printStackTrace(); + Log.e(TAG, "SHAPESHIFTER RECONNECTION ERROR: " + e.getLocalizedMessage()); + VpnStatus.logError("Unable to reconnect shapeshifter: " + e.getLocalizedMessage()); + } + } + + public boolean stop() { + try { + shapeShifter.close(); + return true; + } catch (Exception e) { + e.printStackTrace(); + VpnStatus.logError(e.getLocalizedMessage()); + } + EipStatus.getInstance().deleteObserver(this); + return false; + } + + @Override + public void update(Observable observable, Object arg) { + if (observable instanceof EipStatus) { + EipStatus status = (EipStatus) observable; + if (status.getLevel() == ConnectionStatus.LEVEL_NONETWORK) { + noNetwork = true; + } else { + noNetwork = false; + if (isErrorHandling) { + isErrorHandling = false; + close(); + start(); + } + } + } + } +} diff --git a/bitmaskcore b/bitmaskcore index f3229dc6..848a7517 160000 --- a/bitmaskcore +++ b/bitmaskcore @@ -1 +1 @@ -Subproject commit f3229dc6ce31ba0962657bcd2c29e999224d8853 +Subproject commit 848a75175e630d88e1a0285dbc170e5c6d61dcb2 -- cgit v1.2.3