From 094c98db5ef39a9f564e71d035f52529974f4637 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Tue, 16 Jul 2024 08:36:45 +0200 Subject: [PATCH 1/5] C#: Update .NET 8 Runtime models. --- .../generated/Microsoft.Android.Build.Ndk.model.yml | 5 +++++ ...t.Extensions.Configuration.UserSecrets.model.yml | 5 +++++ ....Extensions.DependencyModel.Resolution.model.yml | 5 +++++ .../generated/System.Collections.Generic.model.yml | 5 ++++- .../ext/generated/System.Configuration.model.yml | 6 ++++++ .../lib/ext/generated/System.Diagnostics.model.yml | 6 ++++++ csharp/ql/lib/ext/generated/System.IO.model.yml | 5 +++++ .../ql/lib/ext/generated/System.Net.Http.model.yml | 8 -------- .../System.Security.Cryptography.model.yml | 2 -- .../System.Threading.Tasks.Dataflow.model.yml | 13 ++++++++----- csharp/ql/lib/ext/generated/System.model.yml | 7 +++++++ 11 files changed, 51 insertions(+), 16 deletions(-) diff --git a/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Ndk.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Ndk.model.yml index cb90eb148004..d5ea2c5d4b2d 100644 --- a/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Ndk.model.yml +++ b/csharp/ql/lib/ext/generated/Microsoft.Android.Build.Ndk.model.yml @@ -13,6 +13,11 @@ extensions: - ["Microsoft.Android.Build.Ndk", "NdkTools", False, "get_ToolPrefixPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["Microsoft.Android.Build.Ndk", "NdkVersion", False, "NdkVersion", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"] - ["Microsoft.Android.Build.Ndk", "NdkVersion", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] + - addsTo: + pack: codeql/csharp-all + extensible: sourceModel + data: + - ["Microsoft.Android.Build.Ndk", "Ndk", False, "get_NdkPath", "()", "", "ReturnValue", "environment", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.UserSecrets.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.UserSecrets.model.yml index d70c162a457e..9394ce3e1808 100644 --- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.UserSecrets.model.yml +++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.UserSecrets.model.yml @@ -5,6 +5,11 @@ extensions: extensible: summaryModel data: - ["Microsoft.Extensions.Configuration.UserSecrets", "PathHelper", False, "GetSecretsPathFromSecretsId", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] + - addsTo: + pack: codeql/csharp-all + extensible: sourceModel + data: + - ["Microsoft.Extensions.Configuration.UserSecrets", "PathHelper", False, "GetSecretsPathFromSecretsId", "(System.String)", "", "ReturnValue", "environment", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.Resolution.model.yml b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.Resolution.model.yml index c24810fb1585..f3bfe2eb2d22 100644 --- a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.Resolution.model.yml +++ b/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.Resolution.model.yml @@ -7,6 +7,11 @@ extensions: - ["Microsoft.Extensions.DependencyModel.Resolution", "CompositeCompilationAssemblyResolver", False, "CompositeCompilationAssemblyResolver", "(Microsoft.Extensions.DependencyModel.Resolution.ICompilationAssemblyResolver[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"] - ["Microsoft.Extensions.DependencyModel.Resolution", "ICompilationAssemblyResolver", True, "TryResolveAssemblyPaths", "(Microsoft.Extensions.DependencyModel.CompilationLibrary,System.Collections.Generic.List)", "", "Argument[0]", "Argument[1].Element", "taint", "df-generated"] - ["Microsoft.Extensions.DependencyModel.Resolution", "ICompilationAssemblyResolver", True, "TryResolveAssemblyPaths", "(Microsoft.Extensions.DependencyModel.CompilationLibrary,System.Collections.Generic.List)", "", "Argument[this]", "Argument[1].Element", "taint", "df-generated"] + - addsTo: + pack: codeql/csharp-all + extensible: sourceModel + data: + - ["Microsoft.Extensions.DependencyModel.Resolution", "DotNetReferenceAssembliesPathResolver", False, "Resolve", "()", "", "ReturnValue", "environment", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel diff --git a/csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml b/csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml index 42a1de85d008..72e28a0029d3 100644 --- a/csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml +++ b/csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml @@ -13,6 +13,10 @@ extensions: - ["System.Collections.Generic", "CollectionExtensions", False, "GetRuntimeAssets", "(System.Collections.Generic.IEnumerable,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"] - ["System.Collections.Generic", "CollectionExtensions", False, "GetRuntimeFileAssets", "(System.Collections.Generic.IEnumerable,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"] - ["System.Collections.Generic", "CollectionExtensions", False, "GetRuntimeGroup", "(System.Collections.Generic.IEnumerable,System.String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"] + - ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault", "(System.Collections.Generic.IReadOnlyDictionary,TKey)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"] + - ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault", "(System.Collections.Generic.IReadOnlyDictionary,TKey)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"] + - ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault", "(System.Collections.Generic.IReadOnlyDictionary,TKey,TValue)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"] + - ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault", "(System.Collections.Generic.IReadOnlyDictionary,TKey,TValue)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"] - ["System.Collections.Generic", "CollectionExtensions", False, "GetValueOrDefault", "(System.Collections.Generic.IReadOnlyDictionary,TKey,TValue)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"] - ["System.Collections.Generic", "CollectionExtensions", False, "Remove", "(System.Collections.Generic.IDictionary,TKey,TValue)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"] - ["System.Collections.Generic", "CollectionExtensions", False, "TryAdd", "(System.Collections.Generic.IDictionary,TKey,TValue)", "", "Argument[0].Element", "Argument[2]", "taint", "df-generated"] @@ -139,7 +143,6 @@ extensions: - ["System.Collections.Generic", "ByteEqualityComparer", "GetHashCode", "()", "summary", "df-generated"] - ["System.Collections.Generic", "ByteEqualityComparer", "GetHashCode", "(System.Byte)", "summary", "df-generated"] - ["System.Collections.Generic", "CollectionExtensions", "AddRange", "(System.Collections.Generic.List,System.ReadOnlySpan)", "summary", "df-generated"] - - ["System.Collections.Generic", "CollectionExtensions", "GetValueOrDefault", "(System.Collections.Generic.IReadOnlyDictionary,TKey)", "summary", "df-generated"] - ["System.Collections.Generic", "CollectionExtensions", "InsertRange", "(System.Collections.Generic.List,System.Int32,System.ReadOnlySpan)", "summary", "df-generated"] - ["System.Collections.Generic", "Comparer", "Compare", "(System.Object,System.Object)", "summary", "df-generated"] - ["System.Collections.Generic", "Comparer", "Compare", "(T,T)", "summary", "df-generated"] diff --git a/csharp/ql/lib/ext/generated/System.Configuration.model.yml b/csharp/ql/lib/ext/generated/System.Configuration.model.yml index 609add7d83be..0d87d2b9f9eb 100644 --- a/csharp/ql/lib/ext/generated/System.Configuration.model.yml +++ b/csharp/ql/lib/ext/generated/System.Configuration.model.yml @@ -194,6 +194,12 @@ extensions: - ["System.Configuration", "UriSection", False, "get_Idn", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System.Configuration", "UriSection", False, "get_IriParsing", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System.Configuration", "UriSection", False, "get_SchemeSettings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] + - addsTo: + pack: codeql/csharp-all + extensible: sourceModel + data: + - ["System.Configuration", "ApplicationSettingsBase", False, "GetPreviousVersion", "(System.String)", "", "ReturnValue", "file-write", "df-generated"] + - ["System.Configuration", "ApplicationSettingsBase", False, "GetPreviousVersion", "(System.String)", "", "ReturnValue", "file", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml b/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml index 825ccc11f5ce..6954bec659de 100644 --- a/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml +++ b/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml @@ -157,6 +157,12 @@ extensions: - ["System.Diagnostics", "TraceSource", False, "TraceSource", "(System.String,System.Diagnostics.SourceLevels)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"] - ["System.Diagnostics", "TraceSource", False, "get_Listeners", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System.Diagnostics", "TraceSource", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] + - addsTo: + pack: codeql/csharp-all + extensible: sourceModel + data: + - ["System.Diagnostics", "Process", False, "get_ProcessName", "()", "", "ReturnValue", "file-write", "df-generated"] + - ["System.Diagnostics", "Process", False, "get_ProcessName", "()", "", "ReturnValue", "file", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel diff --git a/csharp/ql/lib/ext/generated/System.IO.model.yml b/csharp/ql/lib/ext/generated/System.IO.model.yml index c1681dd29f47..4dc5013b0d98 100644 --- a/csharp/ql/lib/ext/generated/System.IO.model.yml +++ b/csharp/ql/lib/ext/generated/System.IO.model.yml @@ -247,6 +247,11 @@ extensions: - ["System.IO", "UnmanagedMemoryStream", False, "UnmanagedMemoryStream", "(System.Byte*,System.Int64,System.Int64,System.IO.FileAccess)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"] - ["System.IO", "UnmanagedMemoryStream", False, "UnmanagedMemoryStream", "(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"] - ["System.IO", "UnmanagedMemoryStream", False, "UnmanagedMemoryStream", "(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"] + - addsTo: + pack: codeql/csharp-all + extensible: sourceModel + data: + - ["System.IO", "Path", False, "GetTempPath", "()", "", "ReturnValue", "environment", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel diff --git a/csharp/ql/lib/ext/generated/System.Net.Http.model.yml b/csharp/ql/lib/ext/generated/System.Net.Http.model.yml index 8016ec6a6598..9c85c8e1adf1 100644 --- a/csharp/ql/lib/ext/generated/System.Net.Http.model.yml +++ b/csharp/ql/lib/ext/generated/System.Net.Http.model.yml @@ -65,14 +65,6 @@ extensions: - ["System.Net.Http", "SocketsHttpPlaintextStreamFilterContext", False, "get_PlaintextStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System.Net.Http", "StreamContent", False, "StreamContent", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"] - ["System.Net.Http", "StreamContent", False, "StreamContent", "(System.IO.Stream,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"] - - addsTo: - pack: codeql/csharp-all - extensible: sinkModel - data: - - ["System.Net.Http", "StringContent", False, "StringContent", "(System.String)", "", "Argument[0]", "js-injection", "df-generated"] - - ["System.Net.Http", "StringContent", False, "StringContent", "(System.String,System.Net.Http.Headers.MediaTypeHeaderValue)", "", "Argument[0]", "js-injection", "df-generated"] - - ["System.Net.Http", "StringContent", False, "StringContent", "(System.String,System.Text.Encoding)", "", "Argument[0]", "js-injection", "df-generated"] - - ["System.Net.Http", "StringContent", False, "StringContent", "(System.String,System.Text.Encoding,System.String)", "", "Argument[0]", "js-injection", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel diff --git a/csharp/ql/lib/ext/generated/System.Security.Cryptography.model.yml b/csharp/ql/lib/ext/generated/System.Security.Cryptography.model.yml index d1a8a2cb2e0c..afd8556bdbde 100644 --- a/csharp/ql/lib/ext/generated/System.Security.Cryptography.model.yml +++ b/csharp/ql/lib/ext/generated/System.Security.Cryptography.model.yml @@ -119,9 +119,7 @@ extensions: extensible: sinkModel data: - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "CreateDecryptor", "()", "", "Argument[this]", "encryption-decryptor", "df-generated"] - - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "CreateDecryptor", "(System.Byte[],System.Byte[])", "", "Argument[0]", "encryption-decryptor", "df-generated"] - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "CreateEncryptor", "()", "", "Argument[this]", "encryption-encryptor", "df-generated"] - - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "CreateEncryptor", "(System.Byte[],System.Byte[])", "", "Argument[0]", "encryption-encryptor", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel diff --git a/csharp/ql/lib/ext/generated/System.Threading.Tasks.Dataflow.model.yml b/csharp/ql/lib/ext/generated/System.Threading.Tasks.Dataflow.model.yml index 75d0387aaf57..1555a3521a9b 100644 --- a/csharp/ql/lib/ext/generated/System.Threading.Tasks.Dataflow.model.yml +++ b/csharp/ql/lib/ext/generated/System.Threading.Tasks.Dataflow.model.yml @@ -34,15 +34,22 @@ extensions: - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "AsObserver", "(System.Threading.Tasks.Dataflow.ITargetBlock)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "Encapsulate", "(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.ISourceBlock)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "Encapsulate", "(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.ISourceBlock)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"] + - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"] + - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] + - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "Post", "(System.Threading.Tasks.Dataflow.ITargetBlock,TInput)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "Receive", "(System.Threading.Tasks.Dataflow.ISourceBlock)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "Receive", "(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "Receive", "(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "Receive", "(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] + - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "ReceiveAllAsync", "(System.Threading.Tasks.Dataflow.IReceivableSourceBlock,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "ReceiveAsync", "(System.Threading.Tasks.Dataflow.ISourceBlock)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "ReceiveAsync", "(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "ReceiveAsync", "(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "ReceiveAsync", "(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan,System.Threading.CancellationToken)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] + - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "SendAsync", "(System.Threading.Tasks.Dataflow.ITargetBlock,TInput)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"] + - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "SendAsync", "(System.Threading.Tasks.Dataflow.ITargetBlock,TInput,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"] + - ["System.Threading.Tasks.Dataflow", "DataflowBlock", False, "TryReceive", "(System.Threading.Tasks.Dataflow.IReceivableSourceBlock,TOutput)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "IDataflowBlock", True, "get_Completion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "JoinBlock", False, "JoinBlock", "(System.Threading.Tasks.Dataflow.GroupingDataflowBlockOptions)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "JoinBlock", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock>,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] @@ -65,6 +72,7 @@ extensions: - ["System.Threading.Tasks.Dataflow", "TransformManyBlock", False, "ReserveMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock", False, "ConsumeMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock,System.Boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"] + - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock", False, "LinkTo", "(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.DataflowLinkOptions)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock", False, "OfferMessage", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"] - ["System.Threading.Tasks.Dataflow", "WriteOnceBlock", False, "ReleaseReservation", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"] @@ -122,14 +130,9 @@ extensions: - ["System.Threading.Tasks.Dataflow", "BufferBlock", "ToString", "()", "summary", "df-generated"] - ["System.Threading.Tasks.Dataflow", "BufferBlock", "TryReceiveAll", "(System.Collections.Generic.IList)", "summary", "df-generated"] - ["System.Threading.Tasks.Dataflow", "BufferBlock", "get_Count", "()", "summary", "df-generated"] - - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "LinkTo", "(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock)", "summary", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "NullTarget", "()", "summary", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "OutputAvailableAsync", "(System.Threading.Tasks.Dataflow.ISourceBlock)", "summary", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "OutputAvailableAsync", "(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.CancellationToken)", "summary", "df-generated"] - - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "ReceiveAllAsync", "(System.Threading.Tasks.Dataflow.IReceivableSourceBlock,System.Threading.CancellationToken)", "summary", "df-generated"] - - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "SendAsync", "(System.Threading.Tasks.Dataflow.ITargetBlock,TInput)", "summary", "df-generated"] - - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "SendAsync", "(System.Threading.Tasks.Dataflow.ITargetBlock,TInput,System.Threading.CancellationToken)", "summary", "df-generated"] - - ["System.Threading.Tasks.Dataflow", "DataflowBlock", "TryReceive", "(System.Threading.Tasks.Dataflow.IReceivableSourceBlock,TOutput)", "summary", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowMessageHeader", "DataflowMessageHeader", "(System.Int64)", "summary", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowMessageHeader", "Equals", "(System.Object)", "summary", "df-generated"] - ["System.Threading.Tasks.Dataflow", "DataflowMessageHeader", "Equals", "(System.Threading.Tasks.Dataflow.DataflowMessageHeader)", "summary", "df-generated"] diff --git a/csharp/ql/lib/ext/generated/System.model.yml b/csharp/ql/lib/ext/generated/System.model.yml index 25ab5c770529..0dd7062773c2 100644 --- a/csharp/ql/lib/ext/generated/System.model.yml +++ b/csharp/ql/lib/ext/generated/System.model.yml @@ -597,6 +597,13 @@ extensions: - ["System", "ValueTuple", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System", "ValueTuple", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System", "WeakReference", False, "TryGetTarget", "(T)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] + - addsTo: + pack: codeql/csharp-all + extensible: sourceModel + data: + - ["System", "Environment", False, "GetFolderPath", "(System.Environment+SpecialFolder)", "", "ReturnValue", "environment", "df-generated"] + - ["System", "Environment", False, "GetFolderPath", "(System.Environment+SpecialFolder,System.Environment+SpecialFolderOption)", "", "ReturnValue", "environment", "df-generated"] + - ["System", "Environment", False, "get_SystemDirectory", "()", "", "ReturnValue", "environment", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel From 35ec9db23adb0613d6d54db588ba4cfd0d69971f Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 17 Jul 2024 09:02:29 +0200 Subject: [PATCH 2/5] C#: Add some manual source neutrals. --- csharp/ql/lib/ext/System.Configuration.model.yml | 5 +++++ csharp/ql/lib/ext/System.Diagnostics.model.yml | 5 +++++ csharp/ql/lib/ext/System.model.yml | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/csharp/ql/lib/ext/System.Configuration.model.yml b/csharp/ql/lib/ext/System.Configuration.model.yml index cf367cdcaa89..a9978e0ebe3d 100644 --- a/csharp/ql/lib/ext/System.Configuration.model.yml +++ b/csharp/ql/lib/ext/System.Configuration.model.yml @@ -15,3 +15,8 @@ extensions: - ["System.Configuration", "SettingElementCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"] - ["System.Configuration", "SettingsPropertyCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"] - ["System.Configuration", "SettingsPropertyValueCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"] + - addsTo: + pack: codeql/csharp-all + extensible: neutralModel + data: + - ["System.Configuration", "ApplicationSettingsBase", "GetPreviousVersion", "(System.String)", "source", "manual"] diff --git a/csharp/ql/lib/ext/System.Diagnostics.model.yml b/csharp/ql/lib/ext/System.Diagnostics.model.yml index 4d1d7b5b514a..bb4833f3bd0d 100644 --- a/csharp/ql/lib/ext/System.Diagnostics.model.yml +++ b/csharp/ql/lib/ext/System.Diagnostics.model.yml @@ -22,3 +22,8 @@ extensions: - ["System.Diagnostics", "TraceListenerCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Element", "ReturnValue", "value", "manual"] - ["System.Diagnostics", "TraceListenerCollection", False, "get_Item", "(System.String)", "", "Argument[this].Element", "ReturnValue", "value", "manual"] - ["System.Diagnostics", "TraceListenerCollection", False, "set_Item", "(System.Int32,System.Diagnostics.TraceListener)", "", "Argument[1]", "Argument[this].Element", "value", "manual"] + - addsTo: + pack: codeql/csharp-all + extensible: neutralModel + data: + - ["System.Diagnostics", "Process", "get_ProcessName", "()", "source", "manual"] diff --git a/csharp/ql/lib/ext/System.model.yml b/csharp/ql/lib/ext/System.model.yml index 7e37f7a48a96..d3c45786ee46 100644 --- a/csharp/ql/lib/ext/System.model.yml +++ b/csharp/ql/lib/ext/System.model.yml @@ -870,3 +870,8 @@ extensions: - ["System", "ValueTuple", False, "get_Item", "(System.Int32)", "", "Argument[this].Field[System.ValueTuple`2.Item2]", "ReturnValue", "value", "manual"] - ["System", "ValueTuple", False, "ValueTuple", "(T1)", "", "Argument[0]", "Argument[this].Field[System.ValueTuple`1.Item1]", "value", "manual"] - ["System", "ValueTuple", False, "get_Item", "(System.Int32)", "", "Argument[this].Field[System.ValueTuple`1.Item1]", "ReturnValue", "value", "manual"] + - addsTo: + pack: codeql/csharp-all + extensible: neutralModel + data: + - ["System", "Environment", "get_SystemDirectory", "()", "source", "manual"] From 4b0427c73270e4a561bc0696d3c9cf621dc69453 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 17 Jul 2024 09:03:22 +0200 Subject: [PATCH 3/5] C#: Update .NET 8 runtime models. --- csharp/ql/lib/ext/generated/System.Configuration.model.yml | 6 ------ csharp/ql/lib/ext/generated/System.Diagnostics.model.yml | 6 ------ csharp/ql/lib/ext/generated/System.model.yml | 1 - 3 files changed, 13 deletions(-) diff --git a/csharp/ql/lib/ext/generated/System.Configuration.model.yml b/csharp/ql/lib/ext/generated/System.Configuration.model.yml index 0d87d2b9f9eb..609add7d83be 100644 --- a/csharp/ql/lib/ext/generated/System.Configuration.model.yml +++ b/csharp/ql/lib/ext/generated/System.Configuration.model.yml @@ -194,12 +194,6 @@ extensions: - ["System.Configuration", "UriSection", False, "get_Idn", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System.Configuration", "UriSection", False, "get_IriParsing", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System.Configuration", "UriSection", False, "get_SchemeSettings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - - addsTo: - pack: codeql/csharp-all - extensible: sourceModel - data: - - ["System.Configuration", "ApplicationSettingsBase", False, "GetPreviousVersion", "(System.String)", "", "ReturnValue", "file-write", "df-generated"] - - ["System.Configuration", "ApplicationSettingsBase", False, "GetPreviousVersion", "(System.String)", "", "ReturnValue", "file", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml b/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml index 6954bec659de..825ccc11f5ce 100644 --- a/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml +++ b/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml @@ -157,12 +157,6 @@ extensions: - ["System.Diagnostics", "TraceSource", False, "TraceSource", "(System.String,System.Diagnostics.SourceLevels)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"] - ["System.Diagnostics", "TraceSource", False, "get_Listeners", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - ["System.Diagnostics", "TraceSource", False, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"] - - addsTo: - pack: codeql/csharp-all - extensible: sourceModel - data: - - ["System.Diagnostics", "Process", False, "get_ProcessName", "()", "", "ReturnValue", "file-write", "df-generated"] - - ["System.Diagnostics", "Process", False, "get_ProcessName", "()", "", "ReturnValue", "file", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel diff --git a/csharp/ql/lib/ext/generated/System.model.yml b/csharp/ql/lib/ext/generated/System.model.yml index 0dd7062773c2..888c1ba3ca0f 100644 --- a/csharp/ql/lib/ext/generated/System.model.yml +++ b/csharp/ql/lib/ext/generated/System.model.yml @@ -603,7 +603,6 @@ extensions: data: - ["System", "Environment", False, "GetFolderPath", "(System.Environment+SpecialFolder)", "", "ReturnValue", "environment", "df-generated"] - ["System", "Environment", False, "GetFolderPath", "(System.Environment+SpecialFolder,System.Environment+SpecialFolderOption)", "", "ReturnValue", "environment", "df-generated"] - - ["System", "Environment", False, "get_SystemDirectory", "()", "", "ReturnValue", "environment", "df-generated"] - addsTo: pack: codeql/csharp-all extensible: neutralModel From d5f8adbfee55345a24e357d2ab287ed724d4835f Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 14 Aug 2024 11:46:44 +0200 Subject: [PATCH 4/5] C#: Update test expected output. --- .../dataflow/library/FlowSummaries.expected | 44 +++++++------------ .../library/FlowSummariesFiltered.expected | 12 +++++ .../CWE-079/XSSAsp/XSS.expected | 2 - .../HardcodedSymmetricEncryptionKey.expected | 4 -- .../CWE-611/UntrustedDataInsecureXml.expected | 2 +- 5 files changed, 29 insertions(+), 35 deletions(-) diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected index 11605bcd4ba6..5fa095eb3ae4 100644 --- a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected +++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected @@ -90,6 +90,7 @@ source | Dapper;SqlMapper;QuerySingleOrDefaultAsync;(System.Data.IDbConnection,System.Type,System.String,System.Object,System.Data.IDbTransaction,System.Nullable,System.Nullable);ReturnValue;database;manual | | Dapper;SqlMapper;QuerySingleOrDefaultAsync;(System.Data.IDbConnection,Dapper.CommandDefinition);ReturnValue;database;manual | | Dapper;SqlMapper;QuerySingleOrDefaultAsync;(System.Data.IDbConnection,System.String,System.Object,System.Data.IDbTransaction,System.Nullable,System.Nullable);ReturnValue;database;manual | +| Microsoft.Extensions.Configuration.UserSecrets;PathHelper;GetSecretsPathFromSecretsId;(System.String);ReturnValue;environment;df-generated | | Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder);Argument[0];environment;manual | | Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder);ReturnValue;environment;manual | | Microsoft.Extensions.Configuration;EnvironmentVariablesExtensions;AddEnvironmentVariables;(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action);Argument[0];environment;manual | @@ -174,6 +175,7 @@ source | System.IO;FileStream;FileStream;(System.String,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare,System.Int32,System.IO.FileOptions);Argument[this];file;manual | | System.IO;FileStream;FileStream;(System.String,System.IO.FileStreamOptions);Argument[this];file-write;manual | | System.IO;FileStream;FileStream;(System.String,System.IO.FileStreamOptions);Argument[this];file;manual | +| System.IO;Path;GetTempPath;();ReturnValue;environment;df-generated | | System.IO;StreamWriter;StreamWriter;(System.String);Argument[this];file-write;manual | | System.IO;StreamWriter;StreamWriter;(System.String,System.Boolean);Argument[this];file-write;manual | | System.IO;StreamWriter;StreamWriter;(System.String,System.Boolean,System.Text.Encoding);Argument[this];file-write;manual | @@ -191,6 +193,8 @@ source | System;Environment;GetEnvironmentVariable;(System.String,System.EnvironmentVariableTarget);ReturnValue;environment;manual | | System;Environment;GetEnvironmentVariables;();ReturnValue;environment;manual | | System;Environment;GetEnvironmentVariables;(System.EnvironmentVariableTarget);ReturnValue;environment;manual | +| System;Environment;GetFolderPath;(System.Environment+SpecialFolder);ReturnValue;environment;df-generated | +| System;Environment;GetFolderPath;(System.Environment+SpecialFolder,System.Environment+SpecialFolderOption);ReturnValue;environment;df-generated | | System;Environment;get_CommandLine;();ReturnValue;commandargs;manual | sink | Dapper;SqlMapper;Execute;(System.Data.IDbConnection,System.String,System.Object,System.Data.IDbTransaction,System.Nullable,System.Nullable);Argument[1];sql-injection;manual | @@ -652,14 +656,10 @@ sink | System.Data.SqlClient;SqlDataAdapter;SqlDataAdapter;(System.Data.SqlClient.SqlCommand);Argument[0];sql-injection;manual | | System.Data.SqlClient;SqlDataAdapter;SqlDataAdapter;(System.String,System.Data.SqlClient.SqlConnection);Argument[0];sql-injection;manual | | System.Data.SqlClient;SqlDataAdapter;SqlDataAdapter;(System.String,System.String);Argument[0];sql-injection;manual | -| System.Net.Http;StringContent;StringContent;(System.String);Argument[0];js-injection;df-generated | | System.Net.Http;StringContent;StringContent;(System.String);Argument[0];js-injection;manual | -| System.Net.Http;StringContent;StringContent;(System.String,System.Net.Http.Headers.MediaTypeHeaderValue);Argument[0];js-injection;df-generated | | System.Net.Http;StringContent;StringContent;(System.String,System.Net.Http.Headers.MediaTypeHeaderValue);Argument[0];js-injection;manual | -| System.Net.Http;StringContent;StringContent;(System.String,System.Text.Encoding);Argument[0];js-injection;df-generated | | System.Net.Http;StringContent;StringContent;(System.String,System.Text.Encoding);Argument[0];js-injection;manual | | System.Net.Http;StringContent;StringContent;(System.String,System.Text.Encoding,System.Net.Http.Headers.MediaTypeHeaderValue);Argument[0];js-injection;manual | -| System.Net.Http;StringContent;StringContent;(System.String,System.Text.Encoding,System.String);Argument[0];js-injection;df-generated | | System.Net.Http;StringContent;StringContent;(System.String,System.Text.Encoding,System.String);Argument[0];js-injection;manual | | System.Security.Cryptography.Xml;EncryptedXml;DecryptData;(System.Security.Cryptography.Xml.EncryptedData,System.Security.Cryptography.SymmetricAlgorithm);Argument[0];encryption-decryptor;df-generated | | System.Security.Cryptography.Xml;EncryptedXml;DecryptData;(System.Security.Cryptography.Xml.EncryptedData,System.Security.Cryptography.SymmetricAlgorithm);Argument[0];encryption-keyprop;df-generated | @@ -673,64 +673,46 @@ sink | System.Security.Cryptography.Xml;EncryptedXml;GetDecryptionIV;(System.Security.Cryptography.Xml.EncryptedData,System.String);Argument[0];encryption-decryptor;df-generated | | System.Security.Cryptography.Xml;EncryptedXml;GetDecryptionIV;(System.Security.Cryptography.Xml.EncryptedData,System.String);Argument[0];encryption-keyprop;df-generated | | System.Security.Cryptography;AesCng;CreateDecryptor;();Argument[this];encryption-decryptor;df-generated | -| System.Security.Cryptography;AesCng;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;df-generated | | System.Security.Cryptography;AesCng;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;manual | | System.Security.Cryptography;AesCng;CreateEncryptor;();Argument[this];encryption-encryptor;df-generated | -| System.Security.Cryptography;AesCng;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;df-generated | | System.Security.Cryptography;AesCng;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;manual | | System.Security.Cryptography;AesCng;set_Key;(System.Byte[]);Argument[0];encryption-keyprop;manual | | System.Security.Cryptography;AesCryptoServiceProvider;CreateDecryptor;();Argument[this];encryption-decryptor;df-generated | -| System.Security.Cryptography;AesCryptoServiceProvider;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;df-generated | | System.Security.Cryptography;AesCryptoServiceProvider;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;manual | | System.Security.Cryptography;AesCryptoServiceProvider;CreateEncryptor;();Argument[this];encryption-encryptor;df-generated | -| System.Security.Cryptography;AesCryptoServiceProvider;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;df-generated | | System.Security.Cryptography;AesCryptoServiceProvider;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;manual | | System.Security.Cryptography;AesCryptoServiceProvider;set_Key;(System.Byte[]);Argument[0];encryption-keyprop;manual | | System.Security.Cryptography;AesManaged;CreateDecryptor;();Argument[this];encryption-decryptor;df-generated | -| System.Security.Cryptography;AesManaged;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;df-generated | | System.Security.Cryptography;AesManaged;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;manual | | System.Security.Cryptography;AesManaged;CreateEncryptor;();Argument[this];encryption-encryptor;df-generated | -| System.Security.Cryptography;AesManaged;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;df-generated | | System.Security.Cryptography;AesManaged;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;manual | | System.Security.Cryptography;AesManaged;set_Key;(System.Byte[]);Argument[0];encryption-keyprop;manual | | System.Security.Cryptography;DES;set_Key;(System.Byte[]);Argument[0];encryption-keyprop;manual | | System.Security.Cryptography;DESCryptoServiceProvider;CreateDecryptor;();Argument[this];encryption-decryptor;df-generated | -| System.Security.Cryptography;DESCryptoServiceProvider;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;df-generated | | System.Security.Cryptography;DESCryptoServiceProvider;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;manual | | System.Security.Cryptography;DESCryptoServiceProvider;CreateEncryptor;();Argument[this];encryption-encryptor;df-generated | -| System.Security.Cryptography;DESCryptoServiceProvider;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;df-generated | | System.Security.Cryptography;DESCryptoServiceProvider;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;manual | -| System.Security.Cryptography;RC2CryptoServiceProvider;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;df-generated | | System.Security.Cryptography;RC2CryptoServiceProvider;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;manual | -| System.Security.Cryptography;RC2CryptoServiceProvider;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;df-generated | | System.Security.Cryptography;RC2CryptoServiceProvider;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;manual | | System.Security.Cryptography;RijndaelManaged;CreateDecryptor;();Argument[this];encryption-decryptor;df-generated | -| System.Security.Cryptography;RijndaelManaged;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;df-generated | | System.Security.Cryptography;RijndaelManaged;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;manual | | System.Security.Cryptography;RijndaelManaged;CreateEncryptor;();Argument[this];encryption-encryptor;df-generated | -| System.Security.Cryptography;RijndaelManaged;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;df-generated | | System.Security.Cryptography;RijndaelManaged;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;manual | | System.Security.Cryptography;RijndaelManaged;set_Key;(System.Byte[]);Argument[0];encryption-keyprop;manual | | System.Security.Cryptography;SymmetricAlgorithm;CreateDecryptor;();Argument[this];encryption-decryptor;df-generated | -| System.Security.Cryptography;SymmetricAlgorithm;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;df-generated | | System.Security.Cryptography;SymmetricAlgorithm;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;manual | | System.Security.Cryptography;SymmetricAlgorithm;CreateEncryptor;();Argument[this];encryption-encryptor;df-generated | -| System.Security.Cryptography;SymmetricAlgorithm;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;df-generated | | System.Security.Cryptography;SymmetricAlgorithm;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;manual | | System.Security.Cryptography;SymmetricAlgorithm;set_Key;(System.Byte[]);Argument[0];encryption-keyprop;manual | | System.Security.Cryptography;TripleDES;set_Key;(System.Byte[]);Argument[0];encryption-keyprop;manual | | System.Security.Cryptography;TripleDESCng;CreateDecryptor;();Argument[this];encryption-decryptor;df-generated | -| System.Security.Cryptography;TripleDESCng;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;df-generated | | System.Security.Cryptography;TripleDESCng;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;manual | | System.Security.Cryptography;TripleDESCng;CreateEncryptor;();Argument[this];encryption-encryptor;df-generated | -| System.Security.Cryptography;TripleDESCng;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;df-generated | | System.Security.Cryptography;TripleDESCng;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;manual | | System.Security.Cryptography;TripleDESCng;set_Key;(System.Byte[]);Argument[0];encryption-keyprop;manual | | System.Security.Cryptography;TripleDESCryptoServiceProvider;CreateDecryptor;();Argument[this];encryption-decryptor;df-generated | -| System.Security.Cryptography;TripleDESCryptoServiceProvider;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;df-generated | | System.Security.Cryptography;TripleDESCryptoServiceProvider;CreateDecryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-decryptor;manual | | System.Security.Cryptography;TripleDESCryptoServiceProvider;CreateEncryptor;();Argument[this];encryption-encryptor;df-generated | -| System.Security.Cryptography;TripleDESCryptoServiceProvider;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;df-generated | | System.Security.Cryptography;TripleDESCryptoServiceProvider;CreateEncryptor;(System.Byte[],System.Byte[]);Argument[0];encryption-encryptor;manual | | System.Security.Cryptography;TripleDESCryptoServiceProvider;set_Key;(System.Byte[]);Argument[0];encryption-keyprop;manual | | System.Web;HttpResponse;Write;(System.Object);Argument[0];html-injection;manual | @@ -5877,6 +5859,10 @@ summary | System.Collections.Generic;CollectionExtensions;AsReadOnly;(System.Collections.Generic.IList);Argument[0].Element;ReturnValue;taint;df-generated | | System.Collections.Generic;CollectionExtensions;AsReadOnly;(System.Collections.Generic.IDictionary);Argument[0].Element;ReturnValue;taint;df-generated | | System.Collections.Generic;CollectionExtensions;CopyTo;(System.Collections.Generic.List,System.Span);Argument[0].Element;Argument[1];taint;df-generated | +| System.Collections.Generic;CollectionExtensions;GetValueOrDefault;(System.Collections.Generic.IReadOnlyDictionary,TKey);Argument[0].Element;ReturnValue;taint;df-generated | +| System.Collections.Generic;CollectionExtensions;GetValueOrDefault;(System.Collections.Generic.IReadOnlyDictionary,TKey);Argument[1];ReturnValue;taint;df-generated | +| System.Collections.Generic;CollectionExtensions;GetValueOrDefault;(System.Collections.Generic.IReadOnlyDictionary,TKey,TValue);Argument[0].Element;ReturnValue;taint;df-generated | +| System.Collections.Generic;CollectionExtensions;GetValueOrDefault;(System.Collections.Generic.IReadOnlyDictionary,TKey,TValue);Argument[1];ReturnValue;taint;df-generated | | System.Collections.Generic;CollectionExtensions;GetValueOrDefault;(System.Collections.Generic.IReadOnlyDictionary,TKey,TValue);Argument[2];ReturnValue;taint;df-generated | | System.Collections.Generic;CollectionExtensions;Remove;(System.Collections.Generic.IDictionary,TKey,TValue);Argument[0].Element;ReturnValue;taint;df-generated | | System.Collections.Generic;CollectionExtensions;TryAdd;(System.Collections.Generic.IDictionary,TKey,TValue);Argument[0].Element;Argument[2];taint;df-generated | @@ -16833,6 +16819,9 @@ summary | System.Threading.Tasks.Dataflow;DataflowBlock;Choose;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Action,System.Threading.Tasks.Dataflow.ISourceBlock,System.Action,System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;Encapsulate;(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.ISourceBlock);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;Encapsulate;(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.ISourceBlock);Argument[1];ReturnValue;taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock);Argument[0];Argument[1];taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock);Argument[0];ReturnValue;taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock);Argument[1];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock,System.Predicate);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.DataflowLinkOptions,System.Predicate);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;Post;(System.Threading.Tasks.Dataflow.ITargetBlock,TInput);Argument[1];Argument[0];taint;df-generated | @@ -16840,10 +16829,14 @@ summary | System.Threading.Tasks.Dataflow;DataflowBlock;Receive;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;Receive;(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;Receive;(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;ReceiveAllAsync;(System.Threading.Tasks.Dataflow.IReceivableSourceBlock,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;ReceiveAsync;(System.Threading.Tasks.Dataflow.ISourceBlock);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;ReceiveAsync;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;ReceiveAsync;(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;ReceiveAsync;(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;SendAsync;(System.Threading.Tasks.Dataflow.ITargetBlock,TInput);Argument[1];Argument[0];taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;SendAsync;(System.Threading.Tasks.Dataflow.ITargetBlock,TInput,System.Threading.CancellationToken);Argument[1];Argument[0];taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;TryReceive;(System.Threading.Tasks.Dataflow.IReceivableSourceBlock,TOutput);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;IDataflowBlock;get_Completion;();Argument[this];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;IReceivableSourceBlock;TryReceive;(System.Predicate,TOutput);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated | | System.Threading.Tasks.Dataflow;JoinBlock;JoinBlock;(System.Threading.Tasks.Dataflow.GroupingDataflowBlockOptions);Argument[0];Argument[this];taint;df-generated | @@ -16885,6 +16878,7 @@ summary | System.Threading.Tasks.Dataflow;TransformManyBlock;get_Completion;();Argument[this];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;WriteOnceBlock;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock,System.Boolean);Argument[this];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;WriteOnceBlock;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated | +| System.Threading.Tasks.Dataflow;WriteOnceBlock;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];Argument[0];taint;df-generated | | System.Threading.Tasks.Dataflow;WriteOnceBlock;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;WriteOnceBlock;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock,System.Boolean);Argument[1];Argument[this];taint;df-generated | | System.Threading.Tasks.Dataflow;WriteOnceBlock;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock);Argument[this];Argument[1];taint;df-generated | @@ -23240,7 +23234,6 @@ neutral | System.Collections.Frozen;FrozenSet;get_IsReadOnly;();summary;df-generated | | System.Collections.Frozen;FrozenSet;get_IsSynchronized;();summary;df-generated | | System.Collections.Generic;CollectionExtensions;AddRange;(System.Collections.Generic.List,System.ReadOnlySpan);summary;df-generated | -| System.Collections.Generic;CollectionExtensions;GetValueOrDefault;(System.Collections.Generic.IReadOnlyDictionary,TKey);summary;df-generated | | System.Collections.Generic;CollectionExtensions;InsertRange;(System.Collections.Generic.List,System.Int32,System.ReadOnlySpan);summary;df-generated | | System.Collections.Generic;Comparer;Compare;(System.Object,System.Object);summary;df-generated | | System.Collections.Generic;Comparer;Compare;(T,T);summary;df-generated | @@ -47247,14 +47240,9 @@ neutral | System.Threading.Tasks.Dataflow;BufferBlock;ToString;();summary;df-generated | | System.Threading.Tasks.Dataflow;BufferBlock;TryReceiveAll;(System.Collections.Generic.IList);summary;df-generated | | System.Threading.Tasks.Dataflow;BufferBlock;get_Count;();summary;df-generated | -| System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock);summary;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;NullTarget;();summary;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;OutputAvailableAsync;(System.Threading.Tasks.Dataflow.ISourceBlock);summary;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;OutputAvailableAsync;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.CancellationToken);summary;df-generated | -| System.Threading.Tasks.Dataflow;DataflowBlock;ReceiveAllAsync;(System.Threading.Tasks.Dataflow.IReceivableSourceBlock,System.Threading.CancellationToken);summary;df-generated | -| System.Threading.Tasks.Dataflow;DataflowBlock;SendAsync;(System.Threading.Tasks.Dataflow.ITargetBlock,TInput);summary;df-generated | -| System.Threading.Tasks.Dataflow;DataflowBlock;SendAsync;(System.Threading.Tasks.Dataflow.ITargetBlock,TInput,System.Threading.CancellationToken);summary;df-generated | -| System.Threading.Tasks.Dataflow;DataflowBlock;TryReceive;(System.Threading.Tasks.Dataflow.IReceivableSourceBlock,TOutput);summary;df-generated | | System.Threading.Tasks.Dataflow;DataflowMessageHeader;DataflowMessageHeader;(System.Int64);summary;df-generated | | System.Threading.Tasks.Dataflow;DataflowMessageHeader;Equals;(System.Object);summary;df-generated | | System.Threading.Tasks.Dataflow;DataflowMessageHeader;Equals;(System.Threading.Tasks.Dataflow.DataflowMessageHeader);summary;df-generated | diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected index f806f5af7f64..1a0077da2c45 100644 --- a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected +++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected @@ -4202,6 +4202,10 @@ | System.Collections.Generic;CollectionExtensions;AsReadOnly;(System.Collections.Generic.IList);Argument[0].Element;ReturnValue;taint;df-generated | | System.Collections.Generic;CollectionExtensions;AsReadOnly;(System.Collections.Generic.IDictionary);Argument[0].Element;ReturnValue;taint;df-generated | | System.Collections.Generic;CollectionExtensions;CopyTo;(System.Collections.Generic.List,System.Span);Argument[0].Element;Argument[1];taint;df-generated | +| System.Collections.Generic;CollectionExtensions;GetValueOrDefault;(System.Collections.Generic.IReadOnlyDictionary,TKey);Argument[0].Element;ReturnValue;taint;df-generated | +| System.Collections.Generic;CollectionExtensions;GetValueOrDefault;(System.Collections.Generic.IReadOnlyDictionary,TKey);Argument[1];ReturnValue;taint;df-generated | +| System.Collections.Generic;CollectionExtensions;GetValueOrDefault;(System.Collections.Generic.IReadOnlyDictionary,TKey,TValue);Argument[0].Element;ReturnValue;taint;df-generated | +| System.Collections.Generic;CollectionExtensions;GetValueOrDefault;(System.Collections.Generic.IReadOnlyDictionary,TKey,TValue);Argument[1];ReturnValue;taint;df-generated | | System.Collections.Generic;CollectionExtensions;GetValueOrDefault;(System.Collections.Generic.IReadOnlyDictionary,TKey,TValue);Argument[2];ReturnValue;taint;df-generated | | System.Collections.Generic;CollectionExtensions;Remove;(System.Collections.Generic.IDictionary,TKey,TValue);Argument[0].Element;ReturnValue;taint;df-generated | | System.Collections.Generic;CollectionExtensions;TryAdd;(System.Collections.Generic.IDictionary,TKey,TValue);Argument[0].Element;Argument[2];taint;df-generated | @@ -12159,6 +12163,9 @@ | System.Threading.Tasks.Dataflow;DataflowBlock;Choose;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Action,System.Threading.Tasks.Dataflow.ISourceBlock,System.Action,System.Threading.Tasks.Dataflow.DataflowBlockOptions);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;Encapsulate;(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.ISourceBlock);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;Encapsulate;(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.ISourceBlock);Argument[1];ReturnValue;taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock);Argument[0];Argument[1];taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock);Argument[0];ReturnValue;taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock);Argument[1];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock,System.Predicate);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;LinkTo;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.DataflowLinkOptions,System.Predicate);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;Post;(System.Threading.Tasks.Dataflow.ITargetBlock,TInput);Argument[1];Argument[0];taint;df-generated | @@ -12166,10 +12173,14 @@ | System.Threading.Tasks.Dataflow;DataflowBlock;Receive;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;Receive;(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;Receive;(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;ReceiveAllAsync;(System.Threading.Tasks.Dataflow.IReceivableSourceBlock,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;ReceiveAsync;(System.Threading.Tasks.Dataflow.ISourceBlock);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;ReceiveAsync;(System.Threading.Tasks.Dataflow.ISourceBlock,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;ReceiveAsync;(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;DataflowBlock;ReceiveAsync;(System.Threading.Tasks.Dataflow.ISourceBlock,System.TimeSpan,System.Threading.CancellationToken);Argument[0];ReturnValue;taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;SendAsync;(System.Threading.Tasks.Dataflow.ITargetBlock,TInput);Argument[1];Argument[0];taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;SendAsync;(System.Threading.Tasks.Dataflow.ITargetBlock,TInput,System.Threading.CancellationToken);Argument[1];Argument[0];taint;df-generated | +| System.Threading.Tasks.Dataflow;DataflowBlock;TryReceive;(System.Threading.Tasks.Dataflow.IReceivableSourceBlock,TOutput);Argument[0];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;IDataflowBlock;get_Completion;();Argument[this];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;IReceivableSourceBlock;TryReceive;(System.Predicate,TOutput);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated | | System.Threading.Tasks.Dataflow;JoinBlock;JoinBlock;(System.Threading.Tasks.Dataflow.GroupingDataflowBlockOptions);Argument[0];Argument[this];taint;df-generated | @@ -12203,6 +12214,7 @@ | System.Threading.Tasks.Dataflow;TransformManyBlock;TransformManyBlock;(System.Func>>,System.Threading.Tasks.Dataflow.ExecutionDataflowBlockOptions);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated | | System.Threading.Tasks.Dataflow;WriteOnceBlock;ConsumeMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock,System.Boolean);Argument[this];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;WriteOnceBlock;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[0];ReturnValue;taint;df-generated | +| System.Threading.Tasks.Dataflow;WriteOnceBlock;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];Argument[0];taint;df-generated | | System.Threading.Tasks.Dataflow;WriteOnceBlock;LinkTo;(System.Threading.Tasks.Dataflow.ITargetBlock,System.Threading.Tasks.Dataflow.DataflowLinkOptions);Argument[this];ReturnValue;taint;df-generated | | System.Threading.Tasks.Dataflow;WriteOnceBlock;OfferMessage;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,T,System.Threading.Tasks.Dataflow.ISourceBlock,System.Boolean);Argument[1];Argument[this];taint;df-generated | | System.Threading.Tasks.Dataflow;WriteOnceBlock;ReleaseReservation;(System.Threading.Tasks.Dataflow.DataflowMessageHeader,System.Threading.Tasks.Dataflow.ITargetBlock);Argument[this];Argument[1];taint;df-generated | diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.expected b/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.expected index 6c6930cb6f13..a5919f23fa8f 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.expected +++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.expected @@ -42,7 +42,6 @@ edges | XSS.cs:85:27:85:53 | access to property QueryString : NameValueCollection | XSS.cs:85:27:85:61 | access to indexer : String | provenance | MaD:6 | | XSS.cs:85:27:85:61 | access to indexer : String | XSS.cs:85:20:85:23 | access to local variable name : String | provenance | | | XSS.cs:94:20:94:23 | access to local variable name : String | XSS.cs:95:31:95:34 | access to local variable name | provenance | Sink:MaD:1 | -| XSS.cs:94:20:94:23 | access to local variable name : String | XSS.cs:95:31:95:34 | access to local variable name | provenance | Sink:MaD:7 | | XSS.cs:94:27:94:53 | access to property QueryString : NameValueCollection | XSS.cs:94:20:94:23 | access to local variable name : String | provenance | | | XSS.cs:94:27:94:53 | access to property QueryString : NameValueCollection | XSS.cs:94:27:94:61 | access to indexer : String | provenance | MaD:6 | | XSS.cs:94:27:94:61 | access to indexer : String | XSS.cs:94:20:94:23 | access to local variable name : String | provenance | | @@ -56,7 +55,6 @@ models | 4 | Summary: System.Web.UI.WebControls; TextBox; false; get_Text; (); ; Argument[this]; ReturnValue; taint; manual | | 5 | Sink: System.Web; HttpResponse; false; Write; ; ; Argument[0]; html-injection; manual | | 6 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated | -| 7 | Sink: System.Net.Http; StringContent; false; StringContent; (System.String); ; Argument[0]; js-injection; df-generated | nodes | XSS.cs:25:13:25:21 | [post] access to local variable userInput : StringBuilder | semmle.label | [post] access to local variable userInput : StringBuilder | | XSS.cs:25:48:25:62 | access to field categoryTextBox : TextBox | semmle.label | access to field categoryTextBox : TextBox | diff --git a/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.expected b/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.expected index d9aff7de1ba9..a2f05e6ff5b8 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.expected +++ b/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.expected @@ -21,17 +21,13 @@ edges | HardcodedSymmetricEncryptionKey.cs:44:51:44:69 | access to local variable byteArrayFromString : Byte[] | HardcodedSymmetricEncryptionKey.cs:112:63:112:65 | key : Byte[] | provenance | | | HardcodedSymmetricEncryptionKey.cs:50:35:50:35 | access to local variable c : Byte[] | HardcodedSymmetricEncryptionKey.cs:59:64:59:71 | password : Byte[] | provenance | | | HardcodedSymmetricEncryptionKey.cs:59:64:59:71 | password : Byte[] | HardcodedSymmetricEncryptionKey.cs:68:87:68:94 | access to parameter password | provenance | Sink:MaD:1 | -| HardcodedSymmetricEncryptionKey.cs:59:64:59:71 | password : Byte[] | HardcodedSymmetricEncryptionKey.cs:68:87:68:94 | access to parameter password | provenance | Sink:MaD:5 | | HardcodedSymmetricEncryptionKey.cs:103:57:103:59 | key : Byte[] | HardcodedSymmetricEncryptionKey.cs:108:23:108:25 | access to parameter key | provenance | Sink:MaD:3 | | HardcodedSymmetricEncryptionKey.cs:112:63:112:65 | key : Byte[] | HardcodedSymmetricEncryptionKey.cs:121:87:121:89 | access to parameter key | provenance | Sink:MaD:2 | -| HardcodedSymmetricEncryptionKey.cs:112:63:112:65 | key : Byte[] | HardcodedSymmetricEncryptionKey.cs:121:87:121:89 | access to parameter key | provenance | Sink:MaD:6 | models | 1 | Sink: System.Security.Cryptography; SymmetricAlgorithm; true; CreateDecryptor; (System.Byte[],System.Byte[]); ; Argument[0]; encryption-decryptor; manual | | 2 | Sink: System.Security.Cryptography; SymmetricAlgorithm; true; CreateEncryptor; (System.Byte[],System.Byte[]); ; Argument[0]; encryption-encryptor; manual | | 3 | Sink: System.Security.Cryptography; SymmetricAlgorithm; true; set_Key; (System.Byte[]); ; Argument[0]; encryption-keyprop; manual | | 4 | Summary: System.Text; Encoding; true; GetBytes; (System.String); ; Argument[0]; ReturnValue; taint; manual | -| 5 | Sink: System.Security.Cryptography; SymmetricAlgorithm; true; CreateDecryptor; (System.Byte[],System.Byte[]); ; Argument[0]; encryption-decryptor; df-generated | -| 6 | Sink: System.Security.Cryptography; SymmetricAlgorithm; true; CreateEncryptor; (System.Byte[],System.Byte[]); ; Argument[0]; encryption-encryptor; df-generated | nodes | HardcodedSymmetricEncryptionKey.cs:17:21:17:97 | array creation of type Byte[] | semmle.label | array creation of type Byte[] | | HardcodedSymmetricEncryptionKey.cs:22:23:22:99 | array creation of type Byte[] | semmle.label | array creation of type Byte[] | diff --git a/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.expected b/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.expected index 759cd6e05b66..266b33174a8d 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.expected +++ b/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.expected @@ -1,6 +1,6 @@ edges | Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | provenance | | -| Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | provenance | MaD:11546 | +| Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | provenance | MaD:11555 | nodes | Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection | | Test.cs:11:50:11:84 | access to indexer | semmle.label | access to indexer | From c8d301ed43a006e1f139747e36e094b2583c4b3c Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Fri, 19 Jul 2024 13:55:55 +0200 Subject: [PATCH 5/5] C#: Add change note. --- csharp/ql/lib/change-notes/2024-07-19-added-sources.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 csharp/ql/lib/change-notes/2024-07-19-added-sources.md diff --git a/csharp/ql/lib/change-notes/2024-07-19-added-sources.md b/csharp/ql/lib/change-notes/2024-07-19-added-sources.md new file mode 100644 index 000000000000..43e7b947a989 --- /dev/null +++ b/csharp/ql/lib/change-notes/2024-07-19-added-sources.md @@ -0,0 +1,4 @@ +--- +category: minorAnalysis +--- +* 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.