Release 1.0.4

Keeper-Security · Oct 28, 2022 · d1b17cd · d1b17cd
1 parent 57489bf
commit d1b17cd
Show file tree

Hide file tree

Showing 39 changed files with 22,639 additions and 13,845 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,12 @@ on:
         description: Build SQLite Vault storage
         type: boolean
         required: false
-        default: 'false'
+        default: false
+      cli:
+        description: Build CLI package
+        type: boolean
+        required: false
+        default: false
 
 jobs:
   build:
@@ -65,6 +70,18 @@ jobs:
           dotnet pack --no-build --no-restore --configuration=Release /P:IncludeSymbols=true /P:SymbolPackageFormat=snupkg
         shell: powershell
 
+      - name: Build CLI library
+        working-directory: ./Cli
+        run: |
+          if (Test-Path bin) { Remove-Item -Force -Recurse bin }
+          dotnet restore
+          dotnet clean --configuration=Release
+          dotnet build --configuration=Release
+          & 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /f ..\certificate.pfx /t "http://timestamp.digicert.com" /v /p "${{ secrets.PFX_PASS }}" /d ".NET Keeper SDK" "bin\Release\net472\Cli.dll"
+          & 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /f ..\certificate.pfx /t "http://timestamp.digicert.com" /v /p "${{ secrets.PFX_PASS }}" /d ".NET Keeper SDK" "bin\Release\netstandard2.0\Cli.dll"
+          dotnet pack --no-build --no-restore --configuration=Release /P:IncludeSymbols=true /P:SymbolPackageFormat=snupkg
+        shell: powershell
+
       - name: Build .Net Commander
         working-directory: ./Commander
         run: |
@@ -74,15 +91,6 @@ jobs:
           & 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /f ..\certificate.pfx /t "http://timestamp.digicert.com" /v /p "${{ secrets.PFX_PASS }}" /d ".NET Keeper SDK" "bin\Release\Commander.exe"
         shell: powershell      
 
-      - name: Build Security Key library for Windows
-        working-directory: ./WinWebAuthn
-        run: |
-          if (Test-Path bin) { Remove-Item -Force -Recurse bin }
-          msbuild /T:Restore,Clean /P:Configuration=Release
-          msbuild /T:Build /P:Configuration=Release /P:Version=${Env:SDK_VERSION} /P:AssemblyVersion=${Env:BUILD_VERSION} /P:FileVersion=${Env:BUILD_VERSION}
-          & 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /f ..\certificate.pfx /t "http://timestamp.digicert.com" /v /p "${{ secrets.PFX_PASS }}" /d ".NET Keeper SDK" "bin\Release\WinWebAuthn.dll"
-        shell: powershell
-
       - name: Build Keeper SDK Nuget package
         working-directory: ./KeeperSdk
         run: |
@@ -98,7 +106,7 @@ jobs:
       - name: Zip Commander
         run: |
           $params = @{
-            Path = "Commander/bin/Release/Commander.*", "Commander/bin/Release/CommandLine.dll", "WinWebAuthn/bin/Release/WinWebAuthn.dll", "KeeperSdk/bin/Release/net452/*.dll"
+            Path = "Commander/bin/Release/Commander.*", "Commander/bin/Release/CommandLine.dll", "Cli/bin/Release/net472/Cli.dll", "KeeperSdk/bin/Release/net452/*.dll"
             CompressionLevel = "Fastest"
             DestinationPath = "Commander-${Env:PACKAGE_VERSION}.zip"
           }
@@ -130,3 +138,13 @@ jobs:
             OfflineStorageSqlite/bin/Release/Keeper.Storage.Sqlite.*.nupkg
             OfflineStorageSqlite/bin/Release/Keeper.Storage.Sqlite.*.snupkg
           retention-days: 1
+
+      - name: Store artifacts
+        if: ${{ github.event.inputs.cli == 'true' }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: Cli
+          path: |
+            Cli/bin/Release/Keeper.Cli.*.nupkg
+            Cli/bin/Release/Keeper.Cli.*.snupkg
+          retention-days: 1
diff --git a/Commander/App.config b/Commander/App.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
   <appSettings>
-    <add key="useOfflineStorage" value="false"/>
-    <add key="storageAssembly" value="OfflineStorageSqlite.dll"/>
-    <add key="driverAssembly" value="System.Data.SQLite.dll"/>
-    <add key="driverClass" value="System.Data.SQLite.SQLiteConnection"/>
-    <add key="connectionString" value="Data Source=C:\\ProgramData\\Keeper Security\\commander.db;"/>
+    <add key="useOfflineStorage" value="false" />
+    <add key="storageAssembly" value="OfflineStorageSqlite.dll" />
+    <add key="driverAssembly" value="System.Data.SQLite.dll" />
+    <add key="driverClass" value="System.Data.SQLite.SQLiteConnection" />
+    <add key="connectionString" value="Data Source=C:\\ProgramData\\Keeper Security\\commander.db;" />
   </appSettings>
-</configuration>
+</configuration>
diff --git a/Commander/Commander.csproj b/Commander/Commander.csproj
@@ -26,8 +26,8 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>1.0.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -54,16 +54,39 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+    </Reference>
+    <Reference Include="CommandLine, Version=2.9.1.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommandLineParser.2.9.1\lib\net461\CommandLine.dll</HintPath>
+    </Reference>
+    <Reference Include="Google.Protobuf, Version=3.19.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.Protobuf.3.19.0\lib\net45\Google.Protobuf.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CommanderExtensions.cs" />
-    <Compile Include="Commands.cs" />
+    <Compile Include="NotConnectedCommands.cs" />
     <Compile Include="ConnectedCommands.cs" />
     <Compile Include="CommanderStorageProtection.cs" />
     <Compile Include="enterprise\EnterpriseCommands.cs" />
@@ -75,6 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
@@ -90,17 +114,14 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Cli\Cli.csproj">
+      <Project>{413e9a7a-bbcb-415d-932a-7e628bb0d7c8}</Project>
+      <Name>Cli</Name>
+    </ProjectReference>
     <ProjectReference Include="..\KeeperSdk\KeeperSdk.csproj">
       <Project>{29b50177-f7b4-46f6-b3da-b9fef269eef2}</Project>
       <Name>KeeperSdk</Name>
     </ProjectReference>
-    <ProjectReference Include="..\WinWebAuthn\WinWebAuthn.csproj">
-      <Project>{912a6a55-c062-42ff-aafb-13b56f74b7e5}</Project>
-      <Name>WinWebAuthn</Name>
-    </ProjectReference>
-    <PackageReference Include="CommandLineParser">
-      <Version>2.8.0</Version>
-    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>