fixed #327

Author: tux-mind

cSploit/src/org/csploit/android/net/metasploit/MsfExploit.java

@@ -122,7 +122,14 @@ private void retrieveOptions() throws IOException, RPCClient.MSFException {
 
     for(Map.Entry<String, HashMap<String, Object>> entry : ((HashMap<String,HashMap<String, Object>>)res).entrySet()) {
       String name = entry.getKey();
-      Option option = new Option(name, entry.getValue());
+      Option option;
+
+      try {
+        option = new Option(name, entry.getValue());
+      } catch (IllegalArgumentException e) {
+        System.errorLogging(e);
+        continue;
+      }
 
       if(name.equals("RHOST")) {
         if(parent != null)

cSploit/src/org/csploit/android/net/metasploit/Option.java

@@ -42,21 +42,21 @@ public enum types {
   private boolean mAdvanced,mRequired,mEvasion;
   private String[] enums;
 
-  public Option(String name, Map<String,Object> attrs) throws RuntimeException {
+  public Option(String name, Map<String,Object> attrs) throws IllegalArgumentException {
     mName = name;
     mAttributes = attrs;
     // check for required data
     for(String field : requiredFields)
       if(!mAttributes.containsKey(field))
-        throw new RuntimeException("missing "+field+" field");
+        throw new IllegalArgumentException("missing "+field+" field");
     // get type
     String type = (String) mAttributes.get("type");
     if(!typesMap.containsKey(type))
-      throw new RuntimeException("unknown option type: "+type);
+      throw new IllegalArgumentException("unknown option type: "+type);
     mType = typesMap.get(type);
     if(mType == types.ENUM) {
       if(!mAttributes.containsKey("enums"))
-        throw new RuntimeException("missing enums field");
+        throw new IllegalArgumentException("missing enums field");
       //TODO: search if exists not string enums
       enums = new String[((ArrayList<String>)mAttributes.get("enums")).size()];
       enums = ((ArrayList<String>) mAttributes.get("enums")).toArray(enums);

cSploit/src/org/csploit/android/net/metasploit/Payload.java

@@ -46,7 +46,14 @@ private void retrieveOptions() throws IOException, RPCClient.MSFException {
 
     for(Map.Entry<String, Map<String, Object>> entry :
             ((Map<String,Map<String, Object>>)res).entrySet()) {
-      Option o = new Option(entry.getKey(), entry.getValue());
+      Option o;
+
+      try {
+        o = new Option(entry.getKey(), entry.getValue());
+      } catch (IllegalArgumentException e) {
+        System.errorLogging(e);
+        continue;
+      }
 
       if(entry.getKey().equals("LHOST")) {
         o.setValue(System.getNetwork().getLocalAddress().getHostAddress());