mirror of
https://github.com/actions/checkout.git
synced 2025-10-15 06:57:40 +08:00
.
This commit is contained in:
36
dist/index.js
vendored
36
dist/index.js
vendored
@@ -270,11 +270,12 @@ class GitAuthHelper {
|
||||
// Remove possible previous HTTPS instead of SSH
|
||||
yield this.removeGitConfig(this.insteadOfKey, true);
|
||||
if (this.settings.persistCredentials) {
|
||||
// TODO: UPDATE THIS
|
||||
// Configure a placeholder value. This approach avoids the credential being captured
|
||||
// by process creation audit events, which are commonly logged. For more information,
|
||||
// refer to https://docs.microsoft.com/en-us/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing
|
||||
const output = yield this.git.submoduleForeach(
|
||||
// wrap the pipeline in quotes to make sure it's handled properly by submoduleForeach, rather than just the first part of the pipeline
|
||||
// Wrap the pipeline in quotes to make sure it's handled properly by submoduleForeach, rather than just the first part of the pipeline
|
||||
`sh -c "git config --local '${this.tokenConfigKey}' '${this.tokenPlaceholderConfigValue}' && git config --local --show-origin --name-only --get-regexp remote.origin.url"`, this.settings.nestedSubmodules);
|
||||
// Replace the placeholder
|
||||
const configPaths = output.match(/(?<=(^|\n)file:)[^\t]+(?=\tremote\.origin\.url)/g) || [];
|
||||
@@ -380,31 +381,34 @@ class GitAuthHelper {
|
||||
yield this.replaceTokenPlaceholder(credentialsConfigPath);
|
||||
// Add include or includeIf to reference the credentials config
|
||||
if (globalConfig) {
|
||||
// For global config, use unconditional include.
|
||||
// No need to track for cleanup since the temp .gitconfig file (which contains
|
||||
// this include.path entry) gets deleted by removeGlobalConfig().
|
||||
// Global config file is temporary
|
||||
yield this.git.config('include.path', credentialsConfigPath, true);
|
||||
}
|
||||
else {
|
||||
// For local config, use includeIf.gitdir to match the .git directory.
|
||||
// Configure for both host and container paths to support Docker container actions.
|
||||
const gitDir = path.join(this.git.getWorkingDirectory(), '.git');
|
||||
let gitDir = path.join(this.git.getWorkingDirectory(), '.git');
|
||||
console.log(`Git dir: ${gitDir}`);
|
||||
core.info(`Git dir: ${gitDir}`);
|
||||
// Use forward slashes for git config, even on Windows
|
||||
gitDir = gitDir.replace(/\\/g, '/');
|
||||
const hostIncludeKey = `includeIf.gitdir:${gitDir}.path`;
|
||||
yield this.git.config(hostIncludeKey, credentialsConfigPath);
|
||||
this.credentialsIncludeKeys.push(hostIncludeKey);
|
||||
// Configure for container scenario where paths are mapped to fixed locations
|
||||
const githubWorkspace = process.env['GITHUB_WORKSPACE'];
|
||||
if (githubWorkspace) {
|
||||
// Calculate the relative path of the working directory from GITHUB_WORKSPACE
|
||||
const workingDirectory = this.git.getWorkingDirectory();
|
||||
const relativePath = path.relative(githubWorkspace, workingDirectory);
|
||||
// Container paths: GITHUB_WORKSPACE -> /github/workspace, RUNNER_TEMP -> /github/runner_temp
|
||||
const containerGitDir = path.posix.join('/github/workspace', relativePath, '.git');
|
||||
const containerCredentialsPath = path.posix.join('/github/runner_temp', path.basename(credentialsConfigPath));
|
||||
const containerIncludeKey = `includeIf.gitdir:${containerGitDir}.path`;
|
||||
yield this.git.config(containerIncludeKey, containerCredentialsPath);
|
||||
this.credentialsIncludeKeys.push(containerIncludeKey);
|
||||
}
|
||||
assert.ok(githubWorkspace, 'GITHUB_WORKSPACE is not defined');
|
||||
// Calculate the relative path of the working directory from GITHUB_WORKSPACE
|
||||
const workingDirectory = this.git.getWorkingDirectory();
|
||||
let relativePath = path.relative(githubWorkspace, workingDirectory);
|
||||
// Container paths: GITHUB_WORKSPACE -> /github/workspace, RUNNER_TEMP -> /github/runner_temp
|
||||
// Use forward slashes for git config
|
||||
relativePath = relativePath.replace(/\\/g, '/');
|
||||
const containerGitDir = path.posix.join('/github/workspace', relativePath, '.git');
|
||||
const containerCredentialsPath = path.posix.join('/github/runner_temp', path.basename(credentialsConfigPath));
|
||||
const containerIncludeKey = `includeIf.gitdir:${containerGitDir}.path`;
|
||||
yield this.git.config(containerIncludeKey, containerCredentialsPath);
|
||||
this.credentialsIncludeKeys.push(containerIncludeKey);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@@ -320,6 +320,7 @@ class GitAuthHelper {
|
||||
// Configure for both host and container paths to support Docker container actions.
|
||||
let gitDir = path.join(this.git.getWorkingDirectory(), '.git')
|
||||
console.log(`Git dir: ${gitDir}`)
|
||||
core.info(`Git dir: ${gitDir}`)
|
||||
// Use forward slashes for git config, even on Windows
|
||||
gitDir = gitDir.replace(/\\/g, '/')
|
||||
const hostIncludeKey = `includeIf.gitdir:${gitDir}.path`
|
||||
|
Reference in New Issue
Block a user