Skip to content

Commit

Permalink
--http-proxy-user-pass: allow to specify in either order with --http-…
Browse files Browse the repository at this point in the history
…proxy

Previously, when using a third argument to --http-proxy other
than auto/auto-nct, order did matter between --http-proxy and
--http-proxy-user-pass. Always prefer --http-proxy-user-pass
when given.

Change-Id: I6f402db2fb73f1206fbc1139c47d2bf4378376fa
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20240122092122.8591-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28099.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
  • Loading branch information
flichtenheld authored and cron2 committed Jan 22, 2024
1 parent bc29bd6 commit a634cc5
Showing 3 changed files with 11 additions and 3 deletions.
4 changes: 3 additions & 1 deletion src/openvpn/options.c
Original file line number Diff line number Diff line change
@@ -1649,6 +1649,8 @@ show_http_proxy_options(const struct http_proxy_options *o)
SHOW_STR(port);
SHOW_STR(auth_method_string);
SHOW_STR(auth_file);
SHOW_STR(auth_file_up);
SHOW_BOOL(inline_creds);
SHOW_STR(http_version);
SHOW_STR(user_agent);
for (i = 0; i < MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -6833,7 +6835,7 @@ add_option(struct options *options,
struct http_proxy_options *ho;
VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_INLINE);
ho = init_http_proxy_options_once(&options->ce.http_proxy_options, &options->gc);
ho->auth_file = p[1];
ho->auth_file_up = p[1];
ho->inline_creds = is_inline;
}
else if (streq(p[0], "http-proxy-retry") || streq(p[0], "socks-proxy-retry"))
7 changes: 6 additions & 1 deletion src/openvpn/proxy.c
Original file line number Diff line number Diff line change
@@ -271,6 +271,11 @@ get_user_pass_http(struct http_proxy_info *p, const bool force)
if (!static_proxy_user_pass.defined)
{
unsigned int flags = GET_USER_PASS_MANAGEMENT;
const char *auth_file = p->options.auth_file;
if (p->options.auth_file_up)
{
auth_file = p->options.auth_file_up;
}
if (p->queried_creds)
{
flags |= GET_USER_PASS_PREVIOUS_CREDS_FAILED;
@@ -280,7 +285,7 @@ get_user_pass_http(struct http_proxy_info *p, const bool force)
flags |= GET_USER_PASS_INLINE_CREDS;
}
get_user_pass(&static_proxy_user_pass,
p->options.auth_file,
auth_file,
UP_TYPE_PROXY,
flags);
p->queried_creds = true;
3 changes: 2 additions & 1 deletion src/openvpn/proxy.h
Original file line number Diff line number Diff line change
@@ -52,10 +52,11 @@ struct http_proxy_options {

const char *auth_method_string;
const char *auth_file;
const char *auth_file_up; /* specified with --http-proxy-user-pass */
const char *http_version;
const char *user_agent;
struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER];
bool inline_creds;
bool inline_creds; /* auth_file_up is inline credentials */
};

struct http_proxy_options_simple {

0 comments on commit a634cc5

Please sign in to comment.