Fix file overriding

snowflakedb · Dec 9, 2024 · 5eb2569 · 5eb2569
1 parent 5a46335
commit 5eb2569
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/Snowflake.Data.Tests/UnitTests/CredentialManager/SFCredentialManagerFileImplTest.cs b/Snowflake.Data.Tests/UnitTests/CredentialManager/SFCredentialManagerFileImplTest.cs
@@ -46,6 +46,12 @@ public void SetUp()
             _credentialManager = SFCredentialManagerFileImpl.Instance;
         }
 
+        [TearDown]
+        public void CleanAll()
+        {
+            File.Delete(SFCredentialManagerFileImpl.Instance._jsonCacheFilePath);
+        }
+
         [Test]
         public void TestThatThrowsErrorWhenCacheFailToCreateCacheFile()
         {

diff --git a/Snowflake.Data/Core/CredentialManager/Infrastructure/SFCredentialManagerFileImpl.cs b/Snowflake.Data/Core/CredentialManager/Infrastructure/SFCredentialManagerFileImpl.cs
@@ -13,7 +13,6 @@
 using System.Linq;
 using System.Security;
 using System.Threading;
-using Newtonsoft.Json.Linq;
 using KeyTokenDict = System.Collections.Generic.Dictionary<string, string>;
 
 namespace Snowflake.Data.Core.CredentialManager.Infrastructure
@@ -36,7 +35,7 @@ internal class SFCredentialManagerFileImpl : ISnowflakeCredentialManager
 
         private readonly string _jsonCacheDirectory;
 
-        private readonly string _jsonCacheFilePath;
+        internal readonly string _jsonCacheFilePath;
 
         private readonly string _jsonCacheLockPath;
 
@@ -79,18 +78,21 @@ internal void WriteToJsonFile(string content)
             {
                 _directoryOperations.CreateDirectory(_jsonCacheDirectory);
             }
-            s_logger.Info($"Creating the json file for credential cache in {_jsonCacheFilePath}");
             if (_fileOperations.Exists(_jsonCacheFilePath))
             {
                 s_logger.Info($"The existing json file for credential cache in {_jsonCacheFilePath} will be overwritten");
             }
-            var createFileResult = _unixOperations.CreateFileWithPermissions(_jsonCacheFilePath,
-                FilePermissions.S_IRUSR | FilePermissions.S_IWUSR);
-            if (createFileResult == -1)
+            else
             {
-                var errorMessage = "Failed to create the JSON token cache file";
-                s_logger.Error(errorMessage);
-                throw new Exception(errorMessage);
+                s_logger.Info($"Creating the json file for credential cache in {_jsonCacheFilePath}");
+                var createFileResult = _unixOperations.CreateFileWithPermissions(_jsonCacheFilePath,
+                    FilePermissions.S_IRUSR | FilePermissions.S_IWUSR);
+                if (createFileResult == -1)
+                {
+                    var errorMessage = "Failed to create the JSON token cache file";
+                    s_logger.Error(errorMessage);
+                    throw new Exception(errorMessage);
+                }
             }
             _fileOperations.Write(_jsonCacheFilePath, content, ValidateFilePermissions);
         }
@@ -100,9 +102,8 @@ internal KeyTokenDict ReadJsonFile()
             var contentFile = _fileOperations.ReadAllText(_jsonCacheFilePath, ValidateFilePermissions);
             try
             {
-                JObject.Parse(contentFile);
                 var fileContent = JsonConvert.DeserializeObject<CredentialsFileContent>(contentFile);
-                return fileContent == null ? new KeyTokenDict() : fileContent.Tokens;
+                return (fileContent == null || fileContent.Tokens == null) ? new KeyTokenDict() : fileContent.Tokens;
             }
             catch (Exception)
             {
@@ -159,7 +160,8 @@ public void RemoveCredentials(string key)
                     {
                         var keyTokenPairs = ReadJsonFile();
                         keyTokenPairs.Remove(key);
-                        WriteToJsonFile(JsonConvert.SerializeObject(keyTokenPairs));
+                        var credentials = new CredentialsFileContent { Tokens = keyTokenPairs };
+                        WriteToJsonFile(JsonConvert.SerializeObject(credentials));
                     }
                 }
                 finally
@@ -184,8 +186,8 @@ public void SaveCredentials(string key, string token)
                 {
                     KeyTokenDict keyTokenPairs = _fileOperations.Exists(_jsonCacheFilePath) ? ReadJsonFile() : new KeyTokenDict();
                     keyTokenPairs[key] = token;
-
-                    string jsonString = JsonConvert.SerializeObject(keyTokenPairs);
+                    var credentials = new CredentialsFileContent { Tokens = keyTokenPairs };
+                    string jsonString = JsonConvert.SerializeObject(credentials);
                     WriteToJsonFile(jsonString);
                 }
                 finally

diff --git a/Snowflake.Data/Core/Tools/UnixOperations.cs b/Snowflake.Data/Core/Tools/UnixOperations.cs
@@ -63,7 +63,7 @@ public void WriteAllText(string path, string content, Action<UnixStream> validat
         {
             var fileInfo = new UnixFileInfo(path: path);
 
-            using (var handle = fileInfo.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite, FilePermissions.S_IWUSR |  FilePermissions.S_IRUSR))
+            using (var handle = fileInfo.Open(FileMode.Create, FileAccess.ReadWrite, FilePermissions.S_IWUSR |  FilePermissions.S_IRUSR))
             {
                 validator?.Invoke(handle);
                 using (var streamWriter = new StreamWriter(handle, Encoding.UTF8))