Move initialization of the WindowsDefaultDirectory variable in Datado…

…gLogging to the constructor to catch possible SecurityExceptions.
DataDog · Jan 22, 2020 · 0b2cbe4 · 0b2cbe4
1 parent a9efb8a
commit 0b2cbe4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Datadog.Trace/Logging/DatadogLogging.cs b/src/Datadog.Trace/Logging/DatadogLogging.cs
@@ -11,8 +11,7 @@ namespace Datadog.Trace.Logging
     internal static class DatadogLogging
     {
         private const string NixDefaultDirectory = "/var/log/datadog/";
-        private static readonly string WindowsDefaultDirectory =
-            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), @"Datadog .NET Tracer", "logs");
+        private static readonly string WindowsDefaultDirectory;
 
         private static readonly long? MaxLogFileSize = 10 * 1024 * 1024;
         private static readonly LogEventLevel MinimumLogEventLevel = LogEventLevel.Warning;
@@ -51,8 +50,13 @@ static DatadogLogging()
                     logDirectory = Path.GetDirectoryName(nativeLogFile);
                 }
 
+                // This entire block may throw a SecurityException if not granted the System.Security.Permissions.FileIOPermission because of the following API calls
+                //   - Directory.Exists
+                //   - Environment.GetFolderPath
+                //   - Path.GetTempPath
                 if (logDirectory == null)
                 {
+                    WindowsDefaultDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), @"Datadog .NET Tracer", "logs");
                     if (Directory.Exists(WindowsDefaultDirectory))
                     {
                         logDirectory = WindowsDefaultDirectory;