Merge pull request #17 from ae-vivanov/fix-stream-position

Reset memory stream position when key is loaded from the stream explicitly.
neosmart · Jan 22, 2024 · b1baa6c · b1baa6c
2 parents c08b31a + 2acda4e
commit b1baa6c
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 0 deletions.
diff --git a/SecureStore/SecretsManager.cs b/SecureStore/SecretsManager.cs
@@ -153,6 +153,8 @@ public void LoadKeyFromStream(Stream stream)
                 }
             }
 
+            mstream.Seek(0, SeekOrigin.Begin);
+
             if (mstream.Length == KEYLENGTH * KEYCOUNT)
             {
                 LoadLegacyKeyFromStream(mstream);
@@ -258,6 +260,8 @@ public async Task LoadKeyFromStreamAsync(Stream stream, CancellationToken cancel
                 }
             }
 
+            mstream.Seek(0, SeekOrigin.Begin);
+
             if (mstream.Length == KEYLENGTH * KEYCOUNT)
             {
                 await LoadLegacyKeyFromStreamAsync(mstream, cancel);

diff --git a/Tests/FunctionalityTests.cs b/Tests/FunctionalityTests.cs
@@ -2,6 +2,7 @@
 using NeoSmart.SecureStore;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading.Tasks;
 
 namespace Tests
 {
@@ -99,5 +100,47 @@ public void StoreAndLoadStream()
                 }
             }
         }
+
+        [TestMethod]
+        public void StoreAndLoadKeyFromStream()
+        {
+            var storePath = Path.GetTempFileName();
+            var keyPath = Path.GetTempFileName();
+
+            CreateTestStore(storePath, keyPath);
+
+            using (var storeStream = new FileStream(storePath, FileMode.Open, FileAccess.Read))
+            using (var keyStream = new FileStream(keyPath, FileMode.Open, FileAccess.Read))
+            using (var sman = SecretsManager.LoadStore(storeStream))
+            {
+                sman.LoadKeyFromStream(keyStream);
+                foreach (var key in SecureData.Keys)
+                {
+                    Assert.AreEqual(SecureData[key], sman.Get(key),
+                        $"Retrieved data for key \"{key}\" does not match stored value!");
+                }
+            }
+        }
+
+        [TestMethod]
+        public async Task StoreAndLoadKeyFromStreamAsync()
+        {
+            var storePath = Path.GetTempFileName();
+            var keyPath = Path.GetTempFileName();
+
+            CreateTestStore(storePath, keyPath);
+
+            using (var storeStream = new FileStream(storePath, FileMode.Open, FileAccess.Read))
+            using (var keyStream = new FileStream(keyPath, FileMode.Open, FileAccess.Read))
+            using (var sman = SecretsManager.LoadStore(storeStream))
+            {
+                await sman.LoadKeyFromStreamAsync(keyStream);
+                foreach (var key in SecureData.Keys)
+                {
+                    Assert.AreEqual(SecureData[key], sman.Get(key),
+                        $"Retrieved data for key \"{key}\" does not match stored value!");
+                }
+            }
+        }
     }
 }