Add missing tests and models for json-patch

smowton · smowton · commit 803b9d38cc46 · 2023-04-12T14:19:02.000+01:00
diff --git a/go/ql/lib/ext/github.com.evanphx.json-patch.model.yml b/go/ql/lib/ext/github.com.evanphx.json-patch.model.yml
@@ -11,3 +11,7 @@ extensions:
       - ["github.com/evanphx/json-patch/$ANYVERSION", "Patch", True, "Apply", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["github.com/evanphx/json-patch/$ANYVERSION", "Patch", True, "ApplyIndent", "", "", "Argument[-1]", "ReturnValue[0]", "taint", "manual"]
       - ["github.com/evanphx/json-patch/$ANYVERSION", "Patch", True, "ApplyIndent", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/evanphx/json-patch/$ANYVERSION", "Patch", True, "ApplyWithOptions", "", "", "Argument[-1]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/evanphx/json-patch/$ANYVERSION", "Patch", True, "ApplyWithOptions", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/evanphx/json-patch/$ANYVERSION", "Patch", True, "ApplyIndentWithOptions", "", "", "Argument[-1]", "ReturnValue[0]", "taint", "manual"]
+      - ["github.com/evanphx/json-patch/$ANYVERSION", "Patch", True, "ApplyIndentWithOptions", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/EvanphxJsonPatch/main.go b/go/ql/test/library-tests/semmle/go/frameworks/EvanphxJsonPatch/main.go
@@ -61,4 +61,18 @@ func main() {
 
 	b11, _ := getTaintedPatch().ApplyIndent(untaintedByteArray, "  ")
 	sinkByteArray(b11) // $ taintflow
+
+	// func (p Patch) ApplyWithOptions(doc []byte, options *ApplyOptions) ([]byte, error)
+	b12, _ := untaintedPatch.ApplyWithOptions(getTaintedByteArray(), nil)
+	sinkByteArray(b12) // $ taintflow
+
+	b13, _ := getTaintedPatch().ApplyWithOptions(untaintedByteArray, nil)
+	sinkByteArray(b13) // $ taintflow
+
+	// func (p Patch) ApplyIndentWithOptions(doc []byte, indent string, options *ApplyOptions) ([]byte, error)
+	b14, _ := untaintedPatch.ApplyIndentWithOptions(getTaintedByteArray(), "  ", nil)
+	sinkByteArray(b14) // $ taintflow
+
+	b15, _ := getTaintedPatch().ApplyIndentWithOptions(untaintedByteArray, "  ", nil)
+	sinkByteArray(b15) // $ taintflow
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/EvanphxJsonPatch/vendor/github.com/evanphx/json-patch/v5/stub.go b/go/ql/test/library-tests/semmle/go/frameworks/EvanphxJsonPatch/vendor/github.com/evanphx/json-patch/v5/stub.go
