On Mon, Mar 04, 2019 at 07:33:46AM -0800, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <johannes.schindelin@xxxxxx>
>
> Just like 47abd85ba0 (fetch: Strip usernames from url's before storing
> them, 2009-04-17) and later 882d49ca5c (push: anonymize URL in status
> output, 2016-07-13), this change anonymizes URLs (read: strips them of
> user names and especially passwords) in user-facing error messages and
> warnings.
Yeah, these all look obviously correct. I suspect most people haven't
noticed them because it's pretty easy to use a real password helper
these days instead of shoving it into the URL.
> @@ -251,7 +252,7 @@ static struct ref *parse_info_refs(struct discovery *heads)
> if (data[i] == '\n') {
> if (mid - start != 40)
> die("%sinfo/refs not valid: is this a git repository?",
> - url.buf);
> + transport_anonymize_url(url.buf));
Looking at the code, I think we'd keep the trailing slash during the
anonymization. Good.
> @@ -442,17 +443,23 @@ static struct discovery *discover_refs(const char *service, int for_push)
> break;
> case HTTP_MISSING_TARGET:
> show_http_message(&type, &charset, &buffer);
> - die("repository '%s' not found", url.buf);
> + die("repository '%s' not found",
> + transport_anonymize_url(url.buf));
Sort of orthogonal to your patch, but these could probably stand to be
marked for translation (I'm happy for that to come on top later,
though).
> - if (options.verbosity && !starts_with(refs_url.buf, url.buf))
> - warning(_("redirecting to %s"), url.buf);
> + if (options.verbosity && !starts_with(refs_url.buf, url.buf)) {
> + char *u = transport_anonymize_url(url.buf);
> + warning(_("redirecting to %s"), u);
> + free(u);
> + }
Good attention to detail here.
-Peff
