On 5/24/2022 4:18 AM, Ævar Arnfjörð Bjarmason wrote: > > On Mon, May 23 2022, Derrick Stolee via GitGitGadget wrote: > >> +fetch.credentialsInUrl:: >> + A URL can contain plaintext credentials in the form >> + `protocol://<user>:<password>@domain/path`. Using such URLs is not >> + recommended as it exposes the password in multiple ways. The >> + `fetch.credentialsInUrl` option provides instruction for how Git >> + should react to seeing such a URL, with these values: > > Re the previous discussion about this (in the v1 patch / > https://lore.kernel.org/git/pull.945.git.1619807844627.gitgitgadget@xxxxxxxxx/): > In what ways? > > That's rhetorical, the point being: Let's adjust this documentation to > discuss exactly why this is thought to be bad, what we're mitigating for > the user etc., are there situations where running git like this is > perfectly fine & not thought to be an issue? E.g. no password manager > and you trust your FS permission? Let's cover those cases too. This documentation is not the proper place to tell the user "do this and you can trust your plaintext creds in the filesystem" because that is asking for problems. I'd rather leave a vague warning and let users go against the recommended behavior only after they have done sufficient work to be confident in taking on that risk. >> ++ >> +* `ignore` (default): Git will proceed with its activity without warning. >> +* `warn`: Git will write a warning message to `stderr` when parsing a URL >> + with a plaintext credential. >> +* `die`: Git will write a failure message to `stderr` when parsing a URL >> + with a plaintext credential. > > You're implementing this with strcasecmp, so we also support DIE, DiE > etc. Let's not do that and use strcmp() instead. Sure. >> +static void detected_credentials_in_url(const char *url, size_t scheme_len) >> +{ > > Just generally: This is only Did you intend to say more here? >> + char *value = NULL; > > This init to NULL should be removedd, as we.... > >> + const char *at_ptr; >> + const char *colon_ptr; >> + struct strbuf anonymized = STRBUF_INIT; > > nit: Just call this "sb"? The's at least one line below over 79 > characters that's within the bounds with a shorter variable name, and in > this case it's obvious what we're doing here... I will not change this name to be less descriptive. >> + >> + /* "ignore" is the default behavior. */ >> + if (git_config_get_string("fetch.credentialsinurl", &value) || > > ...initialize it here, and if we didn't the compiler would have a chance > to spot that if we were getting it wrong. We do not necessarily initialize it here. The compiler doesn't notice it and the free(value) below segfaults. >> + !strcasecmp("ignore", value)) >> + goto cleanup; >> + >> + at_ptr = strchr(url, '@'); >> + colon_ptr = strchr(url + scheme_len + 3, ':'); >> + >> + if (!colon_ptr) >> + BUG("failed to find colon in url '%s' with scheme_len %"PRIuMAX, >> + url, (uintmax_t) scheme_len); >> + >> + /* Include everything including the colon. */ >> + colon_ptr++; >> + strbuf_add(&anonymized, url, colon_ptr - url); >> + >> + while (colon_ptr < at_ptr) { >> + strbuf_addch(&anonymized, '*'); >> + colon_ptr++; >> + } > > Could we share code with 88e9b1e3fcb (fetch-pack: redact packfile urls > in traces, 2021-11-10), or for consistency note this as <redacted> > instead of stripping it out, as we do for that related URL-part > redaction? I'm happy to replace the asterisks with <redacted>. Otherwise, I don't see anything we can do to share across these methods. Specifically, the test in that commit seems to indicate that the redacted portion is only the packfile name (the $HTTPD_URL is not filtered). >> + strbuf_addstr(&anonymized, at_ptr); > > Maybe not worth it, but I wondered if we couldn't just use curl for > this, turns out it has an API for it: > https://curl.se/libcurl/c/libcurl-url.html > > But it's too new for us to rely on unconditionally, but we could add > that to git-curl-compat.h and ifdef it, then we'll eventually drop this > custom code for ryling on the well-tested library. > > I think doing that would be worth it, to show future authors that curl > can do this, so maybe we can start relying on that eventually... Since we can't rely on it, I'll leave that to another (you, perhaps?) to do that ifdef work. I don't think it's worth it right now. >> + if (!strcasecmp("warn", value)) >> + warning(_("URL '%s' uses plaintext credentials"), anonymized.buf); >> + if (!strcasecmp("die", value)) >> + die(_("URL '%s' uses plaintext credentials"), anonymized.buf); >> + >> +cleanup: >> + free(value); > > I think you can also just use git_config_get_string_tmp() here and avoid > the alloc/free. That's safe as long as you're not calling other config > API in-between, which you're not. OK. And that also avoids the need for initialization you mentioned. Thanks, -Stolee
