Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
fa2dfcf9
Commit
fa2dfcf9
authored
Feb 01, 2017
by
Chris Bargren
Committed by
Christopher Bargren
Feb 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix digest credentials for proxy in windows
parent
dad3c319
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
7 deletions
+18
-7
src/transports/winhttp.c
+18
-7
No files found.
src/transports/winhttp.c
View file @
fa2dfcf9
...
...
@@ -70,6 +70,7 @@ typedef enum {
GIT_WINHTTP_AUTH_BASIC
=
1
,
GIT_WINHTTP_AUTH_NTLM
=
2
,
GIT_WINHTTP_AUTH_NEGOTIATE
=
4
,
GIT_WINHTTP_AUTH_DIGEST
=
8
,
}
winhttp_authmechanism_t
;
typedef
struct
{
...
...
@@ -131,8 +132,13 @@ done:
return
error
;
}
static
int
apply_userpass_credential_proxy
(
HINTERNET
request
,
git_cred
*
cred
)
static
int
apply_userpass_credential_proxy
(
HINTERNET
request
,
git_cred
*
cred
,
int
mechanisms
)
{
if
(
GIT_WINHTTP_AUTH_DIGEST
&
mechanisms
)
{
return
_apply_userpass_credential
(
request
,
WINHTTP_AUTH_TARGET_PROXY
,
WINHTTP_AUTH_SCHEME_DIGEST
,
cred
);
}
return
_apply_userpass_credential
(
request
,
WINHTTP_AUTH_TARGET_PROXY
,
WINHTTP_AUTH_SCHEME_BASIC
,
cred
);
}
...
...
@@ -451,7 +457,7 @@ static int winhttp_stream_connect(winhttp_stream *s)
if
(
t
->
proxy_cred
)
{
if
(
t
->
proxy_cred
->
credtype
==
GIT_CREDTYPE_USERPASS_PLAINTEXT
)
{
if
((
error
=
apply_userpass_credential_proxy
(
s
->
request
,
t
->
proxy_cred
))
<
0
)
if
((
error
=
apply_userpass_credential_proxy
(
s
->
request
,
t
->
proxy_cred
,
t
->
auth_mechanisms
))
<
0
)
goto
on_error
;
}
}
...
...
@@ -588,11 +594,11 @@ static int parse_unauthorized_response(
*
allowed_types
=
0
;
*
allowed_mechanisms
=
0
;
/* WinHttpQueryHeaders() must be called before WinHttpQueryAuthSchemes().
* We can assume this was already done, since we know we are unauthorized.
/* WinHttpQueryHeaders() must be called before WinHttpQueryAuthSchemes().
* We can assume this was already done, since we know we are unauthorized.
*/
if
(
!
WinHttpQueryAuthSchemes
(
request
,
&
supported
,
&
first
,
&
target
))
{
giterr_set
(
GITERR_OS
,
"failed to parse supported auth schemes"
);
giterr_set
(
GITERR_OS
,
"failed to parse supported auth schemes"
);
return
-
1
;
}
...
...
@@ -612,6 +618,11 @@ static int parse_unauthorized_response(
*
allowed_mechanisms
|=
GIT_WINHTTP_AUTH_BASIC
;
}
if
(
WINHTTP_AUTH_SCHEME_DIGEST
&
supported
)
{
*
allowed_types
|=
GIT_CREDTYPE_USERPASS_PLAINTEXT
;
*
allowed_mechanisms
|=
GIT_WINHTTP_AUTH_DIGEST
;
}
return
0
;
}
...
...
@@ -783,7 +794,7 @@ static int winhttp_connect(
goto
on_error
;
}
/* Establish connection */
t
->
connection
=
WinHttpConnect
(
t
->
session
,
...
...
@@ -863,7 +874,7 @@ static int send_request(winhttp_stream *s, size_t len, int ignore_length)
return
0
;
ignore_flags
=
no_check_cert_flags
;
if
(
!
WinHttpSetOption
(
s
->
request
,
WINHTTP_OPTION_SECURITY_FLAGS
,
&
ignore_flags
,
sizeof
(
ignore_flags
)))
{
giterr_set
(
GITERR_OS
,
"failed to set security options"
);
return
-
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment