Re: [PATCH] http.c: fix parsing of http.sslCertPasswordProtected variable
- From
Kyle J. McKay <mackyle@gmail.com>
- Date
- Jul 13, 2013, 19:28 UTC
- Message-ID
- <35166ba04d1ce901e0fb63a5c522970@f74d39fa044aa309eaea14b9f57fe79>
- In-Reply-To
- <20130712190531.GD8482@google.com>
On Jul 12, 2013, at 12:05, Jonathan Nieder wrote:
Show 24 quoted lines
> Junio C Hamano wrote:
>
>> The existing code triggers only when the configuration variable is
>> set to true. Once the variable is set to true in a more generic
>> configuration file (e.g. ~/.gitconfig), it cannot be overriden to
>> false in the repository specific one (e.g. .git/config).
> [...]
>> --- a/http.c
>> +++ b/http.c
>> @@ -160,8 +160,7 @@ static int http_options(const char *var, const
>> char *value, void *cb)
>> if (!strcmp("http.sslcainfo", var))
>> return git_config_string(&ssl_cainfo, var, value);
>> if (!strcmp("http.sslcertpasswordprotected", var)) {
>> - if (git_config_bool(var, value))
>> - ssl_cert_password_required = 1;
>> + ssl_cert_password_required = git_config_bool(var, value);
>
> Thanks for catching it. The documentation doesn't say anything about
> this "can only enable and cannot disable" behavior and the usual
> pattern is to allow later settings to override earlier ones, so this
> change looks good.
>
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>Looks good to me too.
> FWIW the GIT_SSL_CERT_PASSWORD_PROTECTED envvar has a similar "can > only enable" behavior, but since it's documented, that's not as big > of a problem.
Hmmm. git help config says:
> Can be overridden by the GIT_SSL_CERT_PASSWORD_PROTECTED environment > variable.
in the http.sslCertPasswordProtected section of the help. It doesn't say it can only be overridden to on. Is there some other documentation for that somewhere I'm missing about being can-only-enable?
If not, perhaps a change something like the following could be added to the patch:
diff --git a/http.c b/http.c index 2d086ae..83fc6b4 100644 --- a/http.c +++ b/http.c @@ -404,11 +404,10 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) curl_ftp_no_epsv = 1; if (url) { + int pwdreq = git_env_bool("GIT_SSL_CERT_PASSWORD_PROTECTED", -1); credential_from_url(&http_auth, url); - if (!ssl_cert_password_required && - getenv("GIT_SSL_CERT_PASSWORD_PROTECTED") && - !prefixcmp(url, "https://")) - ssl_cert_password_required = 1; + if (pwdreq != -1 && !prefixcmp(url, "https://")) + ssl_cert_password_required = pwdreq; } #ifndef NO_CURL_EASY_DUPHANDLE