Merge branch 'develop' into fragment

Author: tux-mind

cSploit/src/main/java/org/csploit/android/core/System.java

@@ -954,15 +954,22 @@ public static void reset() {
     synchronized (mTargets) {
       mTargets.clear();
 
-      Target network = new Target(mNetwork),
-              gateway = new Target(mNetwork.getGatewayAddress(), mNetwork.getGatewayHardware()),
-              device = new Target(mNetwork.getLocalAddress(), mNetwork.getLocalHardware());
+      Target network, gateway, device;
+
+      network = new Target(mNetwork);
+      device = new Target(mNetwork.getLocalAddress(), mNetwork.getLocalHardware());
+
 
-      gateway.setAlias(mNetwork.getSSID());
       device.setAlias(android.os.Build.MODEL);
 
       mTargets.add(network);
-      mTargets.add(gateway);
+
+      if(mNetwork.haveGateway()) {
+        gateway = new Target(mNetwork.getGatewayAddress(), mNetwork.getGatewayHardware());
+        gateway.setAlias(mNetwork.getSSID());
+        mTargets.add(gateway);
+      }
+
       mTargets.add(device);
 
       scanThemAll();
@@ -1004,7 +1011,9 @@ public static void markNetworkAsDisconnected() {
 
   public static void markInitialNetworkTargetsAsConnected() {
     InetAddress localAddress = mNetwork.getLocalAddress();
+    boolean haveGateway = mNetwork.haveGateway();
     InetAddress gatewayAddress = mNetwork.getGatewayAddress();
+
     synchronized (mTargets) {
       for (Target t : mTargets) {
         switch (t.getType()) {
@@ -1014,7 +1023,7 @@ public static void markInitialNetworkTargetsAsConnected() {
             }
           default:
             if (localAddress.equals(t.getAddress()) ||
-                    gatewayAddress.equals(t.getAddress())) {
+                    (haveGateway && gatewayAddress.equals(t.getAddress()))) {
               t.setConneced(true);
             }
             break;
@@ -1221,10 +1230,6 @@ public static Collection<Exploit> getCurrentExploits() {
     return getCurrentTarget().getExploits();
   }
 
-  public static String getGatewayAddress() {
-    return mNetwork.getGatewayAddress().getHostAddress();
-  }
-
   public static boolean isForwardingEnabled() {
     boolean forwarding = false;
     BufferedReader reader;

cSploit/src/main/java/org/csploit/android/net/Network.java

@@ -34,6 +34,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.InterfaceAddress;
 import java.net.NetworkInterface;
@@ -101,6 +102,7 @@ public String toString() {
   private IP4Address mNetmask = null;
   private IP4Address mLocal = null;
   private IP4Address mBase = null;
+  private Method mTetheredIfacesMethod = null;
 
   /**
    * see http://en.wikipedia.org/wiki/Reserved_IP_addresses
@@ -121,6 +123,7 @@ public Network(Context context, String iface) throws SocketException, UnknownHos
     mGateway = new IP4Address(mInfo.gateway);
     mNetmask = getNetmask();
     mBase = new IP4Address(mInfo.netmask & mInfo.gateway);
+    mTetheredIfacesMethod = getTetheredIfacesMethod(mConnectivityManager);
 
     if (iface != null) {
       if (initNetworkInterface(iface))
@@ -136,6 +139,15 @@ public Network(Context context, String iface) throws SocketException, UnknownHos
     throw new NoRouteToHostException("Not connected to any network.");
   }
 
+  private static Method getTetheredIfacesMethod(ConnectivityManager connectivityManager) {
+    try {
+      return connectivityManager.getClass().getDeclaredMethod("getTetheredIfaces");
+    } catch (NoSuchMethodException e) {
+      Logger.warning("unable to get 'ConnectivityManager#getTetheredIfaces()': " + e.getMessage());
+      return null;
+    }
+  }
+
   public boolean initNetworkInterface(String iface) {
 
     try {
@@ -158,10 +170,17 @@ public boolean initNetworkInterface(String iface) {
                       Short.toString(ifaceAddress.getNetworkPrefixLength()));
 
       mLocal = new IP4Address(su.getInfo().getAddress());
-      mGateway = new IP4Address(getSystemGateway(mInterface.getDisplayName()));
       mNetmask = new IP4Address(su.getInfo().getNetmask());
       mBase = new IP4Address(su.getInfo().getNetworkAddress());
 
+      String gateway = getSystemGateway(mInterface.getDisplayName());
+
+      if(gateway == null) {
+        mGateway = null;
+      } else {
+        mGateway = new IP4Address(gateway);
+      }
+
       return true;
     } catch (Exception e) {
       Logger.error("Error: " + e.getLocalizedMessage());
@@ -194,11 +213,11 @@ public boolean equals(Network network) {
   }
 
   public boolean isInternal(byte[] address) {
-    byte[] gateway = mGateway.toByteArray();
+    byte[] local = mLocal.toByteArray();
     byte[] mask = mNetmask.toByteArray();
 
-    for (int i = 0; i < gateway.length; i++)
-      if ((gateway[i] & mask[i]) != (address[i] & mask[i]))
+    for (int i = 0; i < local.length; i++)
+      if ((local[i] & mask[i]) != (address[i] & mask[i]))
         return false;
 
     return true;
@@ -265,8 +284,25 @@ public InetAddress getNetmaskAddress() {
     return mNetmask.toInetAddress();
   }
 
+  public boolean haveGateway() {
+    return mGateway != null;
+  }
+
+  public boolean isTetheringEnabled() {
+    if(mTetheredIfacesMethod == null) {
+      return false;
+    }
+    try {
+      String[] ifaces = (String[]) mTetheredIfacesMethod.invoke(mConnectivityManager);
+      return ifaces.length > 0;
+    } catch (Exception e) {
+      Logger.error("unable to retrieve tethered ifaces: " + e.getMessage());
+      return false;
+    }
+  }
+
   public InetAddress getGatewayAddress() {
-    return mGateway.toInetAddress();
+    return mGateway == null ? null : mGateway.toInetAddress();
   }
 
   public byte[] getGatewayHardware() {

cSploit/src/main/java/org/csploit/android/plugins/ExploitFinder.java

@@ -266,6 +266,8 @@ private void setStartedState() {
     mSearchProgress.setVisibility(View.VISIBLE);
 
     final Target target = System.getCurrentTarget();
+    mSearchFloatingActionButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_stop_24dp));
+    buttonPlayed = true;
 
     job = Search.searchExploitForServices(target,
             new Search.Receiver<Exploit>() {
@@ -299,8 +301,8 @@ public void onEnd() {
                   @Override
                   public void run() {
                     mSearchProgress.setVisibility(View.GONE);
-                    mSearchFloatingActionButton.setImageDrawable(ContextCompat.getDrawable(getBaseContext(), R.drawable.ic_stop_24dp));
-                    buttonPlayed = true;
+                    mSearchFloatingActionButton.setImageDrawable(ContextCompat.getDrawable(getBaseContext(), R.drawable.ic_play_arrow_24dp));
+                    buttonPlayed = false;
                     if (System.getCurrentExploits().size() == 0) {
                       new FinishDialog(getString(R.string.warning), getString(R.string.no_exploits_found), ExploitFinder.this).show();
                     } else if (!somethingFound) {