Merge pull request #318 from mjcheetham/downlevel-git-parse

Drop the git config --show-scope option usage
git-ecosystem · Mar 24, 2021 · 0b5d180 · 0b5d180
2 parents d1cb371 + 5dda6a6
commit 0b5d180
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 61 deletions.
diff --git a/src/shared/Microsoft.AzureRepos/AzureReposBindingManager.cs b/src/shared/Microsoft.AzureRepos/AzureReposBindingManager.cs
@@ -174,31 +174,33 @@ public IEnumerable<AzureReposBinding> GetBindings(string orgName = null)
 
             string orgPrefix = $"{AzureDevOpsConstants.UrnOrgPrefix}/";
 
-            config.Enumerate(
-                Constants.GitConfiguration.Credential.SectionName,
-                Constants.GitConfiguration.Credential.UserName,
-                entry =>
+            bool ExtractUserBinding(GitConfigurationEntry entry, IDictionary<string, string> dict)
+            {
+                if (GitConfigurationKeyComparer.TrySplit(entry.Key, out _, out string scope, out _) &&
+                    Uri.TryCreate(scope, UriKind.Absolute, out Uri uri) &&
+                    uri.Scheme == AzureDevOpsConstants.UrnScheme && uri.AbsolutePath.StartsWith(orgPrefix))
                 {
-                    if (GitConfigurationKeyComparer.TrySplit(entry.Key, out _, out string scope, out _) &&
-                        Uri.TryCreate(scope, UriKind.Absolute, out Uri uri) &&
-                        uri.Scheme == AzureDevOpsConstants.UrnScheme && uri.AbsolutePath.StartsWith(orgPrefix))
+                    string entryOrgName = uri.AbsolutePath.Substring(orgPrefix.Length);
+                    if (orgName is null || StringComparer.OrdinalIgnoreCase.Equals(entryOrgName, orgName))
                     {
-                        string entryOrgName = uri.AbsolutePath.Substring(orgPrefix.Length);
-                        if (orgName is null || StringComparer.OrdinalIgnoreCase.Equals(entryOrgName, orgName))
-                        {
-                            if (entry.Level == GitConfigurationLevel.Local)
-                            {
-                                localUsers[entryOrgName] = entry.Value;
-                            }
-                            else
-                            {
-                                globalUsers[entryOrgName] = entry.Value;
-                            }
-                        }
+                        dict[entryOrgName] = entry.Value;
                     }
+                }
+
+                return true;
+            }
 
-                    return true;
-                });
+            config.Enumerate(
+                GitConfigurationLevel.Local,
+                Constants.GitConfiguration.Credential.SectionName,
+                Constants.GitConfiguration.Credential.UserName,
+                entry => ExtractUserBinding(entry, localUsers));
+
+            config.Enumerate(
+                GitConfigurationLevel.Global,
+                Constants.GitConfiguration.Credential.SectionName,
+                Constants.GitConfiguration.Credential.UserName,
+                entry => ExtractUserBinding(entry, globalUsers));
 
             foreach (string org in globalUsers.Keys.Union(localUsers.Keys))
             {

diff --git a/src/shared/Microsoft.Git.CredentialManager/GitConfiguration.cs b/src/shared/Microsoft.Git.CredentialManager/GitConfiguration.cs
@@ -117,7 +117,7 @@ internal GitProcessConfiguration(ITrace trace, GitProcess git)
         public void Enumerate(GitConfigurationLevel level, GitConfigurationEnumerationCallback cb)
         {
             string levelArg = GetLevelFilterArg(level);
-            using (Process git = _git.CreateProcess($"config --null {levelArg} --list --show-scope"))
+            using (Process git = _git.CreateProcess($"config --null {levelArg} --list"))
             {
                 git.Start();
                 // To avoid deadlocks, always read the output stream first and then wait
@@ -134,31 +134,14 @@ public void Enumerate(GitConfigurationLevel level, GitConfigurationEnumerationCa
                         throw GitProcess.CreateGitException(git, "Failed to enumerate all Git configuration entries");
                 }
 
-                var scope = new StringBuilder();
                 var name  = new StringBuilder();
                 var value = new StringBuilder();
                 int i = 0;
                 while (i < data.Length)
                 {
-                    scope.Clear();
                     name.Clear();
                     value.Clear();
 
-                    // Read config scope (null terminated)
-                    while (i < data.Length && data[i] != '\0')
-                    {
-                        scope.Append(data[i++]);
-                    }
-
-                    if (i >= data.Length)
-                    {
-                        _trace.WriteLine("Invalid Git configuration output. Expected null terminator (\\0) after scope.");
-                        break;
-                    }
-
-                    // Skip the null terminator
-                    i++;
-
                     // Read key name (LF terminated)
                     while (i < data.Length && data[i] != '\n')
                     {
@@ -189,24 +172,7 @@ public void Enumerate(GitConfigurationLevel level, GitConfigurationEnumerationCa
                     // Skip the null terminator
                     i++;
 
-                    GitConfigurationLevel entryLevel;
-                    switch (scope.ToString())
-                    {
-                        case "system":
-                            entryLevel = GitConfigurationLevel.System;
-                            break;
-                        case "global":
-                            entryLevel = GitConfigurationLevel.Global;
-                            break;
-                        case "local":
-                            entryLevel = GitConfigurationLevel.Local;
-                            break;
-                        default:
-                            entryLevel = GitConfigurationLevel.Unknown;
-                            break;
-                    }
-
-                    var entry = new GitConfigurationEntry(entryLevel, name.ToString(), value.ToString());
+                    var entry = new GitConfigurationEntry(name.ToString(), value.ToString());
 
                     if (!cb(entry))
                     {

diff --git a/src/shared/Microsoft.Git.CredentialManager/GitConfigurationEntry.cs b/src/shared/Microsoft.Git.CredentialManager/GitConfigurationEntry.cs
@@ -4,14 +4,12 @@ namespace Microsoft.Git.CredentialManager
 {
     public class GitConfigurationEntry
     {
-        public GitConfigurationEntry(GitConfigurationLevel level, string key, string value)
+        public GitConfigurationEntry(string key, string value)
         {
-            Level = level;
             Key = key;
             Value = value;
         }
 
-        public GitConfigurationLevel Level { get; }
         public string Key { get; }
         public string Value { get; }
     }

diff --git a/src/shared/TestInfrastructure/Objects/TestGitConfiguration.cs b/src/shared/TestInfrastructure/Objects/TestGitConfiguration.cs
@@ -26,7 +26,7 @@ public void Enumerate(GitConfigurationLevel level, GitConfigurationEnumerationCa
                 {
                     foreach (var value in kvp.Value)
                     {
-                        var entry = new GitConfigurationEntry(dictLevel, kvp.Key, value);
+                        var entry = new GitConfigurationEntry(kvp.Key, value);
                         if (!cb(entry))
                         {
                             break;