denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

winhttp: Support basic authentication for URLs having credentials

Browse Source
This commit is contained in:
Martin Willi
2014-06-04 16:34:16 +02:00
parent 2e0816e1df
commit 8a072fc50a
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/winhttp/winhttp_fetcher.c
+23 -3
View File
@@ -177,6 +177,7 @@ static bool read_result(private_winhttp_fetcher_t *this, HINTERNET request,
*/ */
static bool parse_uri(private_winhttp_fetcher_t *this, char *uri, static bool parse_uri(private_winhttp_fetcher_t *this, char *uri,
LPWSTR host, int hostlen, LPWSTR path, int pathlen, LPWSTR host, int hostlen, LPWSTR path, int pathlen,
LPWSTR user, int userlen, LPWSTR pass, int passlen,
DWORD *flags, INTERNET_PORT *port) DWORD *flags, INTERNET_PORT *port)
{ {
WCHAR wuri[512], extra[256]; WCHAR wuri[512], extra[256];
@@ -186,6 +187,10 @@ static bool parse_uri(private_winhttp_fetcher_t *this, char *uri,
.dwHostNameLength = hostlen, .dwHostNameLength = hostlen,
.lpszUrlPath = path, .lpszUrlPath = path,
.dwUrlPathLength = pathlen, .dwUrlPathLength = pathlen,
.lpszUserName = user,
.dwUserNameLength = userlen,
.lpszPassword = pass,
.dwPasswordLength = passlen,
.lpszExtraInfo = extra, .lpszExtraInfo = extra,
.dwExtraInfoLength = countof(extra), .dwExtraInfoLength = countof(extra),
}; };
@@ -215,6 +220,20 @@ static bool parse_uri(private_winhttp_fetcher_t *this, char *uri,
return TRUE; return TRUE;
} }
/**
* Set credentials for basic authentication, if given
*/
static bool set_credentials(private_winhttp_fetcher_t *this,
HINTERNET *request, LPWSTR user, LPWSTR pass)
{
if (!wcslen(user) && !wcslen(pass))
{ /* skip */
return TRUE;
}
return WinHttpSetCredentials(request, WINHTTP_AUTH_TARGET_SERVER,
WINHTTP_AUTH_SCHEME_BASIC, user, pass, NULL);
}
METHOD(fetcher_t, fetch, status_t, METHOD(fetcher_t, fetch, status_t,
private_winhttp_fetcher_t *this, char *uri, void *userdata) private_winhttp_fetcher_t *this, char *uri, void *userdata)
{ {
@@ -222,7 +241,7 @@ METHOD(fetcher_t, fetch, status_t,
status_t status = FAILED; status_t status = FAILED;
DWORD flags = 0; DWORD flags = 0;
HINTERNET connection, request; HINTERNET connection, request;
WCHAR host[256], path[512], *method; WCHAR host[256], path[512], user[256], pass[256], *method;
if (this->request.len) if (this->request.len)
{ {
@@ -239,7 +258,7 @@ METHOD(fetcher_t, fetch, status_t,
} }
if (parse_uri(this, uri, host, countof(host), path, countof(path), if (parse_uri(this, uri, host, countof(host), path, countof(path),
&flags, &port)) user, countof(user), pass, countof(pass), &flags, &port))
{ {
connection = WinHttpConnect(this->session, host, port, 0); connection = WinHttpConnect(this->session, host, port, 0);
if (connection) if (connection)
@@ -249,7 +268,8 @@ METHOD(fetcher_t, fetch, status_t,
WINHTTP_DEFAULT_ACCEPT_TYPES, flags); WINHTTP_DEFAULT_ACCEPT_TYPES, flags);
if (request) if (request)
{ {
if (send_request(this, request) && if (set_credentials(this, request, user, pass) &&
send_request(this, request) &&
read_result(this, request, userdata)) read_result(this, request, userdata))
{ {
status = SUCCESS; status = SUCCESS;