Merge pull request #15085 from michaelnebel/csharp/telemetrycalls

michaelnebel · web-flow · commit ffc36e4ccd89 · 2023-12-13T13:46:16.000+01:00
C#: Telemetry should only count calls in source.
diff --git a/csharp/ql/src/Telemetry/ExternalApi.qll b/csharp/ql/src/Telemetry/ExternalApi.qll
@@ -134,7 +134,8 @@ module Results<relevantApi/1 getRelevantUsages> {
       strictcount(Call c, ExternalApi api |
         c.getTarget().getUnboundDeclaration() = api and
         apiName = api.getApiName() and
-        getRelevantUsages(api)
+        getRelevantUsages(api) and
+        c.fromSource()
       )
   }
 
diff --git a/csharp/ql/src/Telemetry/ExternalLibraryUsage.ql b/csharp/ql/src/Telemetry/ExternalLibraryUsage.ql
@@ -14,7 +14,8 @@ private predicate getRelevantUsages(string namespace, int usages) {
   usages =
     strictcount(Call c, ExternalApi api |
       c.getTarget().getUnboundDeclaration() = api and
-      api.getNamespace() = namespace
+      api.getNamespace() = namespace and
+      c.fromSource()
     )
 }
 
diff --git a/csharp/ql/test/query-tests/Telemetry/LibraryUsage/options b/csharp/ql/test/query-tests/Telemetry/LibraryUsage/options
@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
diff --git a/csharp/ql/test/query-tests/Telemetry/SupportedExternalApis/options b/csharp/ql/test/query-tests/Telemetry/SupportedExternalApis/options
@@ -1,2 +1,3 @@
-semmle-extractor-options: /r:System.Collections.Specialized.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
 semmle-extractor-options: ${testdir}/../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/query-tests/Telemetry/SupportedExternalSinks/options b/csharp/ql/test/query-tests/Telemetry/SupportedExternalSinks/options
@@ -1,2 +1,3 @@
-semmle-extractor-options: /r:System.Collections.Specialized.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
 semmle-extractor-options: ${testdir}/../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/query-tests/Telemetry/SupportedExternalSources/options b/csharp/ql/test/query-tests/Telemetry/SupportedExternalSources/options
@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,8 @@ module Results<relevantApi/1 getRelevantUsages> {`
`134`	`134`	`strictcount(Call c, ExternalApi api \|`
`135`	`135`	`c.getTarget().getUnboundDeclaration() = api and`
`136`	`136`	`apiName = api.getApiName() and`
`137`		`- getRelevantUsages(api)`
	`137`	`+ getRelevantUsages(api) and`
	`138`	`+ c.fromSource()`
`138`	`139`	`)`
`139`	`140`	`}`
`140`	`141`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ private predicate getRelevantUsages(string namespace, int usages) {`
`14`	`14`	`usages =`
`15`	`15`	`strictcount(Call c, ExternalApi api \|`
`16`	`16`	`c.getTarget().getUnboundDeclaration() = api and`
`17`		`- api.getNamespace() = namespace`
	`17`	`+ api.getNamespace() = namespace and`
	`18`	`+ c.fromSource()`
`18`	`19`	`)`
`19`	`20`	`}`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+semmle-extractor-options: /nostdlib /noconfig`
	`2`	`+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj`