Merge pull request #495 from owen-mc/fix-evanphxjsonpatch-test

smowton · web-flow · commit 2752505e84d6 · 2021-03-05T18:03:28.000Z
Model Apply methods correctly
diff --git a/ql/src/semmle/go/frameworks/EvanphxJsonPatch.qll b/ql/src/semmle/go/frameworks/EvanphxJsonPatch.qll
@@ -45,12 +45,12 @@ private module EvanphxJsonPatch {
     }
   }
 
-  private class Apply extends TaintTracking::FunctionModel {
+  private class Apply extends TaintTracking::FunctionModel, Method {
     Apply() {
       exists(string fn |
         fn in ["Apply", "ApplyWithOptions", "ApplyIndent", "ApplyIndentWithOptions"]
       |
-        this.hasQualifiedName(packagePath(), fn)
+        this.hasQualifiedName(packagePath(), "Patch", fn)
       )
     }
 

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ private module EvanphxJsonPatch {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- private class Apply extends TaintTracking::FunctionModel {`
	`48`	`+ private class Apply extends TaintTracking::FunctionModel, Method {`
`49`	`49`	`Apply() {`
`50`	`50`	`exists(string fn \|`
`51`	`51`	`fn in ["Apply", "ApplyWithOptions", "ApplyIndent", "ApplyIndentWithOptions"]`
`52`	`52`	`\|`
`53`		`- this.hasQualifiedName(packagePath(), fn)`
	`53`	`+ this.hasQualifiedName(packagePath(), "Patch", fn)`
`54`	`54`	`)`
`55`	`55`	`}`
`56`	`56`