Restrict fluent api models to same type access

Benjamin Muskalla · Benjamin Muskalla · commit 747ab122c3f2 · 2021-11-10T16:30:24.000+01:00
diff --git a/java/ql/src/utils/model-generator/CaptureSummaryModels.ql b/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
@@ -22,7 +22,7 @@ string captureFlow(Callable api) {
 string captureQualifierFlow(Callable api) {
   exists(ReturnStmt rtn |
     rtn.getEnclosingCallable() = api and
-    rtn.getResult() instanceof ThisAccess
+    rtn.getResult().(ThisAccess).isOwnInstanceAccess()
   ) and
   result = asValueModel(api, "Argument[-1]", "ReturnValue")
 }
diff --git a/java/ql/test/utils/model-generator/p/FluentAPI.java b/java/ql/test/utils/model-generator/p/FluentAPI.java
@@ -6,4 +6,10 @@ public FluentAPI returnsThis(String input) {
         return this;
     }
 
+    public class Inner {
+        public FluentAPI notThis(String input) {
+            return FluentAPI.this;
+        }
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ string captureFlow(Callable api) {`
`22`	`22`	`string captureQualifierFlow(Callable api) {`
`23`	`23`	`exists(ReturnStmt rtn \|`
`24`	`24`	`rtn.getEnclosingCallable() = api and`
`25`		`- rtn.getResult() instanceof ThisAccess`
	`25`	`+ rtn.getResult().(ThisAccess).isOwnInstanceAccess()`
`26`	`26`	`) and`
`27`	`27`	`result = asValueModel(api, "Argument[-1]", "ReturnValue")`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,10 @@ public FluentAPI returnsThis(String input) {`
`6`	`6`	`return this;`
`7`	`7`	`}`
`8`	`8`
	`9`	`+ public class Inner {`
	`10`	`+ public FluentAPI notThis(String input) {`
	`11`	`+ return FluentAPI.this;`
	`12`	`+ }`
	`13`	`+ }`
	`14`	`+`
`9`	`15`	`}`