pinokiod 7.3.3 → 7.3.4

package/kernel/git.js

@@ -1169,6 +1169,32 @@ class Git {
         }
       }
     }
+    const clone = (value) => {
+      if (typeof value !== "object" || value === null) return value
+      return JSON.parse(JSON.stringify(value))
+    }
+    const sameConfigValue = (a, b) => JSON.stringify(a) === JSON.stringify(b)
+    const isCredentialSection = (section) => section === "credential" || section.startsWith('credential "')
+    const resetCredentialDefaults = () => {
+      const templateCredentialSections = Object.fromEntries(
+        Object.entries(templateConfig).filter(([section]) => isCredentialSection(section))
+      )
+
+      for (const section of Object.keys(config)) {
+        if (!isCredentialSection(section)) continue
+        if (!Object.prototype.hasOwnProperty.call(templateCredentialSections, section)) {
+          delete config[section]
+          dirty = true
+        }
+      }
+
+      for (const [section, tplSection] of Object.entries(templateCredentialSections)) {
+        if (!sameConfigValue(config[section], tplSection)) {
+          config[section] = clone(tplSection)
+          dirty = true
+        }
+      }
+    }
 
     for (const [section, tplSection] of Object.entries(templateConfig)) {
       if (typeof tplSection !== "object" || tplSection === null) continue
@@ -1196,6 +1222,8 @@ class Git {
       dirty = true
     }
 
+    resetCredentialDefaults()
+
     const githubCredentialSection = config['credential "https://github'] && config['credential "https://github']['com"']
     if (githubCredentialSection && typeof githubCredentialSection === "object") {
       if (!githubCredentialSection.provider) {
@@ -1203,7 +1231,7 @@ class Git {
         dirty = true
       }
       const helper = typeof githubCredentialSection.helper === "string" ? githubCredentialSection.helper : ""
-      if (!helper || /(^|\s|!)gh\s+auth\s+git-credential/i.test(helper)) {
+      if (!helper) {
         githubCredentialSection.helper = "manager"
         dirty = true
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "7.3.3",
+  "version": "7.3.4",
   "description": "",
   "main": "index.js",
   "scripts": {

package/test/git-defaults.test.js

@@ -1,11 +1,14 @@
 const assert = require('node:assert/strict')
+const { execFile } = require('node:child_process')
 const fs = require('node:fs/promises')
 const os = require('node:os')
 const path = require('node:path')
 const test = require('node:test')
+const { promisify } = require('node:util')
 const ini = require('ini')
 
 const KernelGit = require('../kernel/git')
+const execFileAsync = promisify(execFile)
 
 async function withTempHome(fn) {
   const homedir = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-git-defaults-'))
@@ -67,6 +70,56 @@ test('Git defaults migrate the legacy gh GitHub helper to Git Credential Manager
   })
 })
 
+test('Git defaults reset credential sections to built-in defaults before Git reads config', async () => {
+  await withTempHome(async (homedir) => {
+    const staleHelpers = [
+      '!custom-helper auth git-credential',
+      '!gh auth git-credential',
+      '!gh.exe auth git-credential',
+      `!'${path.win32.join('Z:\\', 'Any Folder', 'bin', 'gh.exe')}' auth git-credential`,
+    ]
+
+    for (const [index, helper] of staleHelpers.entries()) {
+      const caseHome = path.join(homedir, `case-${index}`)
+      await fs.mkdir(caseHome)
+      const gitconfigPath = path.join(caseHome, 'gitconfig')
+      await fs.writeFile(gitconfigPath, [
+        '[credential "https://github.com"]',
+        `  helper = ${helper}`,
+        '  provider = github',
+        '[credential "https://gist.github.com"]',
+        `  helper = ${helper}`,
+        '[credential "https://enterprise.example"]',
+        `  helper = ${helper}`,
+        '[credential]',
+        `  helper = ${helper}`,
+        '  gitHubAuthModes = device',
+        '  namespace = stale',
+        '[user]',
+        '  name = custom',
+        '  email = custom@example.test',
+        '',
+      ].join('\n'))
+      const git = new KernelGit(createKernel(caseHome))
+
+      await git.ensureDefaults()
+
+      const content = await fs.readFile(gitconfigPath, 'utf8')
+      assert.doesNotMatch(content, /git-credential/i)
+      const { stdout } = await execFileAsync('git', ['config', '--file', gitconfigPath, '--list'])
+      assert.match(stdout, /credential\.helper=manager/)
+      assert.match(stdout, /credential\.githubauthmodes=oauth/)
+      assert.match(stdout, /credential\.namespace=pinokio/)
+      assert.match(stdout, /credential\.https:\/\/github\.com\.helper=manager/)
+      assert.doesNotMatch(stdout, /credential\.https:\/\/gist\.github\.com/)
+      assert.doesNotMatch(stdout, /credential\.https:\/\/enterprise\.example/)
+      const config = ini.parse(content)
+      assert.equal(config.user.name, 'custom')
+      assert.equal(config.user.email, 'custom@example.test')
+    }
+  })
+})
+
 test('Git isomorphic auth callback returns GCM credentials for GitHub URLs', async () => {
   const git = new KernelGit(createKernel('/tmp/pinokio'))
   let requestedUrl = ''