some fixups

Author: tux-mind

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

@@ -42,6 +42,7 @@
 import org.csploit.android.R;
 import org.csploit.android.WifiScannerActivity;
 import org.csploit.android.gui.dialogs.FatalDialog;
+import org.csploit.android.helpers.ThreadHelper;
 import org.csploit.android.net.Endpoint;
 import org.csploit.android.net.GitHubParser;
 import org.csploit.android.net.Network;
@@ -203,6 +204,14 @@ public static void init(Context context) throws Exception{
       mTargets.add(device);
 
       mInitialized = true;
+
+      ThreadHelper.getSharedExecutor().execute(new Runnable() {
+        @Override
+        public void run() {
+          preloadServices();
+          preloadVendors();
+        }
+      });
     }
     catch(Exception e){
       if(!(e instanceof NoRouteToHostException))
@@ -936,8 +945,6 @@ public static KnownIssues getKnownIssues() {
   }
 
   public static String getMacVendor(byte[] mac){
-    preloadVendors();
-
     if(mac != null && mac.length >= 3)
       return mVendors.get(String.format("%02X%02X%02X", mac[0], mac[1], mac[2]));
     else

cSploit/src/org/csploit/android/plugins/PortScanner.java

@@ -54,30 +54,36 @@
 import org.csploit.android.tools.NMap;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 public class PortScanner extends Plugin {
   private TextView mTextDoc = null;
   private EditText mTextParameters = null;
   private ToggleButton mScanToggleButton = null;
   private ProgressBar mScanProgress = null;
   private boolean mRunning = false;
-  private ArrayList<String> mPortList = null;
+  private ArrayList<String> mPortList = new ArrayList<>();
   private ArrayAdapter<String> mListAdapter = null;
   private Receiver mScanReceiver = null;
   private String mCustomPorts = null;
   private Menu mMenu = null;
   private static final String CUSTOM_PARAMETERS = "PortScanner.Prefs.CustomParameters";
   private static final String CUSTOM_PARAMETERS_TEXT = "PortScanner.Prefs.CustomParameters.Text";
   private SharedPreferences mPreferences = null;
+  private Map<Integer, String> urlFormats = new HashMap<>();
 
   public PortScanner() {
     super(R.string.port_scanner, R.string.port_scanner_desc,
 
             new Target.Type[]{Target.Type.ENDPOINT, Target.Type.REMOTE},
             R.layout.plugin_portscanner, R.drawable.action_scanner);
-
-    mPortList = new ArrayList<String>();
-    mScanReceiver = new Receiver();
+    urlFormats.put(80, "http://%s/");
+    urlFormats.put(443, "https://%s/");
+    urlFormats.put(21, "ftp://%s");
+    urlFormats.put(22, "ssh://%s");
+    urlFormats.put(23, "telnet://%s/");
+    urlFormats.put(0, "telnet://%s:%d/"); ///< default
   }
 
   /**
@@ -185,13 +191,6 @@ public void onCreate(Bundle savedInstanceState) {
     mScanToggleButton = (ToggleButton) findViewById(R.id.scanToggleButton);
     mScanProgress = (ProgressBar) findViewById(R.id.scanActivity);
 
-    new Thread(new Runnable() {
-      @Override
-      public void run() {
-        System.preloadServices();
-      }
-    }).start();
-
     if (mPreferences.getBoolean(CUSTOM_PARAMETERS, false))
       displayParametersField();
 
@@ -210,52 +209,32 @@ public void onClick(View v) {
 
     createPortList();
 
-    mListAdapter = new ArrayAdapter<String>(this,
+    final Target target = System.getCurrentTarget();
+    final String cmdlineRep = target.getCommandLineRepresentation();
+
+    mListAdapter = new ArrayAdapter<>(this,
             android.R.layout.simple_list_item_1, mPortList);
     mScanList.setAdapter(mListAdapter);
     mScanList.setOnItemLongClickListener(new OnItemLongClickListener() {
       @Override
       public boolean onItemLongClick(AdapterView<?> parent, View view,
                                      int position, long id) {
-        int portNumber = System.getCurrentTarget().getOpenPorts()
-                .get(position).getNumber();
-        String url;
-
-        if (portNumber == 80)
-          url = "http://"
-                  + System.getCurrentTarget()
-                  .getCommandLineRepresentation() + "/";
-
-        else if (portNumber == 443)
-          url = "https://"
-                  + System.getCurrentTarget()
-                  .getCommandLineRepresentation() + "/";
-
-        else if (portNumber == 21)
-          url = "ftp://"
-                  + System.getCurrentTarget()
-                  .getCommandLineRepresentation();
-
-        else if (portNumber == 22)
-          url = "ssh://"
-                  + System.getCurrentTarget()
-                  .getCommandLineRepresentation();
+        int portNumber = target.getOpenPorts().get(position).getNumber();
 
-        else
-          url = "telnet://"
-                  + System.getCurrentTarget()
-                  .getCommandLineRepresentation() + ":"
-                  + portNumber;
+        if(!urlFormats.containsKey(portNumber)) {
+          portNumber = 0;
+        }
 
-        final String furl = url;
+        final String url = String.format(urlFormats.get(portNumber),
+                cmdlineRep, portNumber);
 
         new ConfirmDialog("Open", "Open " + url + " ?",
                 PortScanner.this, new ConfirmDialogListener() {
           @Override
           public void onConfirm() {
             try {
               Intent browser = new Intent(
-                      Intent.ACTION_VIEW, Uri.parse(furl));
+                      Intent.ACTION_VIEW, Uri.parse(url));
 
               PortScanner.this.startActivity(browser);
             } catch (ActivityNotFoundException e) {
@@ -372,6 +351,12 @@ public void onBackPressed() {
 
   private class Receiver extends NMap.SynScanReceiver {
 
+    private final Target target;
+
+    public Receiver(Target target) {
+      this.target = target;
+    }
+
     @Override
     public void onStart(String commandLine) {
       super.onStart(commandLine);
@@ -399,30 +384,24 @@ public void run() {
 
     @Override
     public void onPortFound(final int port, String protocol) {
-      final String portProtocol = protocol;
-      final String resolvedProtocol = System.getProtocolByPort(port);
+      String resolvedProtocol = System.getProtocolByPort(port);
 
-      System.addOpenPort(port, Network.Protocol.fromString(protocol));
+      target.addOpenPort(port, Network.Protocol.fromString(protocol));
 
-      PortScanner.this.runOnUiThread(new Runnable() {
-        @Override
-        public void run() {
-          String entry;
-
-          if (resolvedProtocol != null) {
-            entry = port + " ( " + resolvedProtocol + " )";
-          } else {
-            entry = portProtocol + " : " + port;
-          }
+      final String entry = (resolvedProtocol !=null ?
+              port + " ( " + resolvedProtocol + " )" :
+              protocol + " : " + port
+      );
 
-          // add open port to the listview and notify the environment
-          // about the event
-          if (!mPortList.contains(entry)) {
+      if(!mPortList.contains(entry)) {
+        PortScanner.this.runOnUiThread(new Runnable() {
+          @Override
+          public void run() {
             mPortList.add(entry);
             mListAdapter.notifyDataSetChanged();
           }
-        }
-      });
+        });
+      }
     }
   }
 }