git/http.c, branch v2.27.0Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://www.git.shady.money/git/atom?h=v2.27.02020-04-20T05:05:56ZSync with 2.26.22020-04-20T05:05:56ZJunio C Hamanogitster@pobox.com2020-04-20T05:05:56Zurn:sha1:048abe1751e6727bfbacf7b80466d78e04631f94Git 2.26.22020-04-19T23:32:24ZJonathan Niederjrnieder@gmail.com2020-04-19T23:32:24Zurn:sha1:af6b65d45ef179ed52087e80cb089f6b2349f4ec
This merges up the security fix from v2.17.5.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Git 2.25.42020-04-19T23:31:07ZJonathan Niederjrnieder@gmail.com2020-04-19T23:31:07Zurn:sha1:7397ca33730626f682845f8691b39c305535611e
This merges up the security fix from v2.17.5.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Git 2.24.32020-04-19T23:30:34ZJonathan Niederjrnieder@gmail.com2020-04-19T23:30:34Zurn:sha1:b86a4be245d0ba077c97c6ab6b1cdbeb9dcc1342
This merges up the security fix from v2.17.5.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Git 2.22.42020-04-19T23:30:19ZJonathan Niederjrnieder@gmail.com2020-04-19T23:30:19Zurn:sha1:c9808fa014aa88cc306705d308d1d9065d567ddc
This merges up the security fix from v2.17.5.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Git 2.21.32020-04-19T23:30:08ZJonathan Niederjrnieder@gmail.com2020-04-19T23:30:08Zurn:sha1:9206d27eb5e76bbb3a4e59e3c53f92eaa0caa97b
This merges up the security fix from v2.17.5.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Git 2.20.42020-04-19T23:28:57ZJonathan Niederjrnieder@gmail.com2020-04-19T23:28:57Zurn:sha1:041bc65923e13313ca1b77681c3b2950b5e0a163
This merges up the security fix from v2.17.5.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Git 2.19.52020-04-19T23:26:41ZJonathan Niederjrnieder@gmail.com2020-04-19T23:26:41Zurn:sha1:76b54ee9b9944ee70422ac24884f78769cf264f1
This merges up the security fix from v2.17.5.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Git 2.18.42020-04-19T23:24:14ZJonathan Niederjrnieder@gmail.com2020-04-19T23:24:14Zurn:sha1:ba6f0905fdb9e65c1ac5fbc79c9a4ef0b59b3e68
This merges up the security fix from v2.17.5.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
credential: parse URL without host as empty host, not unset2020-04-19T23:10:57ZJeff Kingpeff@peff.net2020-04-19T03:48:05Zurn:sha1:24036686c4af84c9e84e486ef3debab6e6d8e6b5
We may feed a URL like "cert:///path/to/cert.pem" into the credential
machinery to get the key for a client-side certificate. That
credential has no hostname field, which is about to be disallowed (to
avoid confusion with protocols where a helper _would_ expect a
hostname).
This means as of the next patch, credential helpers won't work for
unlocking certs. Let's fix that by doing two things:
- when we parse a url with an empty host, set the host field to the
empty string (asking only to match stored entries with an empty
host) rather than NULL (asking to match _any_ host).
- when we build a cert:// credential by hand, similarly assign an
empty string
It's the latter that is more likely to impact real users in practice,
since it's what's used for http connections. But we don't have good
infrastructure to test it.
The url-parsing version will help anybody using git-credential in a
script, and is easy to test.
Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>