Merge pull request diffblue#476 from diffblue/fixed_ginco_rules

SEC-517: Fixed rules file for Ginco.

Author: marek-trtik

benchmarks/GENUINE/GincoRules.json

@@ -63,6 +63,19 @@
         "taint": "Tainted Set"
       }
     },
+    {
+      "comment": "Obtained tainted Set from tainted Map",
+      "class": "java.util.HashMap",
+      "method": "keySet:()Ljava/util/Set;",
+      "input": {
+        "location": "this",
+        "taint": "Tainted Map"
+      },
+      "result": {
+        "location": "returns",
+        "taint": "Tainted Set"
+      }
+    },
     {
       "comment": "Obtained tainted Iterator from tainted Set",
       "class": "java.util.Set",
@@ -76,10 +89,36 @@
         "taint": "Tainted Iterator"
       }
     },
+    {
+      "comment": "Obtained tainted Iterator from tainted Set",
+      "class": "java.util.HashMap$KeySet",
+      "method": "iterator:()Ljava/util/Iterator;",
+      "input": {
+        "location": "this",
+        "taint": "Tainted Set"
+      },
+      "result": {
+        "location": "returns",
+        "taint": "Tainted Iterator"
+      }
+    },
+    {
+      "comment": "Obtained tainted Object from tainted Iterator",
+      "class": "java.util.HashMap$KeyIterator",
+      "method": "next:()Ljava/lang/Object;",
+      "input": {
+        "location": "this",
+        "taint": "Tainted Iterator"
+      },
+      "result": {
+        "location": "returns",
+        "taint": "Tainted Thesaurus"
+      }
+    },
     {
       "comment": "Obtained tainted Object from tainted Iterator",
       "class": "java.util.Iterator",
-      "method": "next:()Ljava/util/Object;",
+      "method": "next:()Ljava/lang/Object;",
       "input": {
         "location": "this",
         "taint": "Tainted Iterator"
@@ -92,7 +131,7 @@
     {
       "comment": "Obtained tainted String from tainted Thesaurus",
       "class": "fr.mcc.ginco.beans.Thesaurus",
-      "method": "getTitle:()Ljava/lang/String;()",
+      "method": "getTitle:()Ljava/lang/String;",
       "input": {
         "location": "this",
         "taint": "Tainted Thesaurus"
@@ -141,6 +180,19 @@
         "taint": "Tainted String"
       }
     },
+    {
+      "comment": "HACK[stub for missing apache libs]:By unescaping tainted String we get a tainted string again.",
+      "class": "org.apache.commons.lang3.StringEscapeUtils",
+      "method": "unescapeHtml4:(Ljava/lang/String;)Ljava/lang/String;",
+      "input": {
+        "location": "arg0",
+        "taint": "Tainted String"
+      },
+      "result": {
+        "location": "returns",
+        "taint": "Tainted String"
+      }
+    },
     {
       "comment": "ARTIFICIAL sink to capture servlet returning tainted String.",
       "class": "Main",