Throwing InvalidRepoExcpetion, when ssl-related bool git config keys have non-bool values. Handling InvalidRepoException in CloneVerb.

Author: Tomas Urbonaitis

GVFS/GVFS.Common/Git/GitSsl.cs

@@ -34,15 +34,9 @@ public GitSsl(IDictionary<string, GitConfigSetting> configSettings) : this()
                     this.certificatePathOrSubjectCommonName = sslCerts.Values.Last();
                 }
 
-                if (configSettings.TryGetValue(GitConfigSetting.HttpSslCertPasswordProtected, out GitConfigSetting isSslCertPasswordProtected))
-                {
-                    this.isCertificatePasswordProtected = isSslCertPasswordProtected.Values.Select(bool.Parse).Last();
-                }
+                this.isCertificatePasswordProtected = SetBoolSettingOrThrow(configSettings, GitConfigSetting.HttpSslCertPasswordProtected, this.isCertificatePasswordProtected);
 
-                if (configSettings.TryGetValue(GitConfigSetting.HttpSslVerify, out GitConfigSetting sslVerify))
-                {
-                    this.ShouldVerify = sslVerify.Values.Select(bool.Parse).Last();
-                }
+                this.ShouldVerify = SetBoolSettingOrThrow(configSettings, GitConfigSetting.HttpSslVerify, this.ShouldVerify);
             }
         }
 
@@ -76,6 +70,23 @@ public X509Certificate2 GetCertificate(ITracer tracer, GitProcess gitProcess)
             }
 
             return result;
+        }
+
+        private static bool SetBoolSettingOrThrow(IDictionary<string, GitConfigSetting> configSettings, string settingName, bool currentValue)
+        {
+            if (configSettings.TryGetValue(settingName, out GitConfigSetting settingValues))
+            {
+                try
+                {
+                    return settingValues.Values.Select(bool.Parse).Last();
+                }
+                catch (FormatException)
+                {
+                    throw new InvalidRepoException($"{settingName} git setting did not have a bool-parsable value. Found: {string.Join(" ", settingValues.Values)}");
+                }
+            }
+
+            return currentValue;
         }
 
         private static void LogWithAppropriateLevel(ITracer tracer, EventMetadata metadata, IEnumerable<X509Certificate2> certificates, string logMessage)

GVFS/GVFS/CommandLine/CloneVerb.cs

@@ -301,12 +301,22 @@ private Result TryCreateEnlistment(
 
             string hooksPath = this.GetGVFSHooksPathAndCheckVersion(tracer: null, hooksVersion: out _);
 
-            enlistment = new GVFSEnlistment(
-                normalizedEnlistementRootPath,
-                this.RepositoryURL,
-                gitBinPath,
-                hooksPath,
-                authentication: null);
+            try
+            {
+                enlistment = new GVFSEnlistment(
+                    normalizedEnlistementRootPath,
+                    this.RepositoryURL,
+                    gitBinPath,
+                    hooksPath,
+                    authentication: null);
+            }
+            catch (InvalidRepoException e)
+            {
+                this.ReportErrorAndExit(
+                    "Error when creating a new GVFS enlistment at '{0}'. {1}",
+                    normalizedEnlistementRootPath,
+                    e.Message);
+            }
 
             return new Result(true);
         }
@@ -654,10 +664,10 @@ private void CreateGitScript(GVFSEnlistment enlistment)
 @"
 @echo OFF
 echo .
-echo ^[105;30m                                                                                     
-echo      This repo was cloned using GVFS, and the git repo is in the 'src' directory     
-echo      Switching you to the 'src' directory and rerunning your git command             
-echo                                                                                      [0m                                                                            
+echo ^[105;30m
+echo      This repo was cloned using GVFS, and the git repo is in the 'src' directory
+echo      Switching you to the 'src' directory and rerunning your git command
+echo                                                                                      [0m
 
 @echo ON
 cd src