Java: Add some less precise models for BasicAttributes to get the models to work with search sink and re-generate SDK models.

Author: michaelnebel

java/ql/lib/ext/generated/javax.naming.directory.model.yml

@@ -13,6 +13,10 @@ extensions:
       - ["javax.naming.directory", "AttributeModificationException", True, "getUnexecutedModifications", "()", "", "Argument[this].SyntheticField[javax.naming.directory.AttributeModificationException.unexecs]", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming.directory", "AttributeModificationException", True, "setUnexecutedModifications", "(ModificationItem[])", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.AttributeModificationException.unexecs]", "value", "dfc-generated"]
       - ["javax.naming.directory", "Attributes", True, "clone", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-generated"]
+      - ["javax.naming.directory", "Attributes", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attributes", True, "put", "(Attribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attributes", True, "put", "(Attribute)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attributes", True, "put", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "dfc-generated"]
       - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.attrID]", "value", "dfc-generated"]
       - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.attrID]", "value", "dfc-generated"]
       - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "value", "dfc-generated"]
@@ -29,14 +33,6 @@ extensions:
       - ["javax.naming.directory", "BasicAttribute", True, "remove", "(int)", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming.directory", "BasicAttribute", True, "set", "(int,Object)", "", "Argument[1]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "value", "dfc-generated"]
       - ["javax.naming.directory", "BasicAttribute", True, "set", "(int,Object)", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttribute.values].Element", "ReturnValue", "value", "dfc-generated"]
-      - ["javax.naming.directory", "BasicAttributes", True, "BasicAttributes", "(String,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttributes.attrs].MapKey", "value", "dfc-generated"]
-      - ["javax.naming.directory", "BasicAttributes", True, "BasicAttributes", "(String,Object,boolean)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttributes.attrs].MapKey", "value", "dfc-generated"]
-      - ["javax.naming.directory", "BasicAttributes", True, "clone", "()", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttributes.attrs]", "ReturnValue.SyntheticField[javax.naming.directory.BasicAttributes.attrs]", "value", "dfc-generated"]
-      - ["javax.naming.directory", "BasicAttributes", True, "get", "(String)", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttributes.attrs].MapValue", "ReturnValue", "value", "dfc-generated"]
-      - ["javax.naming.directory", "BasicAttributes", True, "put", "(Attribute)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttributes.attrs].MapValue", "value", "dfc-generated"]
-      - ["javax.naming.directory", "BasicAttributes", True, "put", "(Attribute)", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttributes.attrs].MapValue", "ReturnValue", "value", "dfc-generated"]
-      - ["javax.naming.directory", "BasicAttributes", True, "put", "(String,Object)", "", "Argument[0]", "Argument[this].SyntheticField[javax.naming.directory.BasicAttributes.attrs].MapKey", "value", "dfc-generated"]
-      - ["javax.naming.directory", "BasicAttributes", True, "put", "(String,Object)", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttributes.attrs].MapValue", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming.directory", "BasicAttributes", True, "remove", "(String)", "", "Argument[this].SyntheticField[javax.naming.directory.BasicAttributes.attrs].MapValue", "ReturnValue", "value", "dfc-generated"]
       - ["javax.naming.directory", "DirContext", True, "bind", "(Name,Object,Attributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.naming.directory", "DirContext", True, "bind", "(Name,Object,Attributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]

java/ql/lib/ext/javax.naming.directory.model.yml

@@ -1,4 +1,17 @@
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.naming.directory", "BasicAttributes", True, "BasicAttributes", "(String,Object)", "", "Argument[0..1]", "Argument[this]", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "BasicAttributes", "(String,Object,boolean)", "", "Argument[0..1]", "Argument[this]", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "clone", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "put", "(Attribute)", "", "Argument[0..1]", "Argument[this]", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "put", "(Attribute)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "put", "(String,Object)", "", "Argument[0..1]", "Argument[this]", "taint", "manual"]
+      - ["javax.naming.directory", "BasicAttributes", True, "put", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+
   - addsTo:
       pack: codeql/java-all
       extensible: sinkModel