Re: [PATCH 1/3] transport_anonymize_url(): support retaining username
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- May 20, 2019, 16:43 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1905201836380.46@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20190519051031.GA19434@sigill.intra.peff.net>
Whoops. Meant to comment on this:
On Sun, 19 May 2019, Jeff King wrote:
Show 14 quoted lines
> diff --git a/transport.c b/transport.c > index f1fcd2c4b0..ba61e57295 100644 > --- a/transport.c > +++ b/transport.c > @@ -1335,11 +1335,7 @@ int transport_disconnect(struct transport *transport) > return ret; > } > > -/* > - * Strip username (and password) from a URL and return > - * it in a newly allocated string. > - */ > -char *transport_anonymize_url(const char *url) > +char *transport_strip_url(const char *url, int strip_user)
It might make more sense to skip the "transport_" prefix here, and maybe use a slightly more descriptive name? My current favorite would be `strip_credentials_from_url(const char *url, int keep_user)`.
Show 25 quoted lines
> {
> char *scheme_prefix, *anon_part;
> size_t anon_len, prefix_len = 0;
> @@ -1348,7 +1344,10 @@ char *transport_anonymize_url(const char *url)
> if (url_is_local_not_ssh(url) || !anon_part)
> goto literal_copy;
>
> - anon_len = strlen(++anon_part);
> + anon_len = strlen(anon_part);
> + if (strip_user)
> + anon_part++;
> +
> scheme_prefix = strstr(url, "://");
> if (!scheme_prefix) {
> if (!strchr(anon_part, ':'))
> @@ -1373,7 +1372,15 @@ char *transport_anonymize_url(const char *url)
> cp = strchr(scheme_prefix + 3, '/');
> if (cp && cp < anon_part)
> goto literal_copy;
> - prefix_len = scheme_prefix - url + 3;
> +
> + if (strip_user)
> + prefix_len = scheme_prefix - url + 3;
> + else {
> + cp = strchr(scheme_prefix + 3, ':');How about `scheme_prefix += 3;` (actually quite a bit earlier than here), followed by `memchr(scheme_prefix, ':', anon_part - scheme_prefix)`?
Ah, I see you just copied that part from above...
Thanks, Dscho
Show 36 quoted lines
> + if (cp && cp > anon_part)
> + goto literal_copy; /* username only */
> + prefix_len = cp - url;
> + }
> }
> return xstrfmt("%.*s%.*s", (int)prefix_len, url,
> (int)anon_len, anon_part);
> diff --git a/transport.h b/transport.h
> index 06e06d3d89..6d8c99ac91 100644
> --- a/transport.h
> +++ b/transport.h
> @@ -243,10 +243,19 @@ const struct ref *transport_get_remote_refs(struct transport *transport,
> int transport_fetch_refs(struct transport *transport, struct ref *refs);
> void transport_unlock_pack(struct transport *transport);
> int transport_disconnect(struct transport *transport);
> -char *transport_anonymize_url(const char *url);
> void transport_take_over(struct transport *transport,
> struct child_process *child);
>
> +/*
> + * Strip password and optionally username from a URL and return
> + * it in a newly allocated string (even if nothing was stripped).
> + */
> +char *transport_strip_url(const char *url, int strip_username);
> +static inline char *transport_anonymize_url(const char *url)
> +{
> + return transport_strip_url(url, 1);
> +}
> +
> int transport_connect(struct transport *transport, const char *name,
> const char *exec, int fd[2]);
>
> --
> 2.22.0.rc0.583.g23d90da2b3
>
>