Merge pull request #3501 from carlossanlop/SystemIOFile

Fix name of WellKnownTypeNames.SystemIOFile
dotnet · Apr 14, 2020 · f970239 · f970239
2 parents de59248 + 17a4e1b
commit f970239
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...s/Core/Microsoft.NetCore.Analyzers/Security/DoNotCallDangerousMethodsInDeserialization.cs b/...s/Core/Microsoft.NetCore.Analyzers/Security/DoNotCallDangerousMethodsInDeserialization.cs
@@ -33,7 +33,7 @@ public sealed class DoNotCallDangerousMethodsInDeserialization : DiagnosticAnaly
 
         private ImmutableArray<(string, string[])> DangerousCallable = ImmutableArray.Create<(string, string[])>
             (
-                (WellKnownTypeNames.SystemIOFileFullName, new[] { "WriteAllBytes", "WriteAllLines", "WriteAllText", "Copy", "Move", "AppendAllLines", "AppendAllText", "AppendText", "Delete" }),
+                (WellKnownTypeNames.SystemIOFile, new[] { "WriteAllBytes", "WriteAllLines", "WriteAllText", "Copy", "Move", "AppendAllLines", "AppendAllText", "AppendText", "Delete" }),
                 (WellKnownTypeNames.SystemIODirectory, new[] { "Delete" }),
                 (WellKnownTypeNames.SystemIOFileInfo, new[] { "Delete" }),
                 (WellKnownTypeNames.SystemIODirectoryInfo, new[] { "Delete" }),

diff --git a/src/Utilities/Compiler/WellKnownTypeNames.cs b/src/Utilities/Compiler/WellKnownTypeNames.cs
@@ -144,7 +144,7 @@ internal static class WellKnownTypeNames
         public const string SystemIOCompressionZipFileExtensions = "System.IO.Compression.ZipFileExtensions";
         public const string SystemIODirectory = "System.IO.Directory";
         public const string SystemIODirectoryInfo = "System.IO.DirectoryInfo";
-        public const string SystemIOFileFullName = "System.IO.File";
+        public const string SystemIOFile = "System.IO.File";
         public const string SystemIOFileInfo = "System.IO.FileInfo";
         public const string SystemIOFileStream = "System.IO.FileStream";
         public const string SystemIOLogLogStore = "System.IO.Log.LogStore";

diff --git a/...tilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/FilePathInjectionSinks.cs b/...tilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/FilePathInjectionSinks.cs
@@ -26,7 +26,7 @@ static FilePathInjectionSinks()
                     ( "Exists", new[] { "path" } ),
                 });
             builder.AddSinkInfo(
-                WellKnownTypeNames.SystemIOFileFullName,
+                WellKnownTypeNames.SystemIOFile,
                 SinkKind.FilePathInjection,
                 isInterface: false,
                 isAnyStringParameterInConstructorASink: false,

diff --git a/...ies/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/HardcodedCertificateSources.cs b/...ies/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/HardcodedCertificateSources.cs
@@ -20,7 +20,7 @@ static HardcodedCertificateSources()
             var builder = PooledHashSet<SourceInfo>.GetInstance();
 
             builder.AddSourceInfoSpecifyingTaintedTargets(
-                WellKnownTypeNames.SystemIOFileFullName,
+                WellKnownTypeNames.SystemIOFile,
                 isInterface: false,
                 taintedProperties: null,
                 taintedMethodsNeedsPointsToAnalysis: null,

diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/ZipSlipSinks.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/ZipSlipSinks.cs
@@ -26,7 +26,7 @@ static ZipSlipSinks()
                     ("ExtractToFile", new[] { "destinationFileName" } ),
                 });
             builder.AddSinkInfo(
-                WellKnownTypeNames.SystemIOFileFullName,
+                WellKnownTypeNames.SystemIOFile,
                 SinkKind.ZipSlip,
                 isInterface: false,
                 isAnyStringParameterInConstructorASink: false,