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

@@ -85,7 +85,7 @@ public override void Execute()
             this.ValidatePathParameter(this.EnlistmentRootPathParameter);
             this.ValidatePathParameter(this.LocalCacheRoot);
 
-            string fullEnlistmentRootPathParameter; 
+            string fullEnlistmentRootPathParameter;
             string normalizedEnlistmentRootPath = this.GetCloneRoot(out fullEnlistmentRootPathParameter);
 
             if (!string.IsNullOrWhiteSpace(this.LocalCacheRoot))
@@ -144,8 +144,8 @@ public override void Execute()
                                 { "NamedPipeName", enlistment.NamedPipeName },
                                 { nameof(this.EnlistmentRootPathParameter), this.EnlistmentRootPathParameter },
                                 { nameof(fullEnlistmentRootPathParameter), fullEnlistmentRootPathParameter },
-                            });
-                        
+                            });
+
                         CacheServerResolver cacheServerResolver = new CacheServerResolver(tracer, enlistment);
                         cacheServer = cacheServerResolver.ParseUrlOrFriendlyName(this.CacheServerUrl);
 
@@ -177,8 +177,8 @@ public override void Execute()
 
                         cacheServer = this.ResolveCacheServer(tracer, cacheServer, cacheServerResolver, serverGVFSConfig);
 
-                        this.ValidateClientVersions(tracer, enlistment, serverGVFSConfig, showWarnings: true);
-                       
+                        this.ValidateClientVersions(tracer, enlistment, serverGVFSConfig, showWarnings: true);
+
                         this.ShowStatusWhileRunning(
                             () =>
                             {
@@ -276,7 +276,7 @@ private static bool IsForceCheckoutErrorCloneFailure(string checkoutError)
 
         private Result TryCreateEnlistment(
             string fullEnlistmentRootPathParameter,
-            string normalizedEnlistementRootPath, 
+            string normalizedEnlistementRootPath,
             out GVFSEnlistment enlistment)
         {
             enlistment = null;
@@ -297,25 +297,35 @@ private Result TryCreateEnlistment(
             if (string.IsNullOrWhiteSpace(gitBinPath))
             {
                 return new Result(GVFSConstants.GitIsNotInstalledError);
-            }
-            
+            }
+
             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);
-        }
-        
+        }
+
         private Result TryClone(
-            JsonTracer tracer, 
-            GVFSEnlistment enlistment, 
-            CacheServerInfo cacheServer, 
-            RetryConfig retryConfig, 
+            JsonTracer tracer,
+            GVFSEnlistment enlistment,
+            CacheServerInfo cacheServer,
+            RetryConfig retryConfig,
             ServerGVFSConfig serverGVFSConfig,
             string resolvedLocalCacheRoot)
         {
@@ -325,8 +335,8 @@ private Result TryClone(
                 if (!pipeResult.Success)
                 {
                     return pipeResult;
-                }
-                                
+                }
+
                 using (GitObjectsHttpRequestor objectRequestor = new GitObjectsHttpRequestor(tracer, enlistment, cacheServer, retryConfig))
                 {
                     GitRefs refs = objectRequestor.QueryInfoRefs(this.SingleBranch ? this.Branch : null);
@@ -445,7 +455,7 @@ private void CheckNotInsideExistingRepo(string normalizedEnlistmentRootPath)
             string errorMessage;
             string existingEnlistmentRoot;
             if (GVFSPlatform.Instance.TryGetGVFSEnlistmentRoot(normalizedEnlistmentRootPath, out existingEnlistmentRoot, out errorMessage))
-            { 
+            {
                 this.ReportErrorAndExit("Error: You can't clone inside an existing GVFS repo ({0})", existingEnlistmentRoot);
             }
         }
@@ -504,8 +514,8 @@ private Result CreateClone(
             if (!this.TryCreateAlternatesFile(fileSystem, enlistment, out errorMessage))
             {
                 return new Result("Error configuring alternate: " + errorMessage);
-            }
-            
+            }
+
             GitRepo gitRepo = new GitRepo(tracer, enlistment, fileSystem);
             GVFSContext context = new GVFSContext(tracer, fileSystem, gitRepo, enlistment);
             GVFSGitObjects gitObjects = new GVFSGitObjects(context, objectRequestor);