Relaxed path requirements to KDBX file so it can live outside the ass…

…embly execution directory.
adamfisher · Dec 8, 2021 · 82e5830 · 82e5830
1 parent 9ce2ec0
commit 82e5830
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/KeePass.Extensions.Configuration.Tests/KeePass.Extensions.Configuration.Tests.csproj b/KeePass.Extensions.Configuration.Tests/KeePass.Extensions.Configuration.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/KeePass.Extensions.Configuration.Tests/KeePassConfigurationExtensionsTests.cs b/KeePass.Extensions.Configuration.Tests/KeePassConfigurationExtensionsTests.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Configuration;
 using System;
 using System.Linq;
+using System.Runtime.InteropServices;
 using Xunit;
 
 namespace KeePass.Extensions.Configuration.Tests
@@ -35,17 +36,22 @@ public KeePassConfigurationExtensionsTests()
 
         #region Tests
 
-        [Fact]
-        public void AddKeePass_MapsKdbxPathToConnection()
+        [Theory]
+        [InlineData("KeePassTestDatabase.kdbx")]
+        [InlineData("../../../KeePassTestDatabase.kdbx")]
+        public void AddKeePass_MapsKdbxPathToConnection(string path)
         {
-            Builder.AddKeePass("KeePassTestDatabase.kdbx");
+            Builder.AddKeePass(path);
 
             Builder.Sources.Should().NotBeEmpty();
             Builder.Sources.First().Should().BeOfType<KeePassConfigurationSource>();
 
             var keePassSource = (KeePassConfigurationSource)Builder.Sources.First();
-            keePassSource.Path.Should().BeEquivalentTo("KeePassTestDatabase.kdbx");
-            keePassSource.Connection.Path.Should().BeEquivalentTo("KeePassTestDatabase.kdbx");
+            keePassSource.Path.Should().BeEquivalentTo(path);
+            keePassSource.Connection.Path.Should().BeEquivalentTo(path);
+
+            var provider = new KeePassConfigurationProvider(keePassSource);
+            provider.Invoking(x => x.Load()).Should().Throw<InvalidCompositeKeyException>();
         }
 
         [Fact]
@@ -61,9 +67,14 @@ public void AddKeePass_WithMasterPassword()
         [Fact]
         public void AddKeePass_WithWindowsAccount()
         {
-            Builder.AddKeePass("KeePassTestDatabase.kdbx", useCurrentWindowsAccount: true);
-            var keePassSource = (KeePassConfigurationSource)Builder.Sources.First();
-            keePassSource.CompositeKey.GetUserKey(typeof(KcpUserAccount)).Should().NotBeNull();
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                Builder.AddKeePass("KeePassTestDatabase.kdbx", useCurrentWindowsAccount: true);
+                var keePassSource = (KeePassConfigurationSource)Builder.Sources.First();
+                keePassSource.CompositeKey.GetUserKey(typeof(KcpUserAccount)).Should().NotBeNull();
+            }
+
+            Assert.True(true);
         }
 
         #endregion

diff --git a/KeePass.Extensions.Configuration/KeePass.Extensions.Configuration.csproj b/KeePass.Extensions.Configuration/KeePass.Extensions.Configuration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <Authors>Adam Fisher</Authors>
     <Company>Octane Software, LLC</Company>
     <Description>KeePass configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
@@ -14,7 +14,7 @@
     <PackageTags>keepass,configuration,Microsoft.Extensions.Configuration,config</PackageTags>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageIconUrl>https://raw.githubusercontent.com/adamfisher/KeePass.Extensions.Configuration/master/Images/keepass_512x512.png</PackageIconUrl>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/KeePass.Extensions.Configuration/KeePassConfigurationExtensions.cs b/KeePass.Extensions.Configuration/KeePassConfigurationExtensions.cs
@@ -75,7 +75,6 @@ public static IConfigurationBuilder AddKeePass(
             if (provider == null && Path.IsPathRooted(path))
             {
                 provider = new PhysicalFileProvider(Path.GetDirectoryName(path));
-                path = Path.GetFileName(path);
             }
 
             connection = connection ?? new IOConnectionInfo { Path = path };