Skip to content

Commit 27e9cb5

Browse files
michaelnebelmichaelnebel
authored
Merge pull request #16872 from michaelnebel/csharp/updatedotnetmodels
C#: Update .NET 8 Runtime models.
2 parents 0c52597 + c8d301e commit 27e9cb5

18 files changed

+86
-51
lines changed

‎csharp/ql/lib/change-notes/2024-07-19-added-sources.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Added some new `local` source models. Most prominently `System.IO.Path.GetTempPath` and `System.Environment.GetFolderPath`. This might produce more alerts, if the `local` threat model is enabled.

‎csharp/ql/lib/ext/System.Configuration.model.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@ extensions:
1515
- ["System.Configuration", "SettingElementCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
1616
- ["System.Configuration", "SettingsPropertyCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
1717
- ["System.Configuration", "SettingsPropertyValueCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
18+
- addsTo:
19+
pack: codeql/csharp-all
20+
extensible: neutralModel
21+
data:
22+
- ["System.Configuration", "ApplicationSettingsBase", "GetPreviousVersion", "(System.String)", "source", "manual"]

‎csharp/ql/lib/ext/System.Diagnostics.model.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,8 @@ extensions:
2222
- ["System.Diagnostics", "TraceListenerCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
2323
- ["System.Diagnostics", "TraceListenerCollection", False, "get_Item", "(System.String)", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
2424
- ["System.Diagnostics", "TraceListenerCollection", False, "set_Item", "(System.Int32,System.Diagnostics.TraceListener)", "", "Argument[1]", "Argument[this].Element", "value", "manual"]
25+
- addsTo:
26+
pack: codeql/csharp-all
27+
extensible: neutralModel
28+
data:
29+
- ["System.Diagnostics", "Process", "get_ProcessName", "()", "source", "manual"]

‎csharp/ql/lib/ext/System.model.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -870,3 +870,8 @@ extensions:
870870
- ["System", "ValueTuple<T1,T2>", False, "get_Item", "(System.Int32)", "", "Argument[this].Field[System.ValueTuple`2.Item2]", "ReturnValue", "value", "manual"]
871871
- ["System", "ValueTuple<T1>", False, "ValueTuple", "(T1)", "", "Argument[0]", "Argument[this].Field[System.ValueTuple`1.Item1]", "value", "manual"]
872872
- ["System", "ValueTuple<T1>", False, "get_Item", "(System.Int32)", "", "Argument[this].Field[System.ValueTuple`1.Item1]", "ReturnValue", "value", "manual"]
873+
- addsTo:
874+
pack: codeql/csharp-all
875+
extensible: neutralModel
876+
data:
877+
- ["System", "Environment", "get_SystemDirectory", "()", "source", "manual"]

‎csharp/ql/lib/ext/generated/Microsoft.Android.Build.Ndk.model.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ extensions:
1313
- ["Microsoft.Android.Build.Ndk", "NdkTools", False, "get_ToolPrefixPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
1414
- ["Microsoft.Android.Build.Ndk", "NdkVersion", False, "NdkVersion", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
1515
- ["Microsoft.Android.Build.Ndk", "NdkVersion", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
16+
- addsTo:
17+
pack: codeql/csharp-all
18+
extensible: sourceModel
19+
data:
20+
- ["Microsoft.Android.Build.Ndk", "Ndk", False, "get_NdkPath", "()", "", "ReturnValue", "environment", "df-generated"]
1621
- addsTo:
1722
pack: codeql/csharp-all
1823
extensible: neutralModel

‎csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.UserSecrets.model.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ extensions:
55
extensible: summaryModel
66
data:
77
- ["Microsoft.Extensions.Configuration.UserSecrets", "PathHelper", False, "GetSecretsPathFromSecretsId", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
8+
- addsTo:
9+
pack: codeql/csharp-all
10+
extensible: sourceModel
11+
data:
12+
- ["Microsoft.Extensions.Configuration.UserSecrets", "PathHelper", False, "GetSecretsPathFromSecretsId", "(System.String)", "", "ReturnValue", "environment", "df-generated"]
813
- addsTo:
914
pack: codeql/csharp-all
1015
extensible: neutralModel

‎csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.Resolution.model.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ extensions:
77
- ["Microsoft.Extensions.DependencyModel.Resolution", "CompositeCompilationAssemblyResolver", False, "CompositeCompilationAssemblyResolver", "(Microsoft.Extensions.DependencyModel.Resolution.ICompilationAssemblyResolver[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
88
- ["Microsoft.Extensions.DependencyModel.Resolution", "ICompilationAssemblyResolver", True, "TryResolveAssemblyPaths", "(Microsoft.Extensions.DependencyModel.CompilationLibrary,System.Collections.Generic.List<System.String>)", "", "Argument[0]", "Argument[1].Element", "taint", "df-generated"]
99
- ["Microsoft.Extensions.DependencyModel.Resolution", "ICompilationAssemblyResolver", True, "TryResolveAssemblyPaths", "(Microsoft.Extensions.DependencyModel.CompilationLibrary,System.Collections.Generic.List<System.String>)", "", "Argument[this]", "Argument[1].Element", "taint", "df-generated"]
10+
- addsTo:
11+
pack: codeql/csharp-all
12+
extensible: sourceModel
13+
data:
14+
- ["Microsoft.Extensions.DependencyModel.Resolution", "DotNetReferenceAssembliesPathResolver", False, "Resolve", "()", "", "ReturnValue", "environment", "df-generated"]
1015
- addsTo:
1116
pack: codeql/csharp-all
1217
extensible: neutralModel

‎csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ extensions:
1313
- ["System.Collections.Generic", "CollectionExtensions", False, "GetRuntimeAssets", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeAssetGroup>,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
1414
- ["System.Collections.Generic", "CollectionExtensions", False, "GetRuntimeFileAssets", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeAssetGroup>,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
1515
- ["System.Collections.Generic", "CollectionExtensions", False, "GetRuntimeGroup", "(System.Collections.Generic.IEnumerable<Microsoft.Extensions.DependencyModel.RuntimeAssetGroup>,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
16+
- ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
17+
- ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
18+
- ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
19+
- ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
1620
- ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
1721
- ["System.Collections.Generic", "CollectionExtensions", False, "Remove<TKey,TValue>", "(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
1822
- ["System.Collections.Generic", "CollectionExtensions", False, "TryAdd<TKey,TValue>", "(System.Collections.Generic.IDictionary<TKey,TValue>,TKey,TValue)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"]
@@ -139,7 +143,6 @@ extensions:
139143
- ["System.Collections.Generic", "ByteEqualityComparer", "GetHashCode", "()", "summary", "df-generated"]
140144
- ["System.Collections.Generic", "ByteEqualityComparer", "GetHashCode", "(System.Byte)", "summary", "df-generated"]
141145
- ["System.Collections.Generic", "CollectionExtensions", "AddRange<T>", "(System.Collections.Generic.List<T>,System.ReadOnlySpan<T>)", "summary", "df-generated"]
142-
- ["System.Collections.Generic", "CollectionExtensions", "GetValueOrDefault<TKey,TValue>", "(System.Collections.Generic.IReadOnlyDictionary<TKey,TValue>,TKey)", "summary", "df-generated"]
143146
- ["System.Collections.Generic", "CollectionExtensions", "InsertRange<T>", "(System.Collections.Generic.List<T>,System.Int32,System.ReadOnlySpan<T>)", "summary", "df-generated"]
144147
- ["System.Collections.Generic", "Comparer<T>", "Compare", "(System.Object,System.Object)", "summary", "df-generated"]
145148
- ["System.Collections.Generic", "Comparer<T>", "Compare", "(T,T)", "summary", "df-generated"]

‎csharp/ql/lib/ext/generated/System.IO.model.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,11 @@ extensions:
247247
- ["System.IO", "UnmanagedMemoryStream", False, "UnmanagedMemoryStream", "(System.Byte*,System.Int64,System.Int64,System.IO.FileAccess)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
248248
- ["System.IO", "UnmanagedMemoryStream", False, "UnmanagedMemoryStream", "(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
249249
- ["System.IO", "UnmanagedMemoryStream", False, "UnmanagedMemoryStream", "(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
250+
- addsTo:
251+
pack: codeql/csharp-all
252+
extensible: sourceModel
253+
data:
254+
- ["System.IO", "Path", False, "GetTempPath", "()", "", "ReturnValue", "environment", "df-generated"]
250255
- addsTo:
251256
pack: codeql/csharp-all
252257
extensible: neutralModel

‎csharp/ql/lib/ext/generated/System.Net.Http.model.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@ extensions:
6565
- ["System.Net.Http", "SocketsHttpPlaintextStreamFilterContext", False, "get_PlaintextStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
6666
- ["System.Net.Http", "StreamContent", False, "StreamContent", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
6767
- ["System.Net.Http", "StreamContent", False, "StreamContent", "(System.IO.Stream,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
68-
- addsTo:
69-
pack: codeql/csharp-all
70-
extensible: sinkModel
71-
data:
72-
- ["System.Net.Http", "StringContent", False, "StringContent", "(System.String)", "", "Argument[0]", "js-injection", "df-generated"]
73-
- ["System.Net.Http", "StringContent", False, "StringContent", "(System.String,System.Net.Http.Headers.MediaTypeHeaderValue)", "", "Argument[0]", "js-injection", "df-generated"]
74-
- ["System.Net.Http", "StringContent", False, "StringContent", "(System.String,System.Text.Encoding)", "", "Argument[0]", "js-injection", "df-generated"]
75-
- ["System.Net.Http", "StringContent", False, "StringContent", "(System.String,System.Text.Encoding,System.String)", "", "Argument[0]", "js-injection", "df-generated"]
7668
- addsTo:
7769
pack: codeql/csharp-all
7870
extensible: neutralModel

0 commit comments

Comments
 (0)