Merge branch 'release/v1.5.1'

Kyrodan · Oct 19, 2018 · 1ae5539 · 1ae5539
2 parents 65b4812 + 59b030f
commit 1ae5539
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.5.1 (2018-10-19)
+
+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+
+
+
 ## 1.5.0 (2018-09-20)
 
 This is mainly a bug-fixing release.

diff --git 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
@@ -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;
 
         /// <summary>
-        /// 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
         /// </summary>
-        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;
         }
 
         /// <summary>

diff --git 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.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
+[assembly: AssemblyInformationalVersion("1.5.1")]
diff --git 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
@@ -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
@@ -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<DriveService> 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
@@ -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<IGraphServiceClient> 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
@@ -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()

diff --git a/build.cmd b/build.cmd
@@ -1,5 +1,5 @@
 @echo off
-set version=1.5.0
+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
@@ -3,7 +3,7 @@
   <metadata>
     <id>keepass-plugin-keeanywhere</id>
     <title>KeePass Plugin KeeAnywhere</title>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
     <authors>Daniel Bölts</authors>
     <owners>Kyrodan</owners>
     <summary>Plugin for KeePass 2.x to to add support for cloud storage providers</summary>
@@ -28,33 +28,44 @@ Supported providers:
     <docsUrl>https://github.com/Kyrodan/KeeAnywhere/wiki/</docsUrl>
     <iconUrl>https://cdn.rawgit.com/Kyrodan/KeeAnywhere/95b05e59b80690037bfb1952715d5104fbf99b71/KeeAnywhere/Resources/KeeAnywhere_48x48.png</iconUrl>
     <tags>keepass plugin backup sync cloud</tags>
-    <copyright>© 2015-2017 Daniel Bölts</copyright>
+    <copyright>© 2015-2018 Daniel Bölts</copyright>
     <licenseUrl>https://github.com/Kyrodan/KeeAnywhere/blob/master/LICENSE</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <releaseNotes>## 1.5.0 (2018-09-20)
+    <releaseNotes>## 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 &amp; 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)
     </releaseNotes>
     <dependencies>
       <dependency id="keepass" version="[2.40, 3.0)" />

diff --git a/version_manifest.txt b/version_manifest.txt
@@ -1,3 +1,3 @@
 :
-KeeAnywhere:1.5.0.0
+KeeAnywhere:1.5.1.0
 :