Re: [PATCH 1/1] curl: anonymize URLs in error messages and warnings

From: Jeff King <peff@peff.net>
Date: Mar 5, 2019, 05:11 UTC
Message-ID: <20190305051126.GL19800@sigill.intra.peff.net>
In-Reply-To: <ab6f4032cb8cbbe77dbfad4660c30acd7ba688bb.1551713624.git.gitgitgadget@gmail.com>

On Mon, Mar 04, 2019 at 07:33:46AM -0800, Johannes Schindelin via GitGitGadget wrote:

Show 7 quoted lines

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> 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.

Show 6 quoted lines

> @@ -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.

Show 7 quoted lines

> @@ -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).

Show 7 quoted lines

> -	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