Java: Fix more problems in the Gson models

atorralba · atorralba · commit 4608481d7b9e · 2023-06-08T14:53:09.000+02:00
Found during type strengthening work by @aschackmull
diff --git a/java/ql/lib/ext/com.google.gson.model.yml b/java/ql/lib/ext/com.google.gson.model.yml
@@ -38,11 +38,11 @@ extensions:
       - ["com.google.gson", "JsonObject", True, "add", "", "", "Argument[0]", "Argument[this].MapKey", "value", "manual"]
       - ["com.google.gson", "JsonObject", True, "add", "", "", "Argument[1]", "Argument[this].MapValue", "value", "manual"]
       - ["com.google.gson", "JsonObject", True, "addProperty", "(String,String)", "", "Argument[0]", "Argument[this].MapKey", "value", "manual"]
-      - ["com.google.gson", "JsonObject", True, "addProperty", "(String,String)", "", "Argument[1]", "Argument[this].MapValue", "value", "manual"]
+      - ["com.google.gson", "JsonObject", True, "addProperty", "(String,String)", "", "Argument[1]", "Argument[this].MapValue", "taint", "manual"]
       - ["com.google.gson", "JsonObject", True, "asMap", "", "", "Argument[this].MapKey", "ReturnValue.MapKey", "value", "manual"]
       - ["com.google.gson", "JsonObject", True, "asMap", "", "", "Argument[this].MapValue", "ReturnValue.MapValue", "value", "manual"]
       - ["com.google.gson", "JsonObject", True, "entrySet", "", "", "Argument[this].MapKey", "ReturnValue.Element.MapKey", "value", "manual"]
-      - ["com.google.gson", "JsonObject", True, "entrySet", "", "", "Argument[this].MapKey", "ReturnValue.Element.MapValue", "value", "manual"]
+      - ["com.google.gson", "JsonObject", True, "entrySet", "", "", "Argument[this].MapValue", "ReturnValue.Element.MapValue", "value", "manual"]
       - ["com.google.gson", "JsonObject", True, "get", "", "", "Argument[this].MapValue", "ReturnValue", "value", "manual"]
       - ["com.google.gson", "JsonObject", True, "keySet", "", "", "Argument[this].MapKey", "ReturnValue.Element", "value", "manual"]
       - ["com.google.gson", "JsonPrimitive", True, "JsonPrimitive", "(Character)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
diff --git a/java/ql/test/library-tests/frameworks/gson/Test.java b/java/ql/test/library-tests/frameworks/gson/Test.java
@@ -407,51 +407,51 @@ public void test() throws Exception {
 			sink(getMapKeyDefault(out)); // $ hasValueFlow
 		}
 		{
-			// "com.google.gson;JsonObject;true;addProperty;(String,String);;Argument[1];Argument[this].MapValue;value;manual"
+			// "com.google.gson;JsonObject;true;addProperty;(String,String);;Argument[1];Argument[this].MapValue;taint;manual"
 			JsonObject out = null;
 			String in = (String)source();
 			out.addProperty((String)null, in);
-			sink(getMapValueDefault(out)); // $ hasValueFlow
+			sink(getMapValueDefault(out)); // $ hasTaintFlow
 		}
 		{
 			// "com.google.gson;JsonObject;true;asMap;;;Argument[this].MapKey;ReturnValue.MapKey;value;manual"
 			Map out = null;
-			JsonObject in = (JsonObject)newWithMapKeyDefault((String) source());
+			JsonObject in = newWithMapKeyDefault((String) source());
 			out = in.asMap();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.gson;JsonObject;true;asMap;;;Argument[this].MapValue;ReturnValue.MapValue;value;manual"
 			Map out = null;
-			JsonObject in = (JsonObject)newWithMapValueDefault((JsonElement) source());
+			JsonObject in = newWithMapValueDefault((JsonElement) source());
 			out = in.asMap();
 			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.gson;JsonObject;true;entrySet;;;Argument[this].MapKey;ReturnValue.Element.MapKey;value;manual"
 			Set<Map.Entry<String,JsonElement>> out = null;
-			JsonObject in = (JsonObject)newWithMapKeyDefault((String) source());
+			JsonObject in = newWithMapKeyDefault((String) source());
 			out = in.entrySet();
 			sink(getMapKeyDefault(getElement(out))); // $ hasValueFlow
 		}
 		{
-			// "com.google.gson;JsonObject;true;entrySet;;;Argument[this].MapKey;ReturnValue.Element.MapValue;value;manual"
+			// "com.google.gson;JsonObject;true;entrySet;;;Argument[this].MapValue;ReturnValue.Element.MapValue;value;manual"
 			Set<Map.Entry<String,JsonElement>> out = null;
-			JsonObject in = (JsonObject) newWithMapKeyDefault((String) source());
+			JsonObject in = newWithMapValueDefault((JsonElement) source());
 			out = in.entrySet();
 			sink(getMapValueDefault(getElement(out))); // $ hasValueFlow
 		}
 		{
 			// "com.google.gson;JsonObject;true;get;;;Argument[this].MapValue;ReturnValue;value;manual"
 			JsonElement out = null;
-			JsonObject in = (JsonObject)newWithMapValueDefault((JsonElement) source());
+			JsonObject in = newWithMapValueDefault((JsonElement) source());
 			out = in.get(null);
 			sink(out); // $ hasValueFlow
 		}
 		{
 			// "com.google.gson;JsonObject;true;keySet;;;Argument[this].MapKey;ReturnValue.Element;value;manual"
 			Set out = null;
-			JsonObject in = (JsonObject)newWithMapKeyDefault((String) source());
+			JsonObject in = newWithMapKeyDefault((String) source());
 			out = in.keySet();
 			sink(getElement(out)); // $ hasValueFlow
 		}

Original file line number	Diff line number	Diff line change
`@@ -407,51 +407,51 @@ public void test() throws Exception {`
`407`	`407`	`sink(getMapKeyDefault(out)); // $ hasValueFlow`
`408`	`408`	`}`
`409`	`409`	`{`
`410`		`- // "com.google.gson;JsonObject;true;addProperty;(String,String);;Argument[1];Argument[this].MapValue;value;manual"`
	`410`	`+ // "com.google.gson;JsonObject;true;addProperty;(String,String);;Argument[1];Argument[this].MapValue;taint;manual"`
`411`	`411`	`JsonObject out = null;`
`412`	`412`	`String in = (String)source();`
`413`	`413`	`out.addProperty((String)null, in);`
`414`		`- sink(getMapValueDefault(out)); // $ hasValueFlow`
	`414`	`+ sink(getMapValueDefault(out)); // $ hasTaintFlow`
`415`	`415`	`}`
`416`	`416`	`{`
`417`	`417`	`// "com.google.gson;JsonObject;true;asMap;;;Argument[this].MapKey;ReturnValue.MapKey;value;manual"`
`418`	`418`	`Map out = null;`
`419`		`- JsonObject in = (JsonObject)newWithMapKeyDefault((String) source());`
	`419`	`+ JsonObject in = newWithMapKeyDefault((String) source());`
`420`	`420`	`out = in.asMap();`
`421`	`421`	`sink(getMapKey(out)); // $ hasValueFlow`
`422`	`422`	`}`
`423`	`423`	`{`
`424`	`424`	`// "com.google.gson;JsonObject;true;asMap;;;Argument[this].MapValue;ReturnValue.MapValue;value;manual"`
`425`	`425`	`Map out = null;`
`426`		`- JsonObject in = (JsonObject)newWithMapValueDefault((JsonElement) source());`
	`426`	`+ JsonObject in = newWithMapValueDefault((JsonElement) source());`
`427`	`427`	`out = in.asMap();`
`428`	`428`	`sink(getMapValue(out)); // $ hasValueFlow`
`429`	`429`	`}`
`430`	`430`	`{`
`431`	`431`	`// "com.google.gson;JsonObject;true;entrySet;;;Argument[this].MapKey;ReturnValue.Element.MapKey;value;manual"`
`432`	`432`	`Set<Map.Entry<String,JsonElement>> out = null;`
`433`		`- JsonObject in = (JsonObject)newWithMapKeyDefault((String) source());`
	`433`	`+ JsonObject in = newWithMapKeyDefault((String) source());`
`434`	`434`	`out = in.entrySet();`
`435`	`435`	`sink(getMapKeyDefault(getElement(out))); // $ hasValueFlow`
`436`	`436`	`}`
`437`	`437`	`{`
`438`		`- // "com.google.gson;JsonObject;true;entrySet;;;Argument[this].MapKey;ReturnValue.Element.MapValue;value;manual"`
	`438`	`+ // "com.google.gson;JsonObject;true;entrySet;;;Argument[this].MapValue;ReturnValue.Element.MapValue;value;manual"`
`439`	`439`	`Set<Map.Entry<String,JsonElement>> out = null;`
`440`		`- JsonObject in = (JsonObject) newWithMapKeyDefault((String) source());`
	`440`	`+ JsonObject in = newWithMapValueDefault((JsonElement) source());`
`441`	`441`	`out = in.entrySet();`
`442`	`442`	`sink(getMapValueDefault(getElement(out))); // $ hasValueFlow`
`443`	`443`	`}`
`444`	`444`	`{`
`445`	`445`	`// "com.google.gson;JsonObject;true;get;;;Argument[this].MapValue;ReturnValue;value;manual"`
`446`	`446`	`JsonElement out = null;`
`447`		`- JsonObject in = (JsonObject)newWithMapValueDefault((JsonElement) source());`
	`447`	`+ JsonObject in = newWithMapValueDefault((JsonElement) source());`
`448`	`448`	`out = in.get(null);`
`449`	`449`	`sink(out); // $ hasValueFlow`
`450`	`450`	`}`
`451`	`451`	`{`
`452`	`452`	`// "com.google.gson;JsonObject;true;keySet;;;Argument[this].MapKey;ReturnValue.Element;value;manual"`
`453`	`453`	`Set out = null;`
`454`		`- JsonObject in = (JsonObject)newWithMapKeyDefault((String) source());`
	`454`	`+ JsonObject in = newWithMapKeyDefault((String) source());`
`455`	`455`	`out = in.keySet();`
`456`	`456`	`sink(getElement(out)); // $ hasValueFlow`
`457`	`457`	`}`