Add safe handle for net8

snowflakedb · Apr 23, 2024 · f5cacd1 · f5cacd1
1 parent cc5e12c
commit f5cacd1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj b/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net471;net472</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;net471;net472</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0;net8.0</TargetFrameworks>
     <RuntimeFrameworkVersion>6.0.0</RuntimeFrameworkVersion>
     <Title>Snowflake.Data.Tests</Title>
     <Description>Snowflake Connector for .NET</Description>
@@ -37,7 +37,7 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Net.Http.WebRequest" />
   </ItemGroup>
-  
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>full</DebugType>
     <DebugSymbols>True</DebugSymbols>

diff --git a/Snowflake.Data/Configuration/EasyLoggingConfigParser.cs b/Snowflake.Data/Configuration/EasyLoggingConfigParser.cs
@@ -42,10 +42,10 @@ private string TryToReadFile(string filePath)
             {
                 using (FileStream fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read))
                 {
+                    CheckIfValidPermissions(fileStream, filePath);
+
                     using (StreamReader reader = new StreamReader(fileStream))
                     {
-                        CheckIfValidPermissions(filePath);
-
                         string fileContent = reader.ReadToEnd();
 
                         return fileContent;
@@ -99,18 +99,28 @@ private void CheckForUnknownFields(string fileContent)
                 .ForEach(unknownKey => s_logger.Warn($"Unknown field from config: {unknownKey.Name}"));
         }
 
-        private void CheckIfValidPermissions(string filePath)
+        private void CheckIfValidPermissions(FileStream fileStream, string filePath)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
                 return;
+            }
 
-            // Check if others have permissions to modify the file and fail if so
-            if (_unixOperations.CheckFileHasAnyOfPermissions(filePath, FileAccessPermissions.GroupWrite | FileAccessPermissions.OtherWrite))
+#if NET8_0_OR_GREATER
+            var unixFileMode = File.GetUnixFileMode(fileStream.SafeFileHandle);
+            var hasPermissions = ((UnixFileMode.OtherRead | UnixFileMode.GroupWrite) & unixFileMode) == 0;
+#else
+            var entitlements = FileAccessPermissions.GroupWrite | FileAccessPermissions.OtherWrite;
+            var hasPermissions = _unixOperations.CheckFileHasAnyOfPermissions(filePath, entitlements);
+#endif
+            if (hasPermissions)
             {
-                var errorMessage = $"Error due to other users having permission to modify the config file: {filePath}";
-                s_logger.Error(errorMessage);
-                throw new Exception(errorMessage);
+                return;
             }
+
+            var errorMessage = $"Error due to other users having permission to modify the config file: {filePath}";
+            s_logger.Error(errorMessage);
+            throw new Exception(errorMessage);
         }
     }
 }
diff --git a/Snowflake.Data/Snowflake.Data.csproj b/Snowflake.Data/Snowflake.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net471;net472</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;net471;net472</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0;net8.0</TargetFrameworks>
     <Title>Snowflake.Data</Title>
     <PackageId>Snowflake.Data</PackageId>
     <PackageLicenseUrl>https://github.com/snowflakedb/snowflake-connector-net/blob/master/LICENSE</PackageLicenseUrl>