From: "Kyle J. McKay" <mackyle@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Mark Lodato <lodatom@gmail.com>
Subject: Re: [PATCH] http.c: fix parsing of http.sslCertPasswordProtected variable
Date: Sat, 13 Jul 2013 12:28:15 -0700 [thread overview]
Message-ID: <35166ba04d1ce901e0fb63a5c522970@f74d39fa044aa309eaea14b9f57fe79> (raw)
In-Reply-To: <20130712190531.GD8482@google.com>
On Jul 12, 2013, at 12:05, Jonathan Nieder wrote:
> 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
--
prev parent reply other threads:[~2013-07-13 19:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-12 18:52 [PATCH] http.c: fix parsing of http.sslCertPasswordProtected variable Junio C Hamano
2013-07-12 19:05 ` Jonathan Nieder
2013-07-12 19:52 ` Junio C Hamano
2013-07-14 0:37 ` Mark Lodato
2013-07-15 4:13 ` Junio C Hamano
2013-07-15 6:37 ` Kyle J. McKay
2013-07-15 15:54 ` Junio C Hamano
2013-07-13 19:28 ` Kyle J. McKay [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=35166ba04d1ce901e0fb63a5c522970@f74d39fa044aa309eaea14b9f57fe79 \
--to=mackyle@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=lodatom@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).