From a7f212df052ec38530cc96ebe1d2104d4767d946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20B=C3=B6lts?= Date: Thu, 20 Sep 2018 16:38:20 +0200 Subject: [PATCH 1/5] Starting vNext --- CHANGELOG.md | 3 +++ KeeAnywhere/Properties/AssemblyInfo.cs | 6 +++--- build.cmd | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b370a3..a4f786f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.6.0 (unreleased) + + ## 1.5.0 (2018-09-20) This is mainly a bug-fixing release. diff --git a/KeeAnywhere/Properties/AssemblyInfo.cs b/KeeAnywhere/Properties/AssemblyInfo.cs index 300da6f..ded1833 100644 --- a/KeeAnywhere/Properties/AssemblyInfo.cs +++ b/KeeAnywhere/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: //[assembly: AssemblyVersion("0.1.0.0")] -[assembly: AssemblyVersion("1.5.0.0")] -[assembly: AssemblyFileVersion("1.5.0.0")] -[assembly: AssemblyInformationalVersion("1.5.0")] +[assembly: AssemblyVersion("1.6.0.0")] +[assembly: AssemblyFileVersion("1.6.0.0")] +[assembly: AssemblyInformationalVersion("1.6.0-unstable")] diff --git a/build.cmd b/build.cmd index 5f7c923..80e8639 100644 --- a/build.cmd +++ b/build.cmd @@ -1,5 +1,5 @@ @echo off -set version=1.5.0 +set version=1.6.0-unstable set zip="packages\7-Zip.CommandLine.9.20.0\tools\7za.exe" set msbuildcmd="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsMSBuildCmd.bat" From 39b03cf111673f81c2ef008d1edd4eb015631ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20B=C3=B6lts?= Date: Fri, 19 Oct 2018 09:44:39 +0200 Subject: [PATCH 2/5] #152 Box: Enable TLS 1.1+; #148 KeeAnywhere Offline Cache path --- CHANGELOG.md | 9 ++++++++- KeeAnywhere/Configuration/ConfigurationInfo.cs | 13 +++++++++---- KeeAnywhere/KeeAnywhereExt.cs | 10 ++++++++-- KeeAnywhere/Properties/AssemblyInfo.cs | 6 +++--- build.cmd | 2 +- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4f786f..0604950 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ -## 1.6.0 (unreleased) +## 1.5.1 (unreleased) + +This is a bug-fixing release only. + +### Fixed + +- \#148 KeeAnywhere Offline Cache path +- \#152 Box: Enable TLS 1.1+ ## 1.5.0 (2018-09-20) diff --git a/KeeAnywhere/Configuration/ConfigurationInfo.cs b/KeeAnywhere/Configuration/ConfigurationInfo.cs index 315e91e..fac40dc 100644 --- a/KeeAnywhere/Configuration/ConfigurationInfo.cs +++ b/KeeAnywhere/Configuration/ConfigurationInfo.cs @@ -16,13 +16,18 @@ public static class ConfigurationInfo static ConfigurationInfo() { - _isPortable = !KeePass.Program.Config.Meta.PreferUserConfiguration; + var isGlobalConfig = !KeePass.Program.Config.Meta.PreferUserConfiguration; + var asm = Assembly.GetEntryAssembly(); + var filename = asm.Location; + var directory = Path.GetDirectoryName(filename); + + _isPortable = isGlobalConfig + && !directory.StartsWith(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)) + && !directory.StartsWith(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)); if (_isPortable) { - var asm = Assembly.GetEntryAssembly(); - var filename = asm.Location; - _settingsDirectory = Path.GetDirectoryName(filename); + _settingsDirectory = directory; } else { diff --git a/KeeAnywhere/KeeAnywhereExt.cs b/KeeAnywhere/KeeAnywhereExt.cs index 7e100ff..81a41c4 100644 --- a/KeeAnywhere/KeeAnywhereExt.cs +++ b/KeeAnywhere/KeeAnywhereExt.cs @@ -1,6 +1,7 @@ using System; using System.Diagnostics; using System.Linq; +using System.Net; using System.Reflection; using System.Windows.Forms; using KeeAnywhere.Configuration; @@ -34,12 +35,17 @@ public class KeeAnywhereExt : Plugin private KpResources _kpResources; /// - /// Constructor; implemented to fix https://github.com/Kyrodan/KeeAnywhere/issues/141 + /// Static Constructor; implemented to fix: + /// * https://github.com/Kyrodan/KeeAnywhere/issues/141 + /// * https://github.com/Kyrodan/KeeAnywhere/issues/152 /// - public KeeAnywhereExt() + static KeeAnywhereExt() { // Some binding redirection fixes for Google Drive API FixDependencyLoading(); + + // Enable new TLS-Versions (see #152) + ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; } /// diff --git a/KeeAnywhere/Properties/AssemblyInfo.cs b/KeeAnywhere/Properties/AssemblyInfo.cs index ded1833..17d6255 100644 --- a/KeeAnywhere/Properties/AssemblyInfo.cs +++ b/KeeAnywhere/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: //[assembly: AssemblyVersion("0.1.0.0")] -[assembly: AssemblyVersion("1.6.0.0")] -[assembly: AssemblyFileVersion("1.6.0.0")] -[assembly: AssemblyInformationalVersion("1.6.0-unstable")] +[assembly: AssemblyVersion("1.5.1.0")] +[assembly: AssemblyFileVersion("1.5.1.0")] +[assembly: AssemblyInformationalVersion("1.5.1-unstable")] diff --git a/build.cmd b/build.cmd index 80e8639..ca0ff28 100644 --- a/build.cmd +++ b/build.cmd @@ -1,5 +1,5 @@ @echo off -set version=1.6.0-unstable +set version=1.5.1-unstable set zip="packages\7-Zip.CommandLine.9.20.0\tools\7za.exe" set msbuildcmd="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsMSBuildCmd.bat" From 50e19d3a87d3a0c0b013ba480a709e253242956e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20B=C3=B6lts?= Date: Fri, 19 Oct 2018 09:56:19 +0200 Subject: [PATCH 3/5] Updated CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0604950..2372f18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ This is a bug-fixing release only. ### Fixed -- \#148 KeeAnywhere Offline Cache path +- \#147 KeeAnywhere-1.5.0 plugin incompatible with Keepass 2.40 (Improved Library Loading) +- \#148 KeeAnywhere Offline Cache path (Improved determination of portability) - \#152 Box: Enable TLS 1.1+ From 288a01458e6a4daead0696fda7ff4b0051e7b238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20B=C3=B6lts?= Date: Fri, 19 Oct 2018 11:17:01 +0200 Subject: [PATCH 4/5] #139 Fails to save big DB to remote [tested on GDrive & OneDrive] --- CHANGELOG.md | 2 +- KeeAnywhere/StorageProviders/AmazonS3/AmazonS3Helper.cs | 2 ++ KeeAnywhere/StorageProviders/Box/BoxHttpRequestHandler.cs | 3 +++ .../StorageProviders/GoogleDrive/GoogleDriveHelper.cs | 2 ++ KeeAnywhere/StorageProviders/OneDrive/OneDriveHelper.cs | 6 +++++- KeeAnywhere/StorageProviders/ProxyTools.cs | 5 ++++- 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2372f18..304ba0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ This is a bug-fixing release only. ### Fixed - +- \#139 Fails to save big DB to remote [tested on GDrive & OneDrive] - \#147 KeeAnywhere-1.5.0 plugin incompatible with Keepass 2.40 (Improved Library Loading) - \#148 KeeAnywhere Offline Cache path (Improved determination of portability) - \#152 Box: Enable TLS 1.1+ diff --git a/KeeAnywhere/StorageProviders/AmazonS3/AmazonS3Helper.cs b/KeeAnywhere/StorageProviders/AmazonS3/AmazonS3Helper.cs index 21ca8ad..dbe1e58 100644 --- a/KeeAnywhere/StorageProviders/AmazonS3/AmazonS3Helper.cs +++ b/KeeAnywhere/StorageProviders/AmazonS3/AmazonS3Helper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Net; using System.Text; +using System.Threading; using System.Threading.Tasks; using Amazon; using Amazon.Runtime; @@ -38,6 +39,7 @@ public static AmazonS3Client GetApi(AWSCredentials credentials, RegionEndpoint r var config = new AmazonS3Config { RegionEndpoint = region, + Timeout = Timeout.InfiniteTimeSpan }; ApplyProxy(config); diff --git a/KeeAnywhere/StorageProviders/Box/BoxHttpRequestHandler.cs b/KeeAnywhere/StorageProviders/Box/BoxHttpRequestHandler.cs index 542cd44..50bc5af 100644 --- a/KeeAnywhere/StorageProviders/Box/BoxHttpRequestHandler.cs +++ b/KeeAnywhere/StorageProviders/Box/BoxHttpRequestHandler.cs @@ -5,6 +5,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; +using System.Threading; using System.Threading.Tasks; using Box.V2; using Box.V2.Config; @@ -106,6 +107,8 @@ private HttpClient CreateClient(IBoxRequest request) if (request.Timeout.HasValue) client.Timeout = request.Timeout.Value; + else + client.Timeout = Timeout.InfiniteTimeSpan; return client; } diff --git a/KeeAnywhere/StorageProviders/GoogleDrive/GoogleDriveHelper.cs b/KeeAnywhere/StorageProviders/GoogleDrive/GoogleDriveHelper.cs index a719b28..d2872b0 100644 --- a/KeeAnywhere/StorageProviders/GoogleDrive/GoogleDriveHelper.cs +++ b/KeeAnywhere/StorageProviders/GoogleDrive/GoogleDriveHelper.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Threading; using System.Threading.Tasks; using Google.Apis.Auth.OAuth2; using Google.Apis.Auth.OAuth2.Flows; @@ -71,6 +72,7 @@ public static async Task GetClient(TokenResponse token) }; var client = new DriveService(driveInitializer); + client.HttpClient.Timeout = Timeout.InfiniteTimeSpan; return client; } diff --git a/KeeAnywhere/StorageProviders/OneDrive/OneDriveHelper.cs b/KeeAnywhere/StorageProviders/OneDrive/OneDriveHelper.cs index 9e6c4d7..a761b91 100644 --- a/KeeAnywhere/StorageProviders/OneDrive/OneDriveHelper.cs +++ b/KeeAnywhere/StorageProviders/OneDrive/OneDriveHelper.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Threading; using System.Threading.Tasks; using KeeAnywhere.Configuration; using Microsoft.Graph; @@ -45,7 +46,10 @@ public static async Task GetApi(AccountConfiguration accoun await authProvider.AuthenticateByRefreshTokenAsync(account.Secret); - var httpProvider = new HttpProvider(ProxyTools.CreateHttpClientHandler(), true); + var httpProvider = new HttpProvider(ProxyTools.CreateHttpClientHandler(), true) { + OverallTimeout = Timeout.InfiniteTimeSpan + }; + var api = new GraphServiceClient(ApiUrl, authProvider, httpProvider); Cache.Add(account.Id, api); diff --git a/KeeAnywhere/StorageProviders/ProxyTools.cs b/KeeAnywhere/StorageProviders/ProxyTools.cs index 16918a0..289e6a1 100644 --- a/KeeAnywhere/StorageProviders/ProxyTools.cs +++ b/KeeAnywhere/StorageProviders/ProxyTools.cs @@ -5,6 +5,7 @@ using System.Net; using System.Net.Http; using System.Text; +using System.Threading; using System.Threading.Tasks; using KeePassLib; @@ -15,7 +16,9 @@ public static class ProxyTools public static HttpClient CreateHttpClient() { - return new HttpClient(CreateHttpClientHandler()); + return new HttpClient(CreateHttpClientHandler()) { + Timeout = Timeout.InfiniteTimeSpan + }; } public static HttpClientHandler CreateHttpClientHandler() From 59b030fe3237a9571d437ec156f1c9fd5cf03116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20B=C3=B6lts?= Date: Fri, 19 Oct 2018 12:06:25 +0200 Subject: [PATCH 5/5] Preparing 1.5.1 --- CHANGELOG.md | 2 +- KeeAnywhere/Properties/AssemblyInfo.cs | 2 +- build.cmd | 2 +- chocolatey/keepass-plugin-keeanywhere.nuspec | 47 ++++++++++++-------- version_manifest.txt | 2 +- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 304ba0d..d921330 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.5.1 (unreleased) +## 1.5.1 (2018-10-19) This is a bug-fixing release only. diff --git a/KeeAnywhere/Properties/AssemblyInfo.cs b/KeeAnywhere/Properties/AssemblyInfo.cs index 17d6255..b446e1b 100644 --- a/KeeAnywhere/Properties/AssemblyInfo.cs +++ b/KeeAnywhere/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ //[assembly: AssemblyVersion("0.1.0.0")] [assembly: AssemblyVersion("1.5.1.0")] [assembly: AssemblyFileVersion("1.5.1.0")] -[assembly: AssemblyInformationalVersion("1.5.1-unstable")] +[assembly: AssemblyInformationalVersion("1.5.1")] diff --git a/build.cmd b/build.cmd index ca0ff28..0008aa3 100644 --- a/build.cmd +++ b/build.cmd @@ -1,5 +1,5 @@ @echo off -set version=1.5.1-unstable +set version=1.5.1 set zip="packages\7-Zip.CommandLine.9.20.0\tools\7za.exe" set msbuildcmd="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsMSBuildCmd.bat" diff --git a/chocolatey/keepass-plugin-keeanywhere.nuspec b/chocolatey/keepass-plugin-keeanywhere.nuspec index 8273022..af9e538 100644 --- a/chocolatey/keepass-plugin-keeanywhere.nuspec +++ b/chocolatey/keepass-plugin-keeanywhere.nuspec @@ -3,7 +3,7 @@ keepass-plugin-keeanywhere KeePass Plugin KeeAnywhere - 1.5.0 + 1.5.1 Daniel Bölts Kyrodan Plugin for KeePass 2.x to to add support for cloud storage providers @@ -28,33 +28,44 @@ Supported providers: https://github.com/Kyrodan/KeeAnywhere/wiki/ https://cdn.rawgit.com/Kyrodan/KeeAnywhere/95b05e59b80690037bfb1952715d5104fbf99b71/KeeAnywhere/Resources/KeeAnywhere_48x48.png keepass plugin backup sync cloud - © 2015-2017 Daniel Bölts + © 2015-2018 Daniel Bölts https://github.com/Kyrodan/KeeAnywhere/blob/master/LICENSE false - ## 1.5.0 (2018-09-20) + ## 1.5.1 (2018-10-19) - This is mainly a bug-fixing release. - KeePass 2.40 or newer is required now (was 2.35). +This is a bug-fixing release only. - Noteworthy: - Default Storage Location for settings is now in User's Roaming AppData instead of User's Local AppData. +### Fixed +- \#139 Fails to save big DB to remote [tested on GDrive & OneDrive] +- \#147 KeeAnywhere-1.5.0 plugin incompatible with Keepass 2.40 (Improved Library Loading) +- \#148 KeeAnywhere Offline Cache path (Improved determination of portability) +- \#152 Box: Enable TLS 1.1+ - ### Fixed - - \#90 Update OnHelpMeChooseAccountStorage uri - - \#96 default folder did not create automatically - - \#103 Caching database makes KeePass non-portable - - \#113 Adjust account storage location - - \#122 Fixes syntax in donation text - - \#138 Simple Spelling Correction - - \#141 Incompatible with KeePass 2.40 +## 1.5.0 (2018-09-20) - ### Improved +This is mainly a bug-fixing release. +KeePass 2.40 or newer is required now (was 2.35). - - Updated Dependencies (AWS, Box, Dropbox, Google Drive, OneDrive) +Noteworthy: +Default Storage Location for settings is now in User's Roaming AppData instead of User's Local AppData. +### Fixed - [Full Changelog](https://github.com/Kyrodan/KeeAnywhere/blob/master/CHANGELOG.md) +- \#90 Update OnHelpMeChooseAccountStorage uri +- \#96 default folder did not create automatically +- \#103 Caching database makes KeePass non-portable +- \#113 Adjust account storage location +- \#122 Fixes syntax in donation text +- \#138 Simple Spelling Correction +- \#141 Incompatible with KeePass 2.40 + +### Improved + +- Updated Dependencies (AWS, Box, Dropbox, Google Drive, OneDrive) + + +[Full Changelog](https://github.com/Kyrodan/KeeAnywhere/blob/master/CHANGELOG.md) diff --git a/version_manifest.txt b/version_manifest.txt index dc002ee..5ae4ad9 100644 --- a/version_manifest.txt +++ b/version_manifest.txt @@ -1,3 +1,3 @@ : -KeeAnywhere:1.5.0.0 +KeeAnywhere:1.5.1.0 : \ No newline at end of file