From: "cron2 (Code Review)" Date: Mon, 22 Jan 2024 12:46:55 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="NkknA+f0THA="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: --http-proxy-user-pass: allow to specify in either order with --http-... List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --NkknA+f0THA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/49= 9?usp=3Demail ) Change subject: --http-proxy-user-pass: allow to specify in either order wi= th --http-proxy ...................................................................... --http-proxy-user-pass: allow to specify in either order with --http-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 Acked-by: Gert Doering Message-Id: <20240122092122.8591-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 099.html Signed-off-by: Gert Doering --- M src/openvpn/options.c M src/openvpn/proxy.c M src/openvpn/proxy.h 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 6975cbe..2c79a1e 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1649,6 +1649,8 @@ 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 =3D 0; i < MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name= ; i++) @@ -6833,7 +6835,7 @@ struct http_proxy_options *ho; VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_INLINE); ho =3D init_http_proxy_options_once(&options->ce.http_proxy_option= s, &options->gc); - ho->auth_file =3D p[1]; + ho->auth_file_up =3D p[1]; ho->inline_creds =3D is_inline; } else if (streq(p[0], "http-proxy-retry") || streq(p[0], "socks-proxy-r= etry")) diff --git a/src/openvpn/proxy.c b/src/openvpn/proxy.c index 2e8d7a8..eeb3989 100644 --- a/src/openvpn/proxy.c +++ b/src/openvpn/proxy.c @@ -271,6 +271,11 @@ if (!static_proxy_user_pass.defined) { unsigned int flags =3D GET_USER_PASS_MANAGEMENT; + const char *auth_file =3D p->options.auth_file; + if (p->options.auth_file_up) + { + auth_file =3D p->options.auth_file_up; + } if (p->queried_creds) { flags |=3D GET_USER_PASS_PREVIOUS_CREDS_FAILED; @@ -280,7 +285,7 @@ flags |=3D 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 =3D true; diff --git a/src/openvpn/proxy.h b/src/openvpn/proxy.h index 7900244..4e78772 100644 --- a/src/openvpn/proxy.h +++ b/src/openvpn/proxy.h @@ -52,10 +52,11 @@ 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 { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/499?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I6f402db2fb73f1206fbc1139c47d2bf4378376fa Gerrit-Change-Number: 499 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --NkknA+f0THA= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

--http-proxy-user-pass: allow to specify in ei=
ther order with --http-proxy

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

Change-Id: I6f402db2fb73f1206fbc1139c47d2bf4378376f= a
Signed-off-by: Frank Lichtenheld <frank@...2641...>
Acked-by:= Gert Doering <gert@...1296...>
Message-Id: <20240122092122.859= 1-1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@= lists.sourceforge.net/msg28099.html
Signed-off-by: Gert Doering <gert= @...1296...>
---
M src/openvpn/options.c
M src/openvpn/proxy.c<= br>M src/openvpn/proxy.h
3 files changed, 11 insertions(+), 3 deletions(= -)

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 6975cbe..2c79a1e 100644
--- a/src/openvpn/options.= c
+++ b/src/openvpn/options.c
@@ -1649,6 +1= 649,8 @@
SHOW_STR(port);
SHOW_STR= (auth_method_string);
SHOW_STR(auth_file);
<= span style=3D"color: hsl(120, 100%, 40%);">+ SHOW_STR(auth_file_up);

+ SHOW_BOOL(inline_cr= eds);
SHOW_STR(http_version);
SHO= W_STR(user_agent);
for (i =3D 0; i < MAX_CUSTOM_HT= TP_HEADER && o->custom_headers[i].name; i++)
@@ = -6833,7 +6835,7 @@
struct http_proxy_options *ho;<= /span>
VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_INLINE);

ho =3D init_http_proxy_options_once(&options->= ce.http_proxy_options, &options->gc);
- ho->auth_file =3D p[1];
+ ho->auth_file_up =3D p[1];=
ho->inline_creds =3D is_inline;
}
else if (streq(p[0], "http-proxy-retry&q= uot;) || streq(p[0], "socks-proxy-retry"))
diff -= -git a/src/openvpn/proxy.c b/src/openvpn/proxy.c
index 2e8d= 7a8..eeb3989 100644
--- a/src/openvpn/proxy.c
+++ b/src/openvpn/proxy.c
@@ -271,6 +271,11 @@ if (!static_proxy_user_pass.defined)
{

unsigned int flags =3D GET_USER_PASS_MANAGEMENT;

+ const char *auth= _file =3D p->options.auth_file;
+ if (p->options.auth_file_up)
+ {
+ auth_file =3D p->options.auth_file_= up;
+ }=
if (p->queried_creds)
{
flags |=3D GET_USER_PASS_PREVIOUS_CREDS_FAILED;
@@ -280,7 +285,7 @@
flags |=3D G= ET_USER_PASS_INLINE_CREDS;
}
= get_user_pass(&static_proxy_user_pass,
- p->options.auth_file,
+ a= uth_file,
UP_TYPE_PROXY,
<= span> flags);

p->queried_= creds =3D true;
diff --git a/src/openvpn/proxy.h b/src/open= vpn/proxy.h
index 7900244..4e78772 100644
-= -- a/src/openvpn/proxy.h
+++ b/src/openvpn/proxy.h@@ -52,10 +52,11 @@

const ch= ar *auth_method_string;
const char *auth_file;<= br>+ const char *auth_file_u= p; /* specified with --http-proxy-user-pass */
const c= har *http_version;
const char *user_agent;
<= span> struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER];=

- bool inline_creds= ;
+ bool inline_cr= eds; /* auth_file_up is inline credentials */
};
struct http_proxy_options_simple {

To view, visit change 499. To unsubscribe, or for help wri= ting mail filters, visit set= tings.

=
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6f402db2fb73f1206fbc1139c47= d2bf4378376fa
Gerrit-Change-Number: 499
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--NkknA+f0THA=--