Merge branch 'master' of https://github.com/piskachev/mois.git

Conflicts:
	src/de/fraunhofer/iem/mois/Main.java
	src/de/fraunhofer/iem/mois/Writer.java

Author: piskachev

bin/de/fraunhofer/iem/mois/Parser$1.class

@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Set;
 
+import de.fraunhofer.iem.mois.data.RelevantPart;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.*;
@@ -143,6 +144,11 @@ private void parse(String fileName) {
     }
   }
 
+  public Set<Method> parseFile(String fileName){
+    parse(fileName);
+    return methods;
+  }
+
   @SuppressWarnings("unchecked")
   private void loadMethodsFromJsonArray(JSONArray array, String type) {
 
@@ -217,10 +223,10 @@ private void loadMethodsFromJsonArray(JSONArray array, String type) {
           securityLevel = Method.SecLevel.NEUTRAL;
         else {
           switch (secLevel) {
-          case "high":
+          case Constants.AUTH_SAFE:
             securityLevel = Method.SecLevel.HIGH;
             break;
-          case "low":
+          case Constants.AUTH_UNSAFE:
             securityLevel = Method.SecLevel.LOW;
             break;
           default:
@@ -261,16 +267,16 @@ private void loadMethodsFromJsonArray(JSONArray array, String type) {
           while (p.hasNext()) {
             String t = p.next().toString();
             switch (t) {
-            case "source":
+            case Constants.SOURCE:
               m.addCategoryTrained(Category.SOURCE);
               break;
-            case "sink":
+            case Constants.SINK:
               m.addCategoryTrained(Category.SINK);
               break;
-            case "sanitizer":
+            case Constants.SANITIZER:
               m.addCategoryTrained(Category.SANITIZER);
               break;
-            case "authentication":
+            case Constants.AUTHENTICATION:
               switch (securityLevel) {
               case HIGH:
                 m.addCategoryTrained(Category.AUTHENTICATION_TO_HIGH);
@@ -321,4 +327,18 @@ public Set<String> cwe() {
     return cwes;
   }
 
+  private RelevantPart extractDataInOutObject(JSONObject dataObject) {
+
+    JSONArray parameterArray = (JSONArray) dataObject.get(Constants.PARAMETERS);
+
+    List<Integer> parameters = new ArrayList<>();
+
+    for (Object param : parameterArray) {
+
+      if (param instanceof Integer)
+        parameters.add((Integer) param);
+    }
+    return new RelevantPart((boolean) dataObject.get(Constants.RETURN_TYPE), parameters);
+  }
+
 }

bin/de/fraunhofer/iem/mois/Parser.class

@@ -8,11 +8,11 @@
  */
 
 public enum Category {
-  SOURCE("sources", false), SINK("sinks", false), AUTHENTICATION_TO_HIGH(
-      "authentications_to_high", false), AUTHENTICATION_TO_LOW(
-          "authentications_to_low", false), AUTHENTICATION_NEUTRAL(
-              "authentications_neutral", false), SANITIZER("sanitizers",
-                  false), NONE("none", false),
+    SOURCE(Constants.SOURCE, false), SINK(Constants.SINK, false), AUTHENTICATION_TO_HIGH(
+            Constants.AUTHENTICATION_SAFE, false), AUTHENTICATION_TO_LOW(
+            Constants.AUTHENTICATION_UNSAFE, false), AUTHENTICATION_NEUTRAL(
+            Constants.AUTHENTICATION_NOCHANGE, false), SANITIZER(Constants.SANITIZER,
+            false), NONE(Constants.NONE, false),
 
   CWE089("CWE089", true), CWE306("CWE306", true), CWE078("CWE078",
       true), CWE862("CWE862", true), CWE863("CWE863", 

bin/de/fraunhofer/iem/mois/data/Category.class

@@ -19,4 +19,20 @@ public final class Constants {
 	public final static String TYPE = "type";
 	public final static String COMMENT = "comment";
 
+	//Method Categories
+	public final static String SOURCE = "source";
+	public final static String SINK = "sink";
+	public final static String SANITIZER = "sanitizer";
+	public final static String AUTHENTICATION = "authentication";
+	public final static String AUTHENTICATION_SAFE = "auth-safe-state";
+	public final static String AUTHENTICATION_NOCHANGE = "auth-no-change";
+	public final static String AUTHENTICATION_UNSAFE = "auth-unsafe-state";
+	public final static String NONE = "none";
+	public final static String TEST = "test";
+
+	//Authentication states
+	public final static String AUTH_SAFE = "high";
+	public final static String AUTH_NOCHANGE = "none";
+	public final static String AUTH_UNSAFE = "low";
+
 }