diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-01 17:52:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-01 17:52:06 -0600 |
| commit | 7610638ec829ffd6da6d5f74b5b14dbb32b74924 (patch) | |
| tree | 1d454623bb47a422c2b568df822229e7624fc00e | |
| parent | d621024508d8264ad63df683dfe1327224eb7143 (diff) | |
| parent | 526dea1c3ca11e83efca16aa8e5a4479ff542c5d (diff) | |
| download | libgit2-7610638ec829ffd6da6d5f74b5b14dbb32b74924.tar.gz | |
Merge pull request #4453 from libgit2/ethomson/spnego
winhttp: properly support ntlm and negotiate
| -rw-r--r-- | src/transports/winhttp.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c index 98905ab61..6dad1d38a 100644 --- a/src/transports/winhttp.c +++ b/src/transports/winhttp.c @@ -172,9 +172,15 @@ static int apply_default_credentials(HINTERNET request, int mechanisms) * is "medium" which applies to the intranet and sounds like it would correspond * to Internet Explorer security zones, but in fact does not. */ DWORD data = WINHTTP_AUTOLOGON_SECURITY_LEVEL_LOW; + DWORD native_scheme = 0; - if ((mechanisms & GIT_WINHTTP_AUTH_NTLM) == 0 && - (mechanisms & GIT_WINHTTP_AUTH_NEGOTIATE) == 0) { + if ((mechanisms & GIT_WINHTTP_AUTH_NTLM) != 0) + native_scheme |= WINHTTP_AUTH_SCHEME_NTLM; + + if ((mechanisms & GIT_WINHTTP_AUTH_NEGOTIATE) != 0) + native_scheme |= WINHTTP_AUTH_SCHEME_NEGOTIATE; + + if (!native_scheme) { giterr_set(GITERR_NET, "invalid authentication scheme"); return -1; } @@ -182,6 +188,9 @@ static int apply_default_credentials(HINTERNET request, int mechanisms) if (!WinHttpSetOption(request, WINHTTP_OPTION_AUTOLOGON_POLICY, &data, sizeof(DWORD))) return -1; + if (!WinHttpSetCredentials(request, WINHTTP_AUTH_TARGET_SERVER, native_scheme, NULL, NULL, NULL)) + return -1; + return 0; } @@ -606,12 +615,12 @@ static int parse_unauthorized_response( if (WINHTTP_AUTH_SCHEME_NTLM & supported) { *allowed_types |= GIT_CREDTYPE_USERPASS_PLAINTEXT; *allowed_types |= GIT_CREDTYPE_DEFAULT; - *allowed_mechanisms = GIT_WINHTTP_AUTH_NEGOTIATE; + *allowed_mechanisms |= GIT_WINHTTP_AUTH_NTLM; } if (WINHTTP_AUTH_SCHEME_NEGOTIATE & supported) { *allowed_types |= GIT_CREDTYPE_DEFAULT; - *allowed_mechanisms = GIT_WINHTTP_AUTH_NEGOTIATE; + *allowed_mechanisms |= GIT_WINHTTP_AUTH_NEGOTIATE; } if (WINHTTP_AUTH_SCHEME_BASIC & supported) { |