Skip to content

Commit

Permalink
Merge branch 'rondom-do-https-request-header-cb' into 'master'
Browse files Browse the repository at this point in the history 
http: Allow passing header_cb to do_https_request

See merge request openconnect/openconnect!201
  • Loading branch information
@dwmw2
dwmw2 committed Jun 29, 2021
2 parents 78a2a99 + 56af877 commit be34339
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 42 deletions.
4 changes: 2 additions & 2 deletions array.c
View file
Expand Up @@ -114,7 +114,7 @@ int array_obtain_cookie(struct openconnect_info *vpninfo)
char *resp_buf = NULL;
ret = do_https_request(vpninfo, "POST",
"application/x-www-form-urlencoded",
req_buf, &resp_buf, 2);
req_buf, &resp_buf, NULL, 2);
free(resp_buf);
if (ret <= 0)
goto out;
Expand Down Expand Up @@ -1297,7 +1297,7 @@ int array_bye(struct openconnect_info *vpninfo, const char *reason)

orig_path = vpninfo->urlpath;
vpninfo->urlpath = strdup("prx/000/http/localhost/logout"); /* redirect segfaults without strdup */
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, 0);
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, NULL, 0);
free(vpninfo->urlpath);
vpninfo->urlpath = orig_path;

Expand Down
8 changes: 3 additions & 5 deletions auth-globalprotect.c
View file
Expand Up @@ -575,7 +575,7 @@ static int gpst_login(struct openconnect_info *vpninfo, int portal, struct login
}
}
/* submit prelogin request to get form */
result = do_https_request(vpninfo, "POST", NULL, NULL, &xml_buf, 1);
result = do_https_request(vpninfo, "POST", NULL, NULL, &xml_buf, NULL, 1);
if (!keep_urlpath) {
free(vpninfo->urlpath);
vpninfo->urlpath = orig_path;
Expand Down Expand Up @@ -621,8 +621,7 @@ static int gpst_login(struct openconnect_info *vpninfo, int portal, struct login

orig_path = vpninfo->urlpath;
vpninfo->urlpath = strdup(portal ? "global-protect/getconfig.esp" : "ssl-vpn/login.esp");
result = do_https_request(vpninfo, "POST", request_body_type, request_body,
&xml_buf, 0);
result = do_https_request(vpninfo, "POST", request_body_type, request_body, &xml_buf, NULL, 0);
free(vpninfo->urlpath);
vpninfo->urlpath = orig_path;

Expand Down Expand Up @@ -734,8 +733,7 @@ int gpst_bye(struct openconnect_info *vpninfo, const char *reason)
orig_path = vpninfo->urlpath;
vpninfo->urlpath = strdup("ssl-vpn/logout.esp");
openconnect_close_https(vpninfo, 0);
result = do_https_request(vpninfo, method, request_body_type, request_body,
&xml_buf, 0);
result = do_https_request(vpninfo, method, request_body_type, request_body, &xml_buf, NULL, 0);
free(vpninfo->urlpath);
vpninfo->urlpath = orig_path;

Expand Down
8 changes: 3 additions & 5 deletions auth-juniper.c
View file
Expand Up @@ -466,12 +466,10 @@ int oncp_obtain_cookie(struct openconnect_info *vpninfo)
char *url;

if (resp_buf && resp_buf->pos)
ret = do_https_request(vpninfo, "POST",
"application/x-www-form-urlencoded",
resp_buf, &form_buf, 2);
ret = do_https_request(vpninfo, "POST", "application/x-www-form-urlencoded", resp_buf,
&form_buf, NULL, 2);
else
ret = do_https_request(vpninfo, "GET", NULL, NULL,
&form_buf, 2);
ret = do_https_request(vpninfo, "GET", NULL, NULL, &form_buf, NULL, 2);

/* After login, the server will redirect the "browser" to a landing page.
* https://kb.pulsesecure.net/articles/Pulse_Security_Advisories/SA44784
Expand Down
12 changes: 5 additions & 7 deletions auth.c
View file
Expand Up @@ -1362,8 +1362,7 @@ int cstp_obtain_cookie(struct openconnect_info *vpninfo)
}

request_body_type = vpninfo->xmlpost ? "application/xml; charset=utf-8" : "application/x-www-form-urlencoded";
result = do_https_request(vpninfo, method, request_body_type, request_body,
&form_buf, 0);
result = do_https_request(vpninfo, method, request_body_type, request_body, &form_buf, NULL, 0);
if (vpninfo->got_cancel_cmd) {
result = 1;
goto out;
Expand Down Expand Up @@ -1442,7 +1441,7 @@ int cstp_obtain_cookie(struct openconnect_info *vpninfo)
vpninfo->csd_stuburl = NULL;
handle_redirect(vpninfo);

buflen = do_https_request(vpninfo, "GET", NULL, NULL, &form_buf, 0);
buflen = do_https_request(vpninfo, "GET", NULL, NULL, &form_buf, NULL, 0);
if (buflen <= 0) {
if (vpninfo->csd_wrapper) {
vpn_progress(vpninfo, PRG_ERR,
Expand All @@ -1465,7 +1464,7 @@ int cstp_obtain_cookie(struct openconnect_info *vpninfo)

/* vpninfo->urlpath now points to the wait page */
while (1) {
result = do_https_request(vpninfo, "GET", NULL, NULL, &form_buf, 0);
result = do_https_request(vpninfo, "GET", NULL, NULL, &form_buf, NULL, 0);
if (result <= 0)
break;

Expand All @@ -1488,7 +1487,7 @@ int cstp_obtain_cookie(struct openconnect_info *vpninfo)

result = do_https_request(vpninfo,
vpninfo->xmlpost ? "POST" : "GET",
request_body_type, request_body, &form_buf, 1);
request_body_type, request_body, &form_buf, NULL, 1);
if (result < 0)
goto out;

Expand All @@ -1514,8 +1513,7 @@ int cstp_obtain_cookie(struct openconnect_info *vpninfo)
goto newgroup;
}

result = do_https_request(vpninfo, method, request_body_type, request_body,
&form_buf, 1);
result = do_https_request(vpninfo, method, request_body_type, request_body, &form_buf, NULL, 1);
if (result < 0)
goto out;

Expand Down
11 changes: 5 additions & 6 deletions f5.c
View file
Expand Up @@ -112,10 +112,9 @@ int f5_obtain_cookie(struct openconnect_info *vpninfo)
if (req_buf && req_buf->pos)
ret = do_https_request(vpninfo, "POST",
"application/x-www-form-urlencoded",
req_buf, &resp_buf, 2);
req_buf, &resp_buf, NULL, 2);
else
ret = do_https_request(vpninfo, "GET", NULL, NULL,
&resp_buf, 2);
ret = do_https_request(vpninfo, "GET", NULL, NULL, &resp_buf, NULL, 2);

if (!check_cookie_success(vpninfo)) {
free(resp_buf);
Expand Down Expand Up @@ -539,7 +538,7 @@ static int f5_configure(struct openconnect_info *vpninfo)

free(vpninfo->urlpath);
vpninfo->urlpath = strdup("vdesk/vpn/index.php3?outform=xml&client_version=2.0");
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, 0);
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, NULL, 0);
if (ret < 0)
goto out;

Expand All @@ -559,7 +558,7 @@ static int f5_configure(struct openconnect_info *vpninfo)
ret = -ENOMEM;
goto out;
}
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, 0);
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, NULL, 0);
if (ret < 0)
goto out;

Expand Down Expand Up @@ -694,7 +693,7 @@ int f5_bye(struct openconnect_info *vpninfo, const char *reason)

orig_path = vpninfo->urlpath;
vpninfo->urlpath = strdup("vdesk/hangup.php3?hangup_error=1"); /* redirect segfaults without strdup */
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, 0);
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, NULL, 0);
free(vpninfo->urlpath);
vpninfo->urlpath = orig_path;

Expand Down
10 changes: 5 additions & 5 deletions fortinet.c
View file
Expand Up @@ -108,7 +108,7 @@ int fortinet_obtain_cookie(struct openconnect_info *vpninfo)
goto out;
}

ret = do_https_request(vpninfo, "GET", NULL, NULL, &resp_buf, 1);
ret = do_https_request(vpninfo, "GET", NULL, NULL, &resp_buf, NULL, 1);
free(resp_buf);
resp_buf = NULL;
if (ret < 0)
Expand Down Expand Up @@ -195,7 +195,7 @@ int fortinet_obtain_cookie(struct openconnect_info *vpninfo)
if ((ret = buf_error(req_buf)))
goto out;
ret = do_https_request(vpninfo, "POST", "application/x-www-form-urlencoded",
req_buf, &resp_buf, 0);
req_buf, &resp_buf, NULL, 0);

/* If we got SVPNCOOKIE, then we're done. */
struct oc_vpn_option *cookie;
Expand Down Expand Up @@ -552,7 +552,7 @@ static int fortinet_configure(struct openconnect_info *vpninfo)
#if 0 /* Nah... */
free(vpninfo->urlpath);
vpninfo->urlpath = strdup("remote/fortisslvpn");
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, 0);
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, NULL, 0);
if (ret < 0)
goto out;
else if (ret == 0)
Expand All @@ -565,7 +565,7 @@ static int fortinet_configure(struct openconnect_info *vpninfo)

/* Now fetch the connection options in XML format */
vpninfo->urlpath = strdup("remote/fortisslvpn_xml");
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, 0);
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, NULL, 0);
if (ret < 0) {
if (ret == -EPERM)
vpn_progress(vpninfo, PRG_ERR,
Expand Down Expand Up @@ -743,7 +743,7 @@ int fortinet_bye(struct openconnect_info *vpninfo, const char *reason)

orig_path = vpninfo->urlpath;
vpninfo->urlpath = strdup("remote/logout");
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, 0);
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, NULL, 0);
free(vpninfo->urlpath);
vpninfo->urlpath = orig_path;

Expand Down
6 changes: 2 additions & 4 deletions gpst.c
View file
Expand Up @@ -637,8 +637,7 @@ static int gpst_get_config(struct openconnect_info *vpninfo)

orig_path = vpninfo->urlpath;
vpninfo->urlpath = strdup("ssl-vpn/getconfig.esp");
result = do_https_request(vpninfo, method, request_body_type, request_body,
&xml_buf, 0);
result = do_https_request(vpninfo, method, request_body_type, request_body, &xml_buf, NULL, 0);
free(vpninfo->urlpath);
vpninfo->urlpath = orig_path;

Expand Down Expand Up @@ -868,8 +867,7 @@ static int check_or_submit_hip_report(struct openconnect_info *vpninfo, const ch

orig_path = vpninfo->urlpath;
vpninfo->urlpath = strdup(report ? "ssl-vpn/hipreport.esp" : "ssl-vpn/hipreportcheck.esp");
result = do_https_request(vpninfo, method, request_body_type, request_body,
&xml_buf, 0);
result = do_https_request(vpninfo, method, request_body_type, request_body, &xml_buf, NULL, 0);
free(vpninfo->urlpath);
vpninfo->urlpath = orig_path;

Expand Down
14 changes: 10 additions & 4 deletions http.c
View file
Expand Up @@ -778,14 +778,17 @@ static int https_socket_closed(struct openconnect_info *vpninfo)
* request_body_type: Content type for a POST (e.g. text/html). Can be NULL.
* request_body: POST content
* form_buf: Callee-allocated buffer for server content
* header_cb: Callback executed on every header line
* If HTTP authentication is needed, the callback specified needs to call http_auth_hdrs.
* fetch_redirect:
*
* Return value:
* < 0, on error
* >=0, on success, indicating the length of the data in *form_buf
*/
int do_https_request(struct openconnect_info *vpninfo, const char *method,
const char *request_body_type, struct oc_text_buf *request_body,
char **form_buf, int fetch_redirect)
int do_https_request(struct openconnect_info *vpninfo, const char *method, const char *request_body_type,
struct oc_text_buf *request_body, char **form_buf,
int (*header_cb)(struct openconnect_info *, char *, char *), int fetch_redirect)
{
struct oc_text_buf *buf;
int result;
Expand All @@ -794,6 +797,9 @@ int do_https_request(struct openconnect_info *vpninfo, const char *method,
int i, auth = 0;
int max_redirects = 10;

if (!header_cb)
header_cb = http_auth_hdrs;

if (request_body_type && buf_error(request_body))
return buf_error(request_body);

Expand Down Expand Up @@ -902,7 +908,7 @@ int do_https_request(struct openconnect_info *vpninfo, const char *method,
}
}

result = process_http_response(vpninfo, 0, http_auth_hdrs, buf);
result = process_http_response(vpninfo, 0, header_cb, buf);
if (result < 0) {
if (rq_retry) {
openconnect_close_https(vpninfo, 0);
Expand Down
2 changes: 1 addition & 1 deletion oncp.c
View file
Expand Up @@ -1219,7 +1219,7 @@ int oncp_bye(struct openconnect_info *vpninfo, const char *reason)

orig_path = vpninfo->urlpath;
vpninfo->urlpath = strdup("dana-na/auth/logout.cgi"); /* redirect segfaults without strdup */
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, 0);
ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, NULL, 0);
free(vpninfo->urlpath);
vpninfo->urlpath = orig_path;

Expand Down
6 changes: 3 additions & 3 deletions openconnect-internal.h
View file
Expand Up @@ -1351,9 +1351,9 @@ int process_proxy(struct openconnect_info *vpninfo, int ssl_sock);
int internal_parse_url(const char *url, char **res_proto, char **res_host,
int *res_port, char **res_path, int default_port);
char *internal_get_url(struct openconnect_info *vpninfo);
int do_https_request(struct openconnect_info *vpninfo, const char *method,
const char *request_body_type, struct oc_text_buf *request_body,
char **form_buf, int fetch_redirect);
int do_https_request(struct openconnect_info *vpninfo, const char *method, const char *request_body_type,
struct oc_text_buf *request_body, char **form_buf,
int (*header_cb)(struct openconnect_info *, char *, char *), int fetch_redirect);
int http_add_cookie(struct openconnect_info *vpninfo, const char *option,
const char *value, int replace);
int internal_split_cookies(struct openconnect_info *vpninfo, int replace, const char *def_cookie);
Expand Down

0 comments on commit be34339

Please sign in to comment.