undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/reflog-anonymize-for-clone-and-fetch'

Browse Source 
The reflog entries for "git clone" and "git fetch" did not
anonymize the URL they operated on.

* js/reflog-anonymize-for-clone-and-fetch:
  clone/fetch: anonymize URLs in the reflog
This commit is contained in:
Junio C Hamano 2020-06-17 21:54:01 -07:00
commit 524caf8035
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/clone.c
View File

@ -945,7 +945,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
{ {
int is_bundle = 0, is_local; int is_bundle = 0, is_local;
const char *repo_name, *repo, *work_tree, *git_dir; const char *repo_name, *repo, *work_tree, *git_dir;
char *path, *dir; char *path, *dir, *display_repo = NULL;
int dest_exists; int dest_exists;
const struct ref *refs, *remote_head; const struct ref *refs, *remote_head;
const struct ref *remote_head_points_at; const struct ref *remote_head_points_at;
@ -1000,10 +1000,11 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
path = get_repo_path(repo_name, &is_bundle); path = get_repo_path(repo_name, &is_bundle);
if (path) if (path)
repo = absolute_pathdup(repo_name); repo = absolute_pathdup(repo_name);
else if (!strchr(repo_name, ':')) else if (strchr(repo_name, ':')) {
die(_("repository '%s' does not exist"), repo_name);
else
repo = repo_name; repo = repo_name;
display_repo = transport_anonymize_url(repo);
} else
die(_("repository '%s' does not exist"), repo_name);
/* no need to be strict, transport_set_option() will validate it again */ /* no need to be strict, transport_set_option() will validate it again */
if (option_depth && atoi(option_depth) < 1) if (option_depth && atoi(option_depth) < 1)
@ -1020,7 +1021,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
die(_("destination path '%s' already exists and is not " die(_("destination path '%s' already exists and is not "
"an empty directory."), dir); "an empty directory."), dir);
strbuf_addf(&reflog_msg, "clone: from %s", repo); strbuf_addf(&reflog_msg, "clone: from %s",
display_repo ? display_repo : repo);
free(display_repo);
if (option_bare) if (option_bare)
work_tree = NULL; work_tree = NULL;

9
builtin/fetch.c
View File

@ -1758,8 +1758,13 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
/* Record the command line for the reflog */ /* Record the command line for the reflog */
strbuf_addstr(&default_rla, "fetch"); strbuf_addstr(&default_rla, "fetch");
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++) {
strbuf_addf(&default_rla, " %s", argv[i]); /* This handles non-URLs gracefully */
char *anon = transport_anonymize_url(argv[i]);
strbuf_addf(&default_rla, " %s", anon);
free(anon);
}
fetch_config_from_gitmodules(&submodule_fetch_jobs_config, fetch_config_from_gitmodules(&submodule_fetch_jobs_config,
&recurse_submodules); &recurse_submodules);

15
t/t5541-http-push-smart.sh
View File

@ -464,6 +464,21 @@ test_expect_success 'push status output scrubs password' '
grep "^To $HTTPD_URL/smart/test_repo.git" status grep "^To $HTTPD_URL/smart/test_repo.git" status
' '
test_expect_success 'clone/fetch scrubs password from reflogs' '
cd "$ROOT_PATH" &&
git clone "$HTTPD_URL_USER_PASS/smart/test_repo.git" \
reflog-test &&
cd reflog-test &&
test_commit prepare-for-force-fetch &&
git switch -c away &&
git fetch "$HTTPD_URL_USER_PASS/smart/test_repo.git" \
+master:master &&
# should have been scrubbed down to vanilla URL
git log -g master >reflog &&
grep "$HTTPD_URL" reflog &&
! grep "$HTTPD_URL_USER_PASS" reflog
'
test_expect_success 'colorize errors/hints' ' test_expect_success 'colorize errors/hints' '
cd "$ROOT_PATH"/test_repo_clone && cd "$ROOT_PATH"/test_repo_clone &&
test_must_fail git -c color.transport=always -c color.advice=always \ test_must_fail git -c color.transport=always -c color.advice=always \