[Openvpn-devel,v3] reload HTTP proxy credentials when moving to the next connection profile

Message ID 20171204042658.23426-1-a@unstable.cc
State Superseded
Headers show
Series [Openvpn-devel,v3] reload HTTP proxy credentials when moving to the next connection profile | expand

Commit Message

Antonio Quartulli Dec. 3, 2017, 5:26 p.m. UTC
The HTTP proxy credentials are stored in a static variable that is
possibly initialized before each connection attempt.

However, the variable is never "released" therefore get_user_pass()
refuses to overwrite its content and leaves it as it is.
Consequently, if the user config contains multiple connection profiles
with different http-proxy, each having its own credentials, only the
first user/pass couple is loaded and the others are all ignored.
This leads to connection failures because the proper credentials are
not associated with the right proxy server.

The root of the misbehaviour seems to be located in the fact that,
despite the argument force passed to get_user_pass_http() being true,
no action is taken to release the static object containing the

Fix the misbehaviour by releasing the http-proxy credential object
when the reload is "forced".

Trac: #836
Signed-off-by: Antonio Quartulli <a@unstable.cc>

- call clear_user_pass_http() directly to clear user/pass object

- rebased on current master

 src/openvpn/proxy.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)


diff --git a/src/openvpn/proxy.c b/src/openvpn/proxy.c
index fdc73b4a..af619f10 100644
--- a/src/openvpn/proxy.c
+++ b/src/openvpn/proxy.c
@@ -255,7 +255,16 @@  username_password_as_base64(const struct http_proxy_info *p,
 static void
 get_user_pass_http(struct http_proxy_info *p, const bool force)
-    if (!static_proxy_user_pass.defined || force)
+    /*
+     * in case of forced (re)load, make sure the static storage is set as
+     * undefined, otherwise get_user_pass() won't try to load any credential
+     */
+    if (force)
+    {
+        clear_user_pass_http();
+    }
+    if (!static_proxy_user_pass.defined)
         unsigned int flags = GET_USER_PASS_MANAGEMENT;
         if (p->queried_creds)