expose stuff as less as possible

Author: tux-mind

msf/src/main/java/org/csploit/msf/Customizable.java

@@ -0,0 +1,14 @@
+package org.csploit.msf;
+
+import java.util.Collection;
+
+/**
+ * An object that can be tuned up
+ * by editing it's options.
+ */
+public interface Customizable {
+  void setOption(String key, String value);
+  Collection<Option> getOptions();
+  Collection<String> getInvalidOptions();
+  <T> T getOptionValue(Option<T> option);
+}

msf/src/main/java/org/csploit/msf/DataHolder.java

@@ -3,6 +3,6 @@
 /**
  * A class that hold a DataStore instance
  */
-public interface DataHolder {
+interface DataHolder {
   DataStore getDataStore();
 }

msf/src/main/java/org/csploit/msf/Framework.java

@@ -1,16 +1,22 @@
 package org.csploit.msf;
 
+import java.util.Collection;
+
 /**
  * Represent a MetaSploit Framework instance
  */
 public class Framework implements DataHolder {
 
   private DataStore dataStore;
   private ModuleManager moduleManager;
+  private JobContainer jobs;
+  private SessionManager sessions;
 
   public Framework() {
     dataStore = new DataStore();
     moduleManager = new ModuleManager(this, "all");
+    jobs = new JobContainer();
+    sessions = new SessionManager(this);
   }
 
   @Override
@@ -21,4 +27,8 @@ public DataStore getDataStore() {
   public ModuleManager getModuleManager() {
     return moduleManager;
   }
+
+  public void setGlobalOption(String key, String value) {
+    getDataStore().put(key, value);
+  }
 }

msf/src/main/java/org/csploit/msf/JobContainer.java

@@ -8,5 +8,5 @@
  * keeping track of arbitrary contexts that may or may not require a dedicated
  * thread.
  */
-public class JobContainer extends HashMap<Integer, Job> {
+class JobContainer extends HashMap<Integer, Job> {
 }

msf/src/main/java/org/csploit/msf/Module.java

@@ -10,7 +10,7 @@
 /**
  * Represent a module of the MSF
  */
-public abstract class Module implements Offspring, DataHolder {
+public abstract class Module implements Offspring, DataHolder, Customizable {
   protected Author[] authors;
   protected ArchSet arch;
   protected PlatformList platform;
@@ -87,10 +87,26 @@ public void registerOption(String name, Option option, boolean advanced, boolean
     options.addOption(name, option, advanced, evasion);
   }
 
-  public Collection<String> getinvalidOptions() {
+  @Override
+  public void setOption(String key, String value) {
+    getDataStore().put(key, value);
+  }
+
+  @Override
+  public Collection<Option> getOptions() {
+    return options.values();
+  }
+
+  @Override
+  public Collection<String> getInvalidOptions() {
     return options.getInvalidOptions(getDataStore());
   }
 
+  @Override
+  public <T> T getOptionValue(Option<T> option) {
+    return option.normalize(getDataStore().get(option.getName()));
+  }
+
   @Override
   public int hashCode() {
     return refname != null ? refname.hashCode() : 0;

msf/src/main/java/org/csploit/msf/ModuleManager.java

@@ -6,7 +6,7 @@
 /**
  * Manage all framework modules
  */
-public class ModuleManager implements Offspring {
+class ModuleManager implements Offspring {
 
   private final static String[] validModuleTypes = {
           "encoder",

msf/src/main/java/org/csploit/msf/ModuleSet.java

@@ -9,7 +9,7 @@
  * A module set contains zero or more named module classes of an arbitrary
  * type.
  */
-public class ModuleSet extends HashMap<String, Module> implements Offspring {
+class ModuleSet extends HashMap<String, Module> implements Offspring {
   protected String type;
   private Framework framework;
 

msf/src/main/java/org/csploit/msf/Offspring.java

@@ -3,7 +3,7 @@
 /**
  * CLasses that ave a reference to the framework
  */
-public interface Offspring {
+interface Offspring {
   boolean haveFramework();
   Framework getFramework();
   void setFramework(Framework framework);

msf/src/main/java/org/csploit/msf/SessionManager.java

@@ -13,7 +13,7 @@
  * applicable to the way that the command interpreter is communicated
  * with.
  */
-public class SessionManager extends HashMap<Integer, Session> implements Offspring {
+class SessionManager extends HashMap<Integer, Session> implements Offspring {
   private Framework framework;
 
   public SessionManager(Framework framework) {

msf/src/test/java/org/csploit/msf/RpcSampleTest.java

@@ -168,15 +168,15 @@ public void putExploitTest() {
 
     // exploit settings should not be valid without the required RHOST options
 
-    assertThat(exploit.getinvalidOptions().isEmpty(), is(false));
+    assertThat(exploit.getInvalidOptions().isEmpty(), is(false));
 
     framework.getDataStore().put("RHOST", "invalid address");
 
-    assertThat(exploit.getinvalidOptions().isEmpty(), is(false));
+    assertThat(exploit.getInvalidOptions().isEmpty(), is(false));
 
     framework.getDataStore().put("RHOST", "127.0.0.1");
 
-    assertThat(exploit.getinvalidOptions().isEmpty(), is(true));
+    assertThat(exploit.getInvalidOptions().isEmpty(), is(true));
   }
 
   private static Option getOptionForInfo(String name, ModuleOptionInfo info) {