Merge pull request #39 from gandarez/master

Check for SSL flag when downloading

Author: gandarez

HISTORY.rst

@@ -3,6 +3,12 @@ History
 -------
 
 
+4.2.1 (2020-10-11)
+++++++++++++++++++
+
+- Check for SSL flag before download cli from web.
+
+
 4.2.0 (2020-10-10)
 ++++++++++++++++++
 

WakaTime/Dependencies.cs

@@ -20,7 +20,8 @@ private static string PythonDownloadUrl
                 return string.Format("https://www.python.org/ftp/python/{0}/python-{0}-embed-{1}.zip", CurrentPythonVersion, arch);
             }
         }
-        public static string AppDataDirectory {
+        public static string AppDataDirectory
+        {
             get
             {
                 var roamingFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
@@ -37,7 +38,7 @@ public static string AppDataDirectory {
 
         public static void DownloadAndInstallCli()
         {
-            Logger.Debug("Downloading wakatime-cli...");            
+            Logger.Debug("Downloading wakatime-cli...");
             var destinationDir = AppDataDirectory;
             var localZipFile = Path.Combine(destinationDir, "wakatime-cli.zip");
 
@@ -71,8 +72,7 @@ public static void DownloadAndInstallPython()
             var extractToDir = Path.Combine(destinationDir, "python");
 
             // Download python
-            var proxy = WakaTimePackage.GetProxy();
-            var client = new WebClient { Proxy = proxy };
+            var client = GetWebClient();
             client.DownloadFile(url, localZipFile);
             Logger.Debug("Finished downloading python.");
 
@@ -110,6 +110,16 @@ internal static string GetPython()
             return PythonBinaryLocation;
         }
 
+        private static WebClient GetWebClient()
+        {
+            if (!ServicePointManager.SecurityProtocol.HasFlag(SecurityProtocolType.Tls12))
+                ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
+
+            var proxy = WakaTimePackage.GetProxy();
+
+            return new WebClient { Proxy = proxy };
+        }
+
         internal static string GetPythonPathFromMicrosoftRegistry()
         {
             try

WakaTime/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.2.0")]
-[assembly: AssemblyFileVersion("4.2.0")]
+[assembly: AssemblyVersion("4.2.1")]
+[assembly: AssemblyFileVersion("4.2.1")]