diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-10-25 10:02:23 +0200 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2013-11-15 13:27:53 +0100 |
| commit | d0cb816cf8be68359617b61a55799f6330901f6a (patch) | |
| tree | 891aba88fe54fd44a81e19ef0313eb19d32e8ffa /src/openvpn/options.c | |
| parent | 7fc9245f5d97c7d76c635f8a3e38ab55ab27b27b (diff) | |
| download | openvpn-d0cb816cf8be68359617b61a55799f6330901f6a.tar.gz openvpn-d0cb816cf8be68359617b61a55799f6330901f6a.tar.xz openvpn-d0cb816cf8be68359617b61a55799f6330901f6a.zip | |
Implement custom HTTP header for http-proxy, and always send user-agent:
There are some patched OpenVPN versions out there without source code
(e.g. NDMVPN) that support adding custom http header.
This patch adds custom header to OpenVPN and supports the syntax that the
"in the wild" variants use.
Patch v3 also prints all custom headers with other http options in --verb 5
Patch v4 does clean up the add_proxy_header function
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1382688143-17247-1-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/7946
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/options.c')
| -rw-r--r-- | src/openvpn/options.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 4d0271f..e925397 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1295,6 +1295,7 @@ option_iroute_ipv6 (struct options *o, static void show_http_proxy_options (const struct http_proxy_options *o) { + int i; msg (D_SHOW_PARMS, "BEGIN http_proxy"); SHOW_STR (server); SHOW_INT (port); @@ -1304,6 +1305,15 @@ show_http_proxy_options (const struct http_proxy_options *o) SHOW_INT (timeout); SHOW_STR (http_version); SHOW_STR (user_agent); + for (i=0; i < MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name;i++) + { + if (o->custom_headers[i].content) + msg (D_SHOW_PARMS, " custom_header[%d] = %s: %s", i, + o->custom_headers[i].name, o->custom_headers[i].content); + else + msg (D_SHOW_PARMS, " custom_header[%d] = %s", i, + o->custom_headers[i].name); + } msg (D_SHOW_PARMS, "END http_proxy"); } #endif @@ -5061,6 +5071,33 @@ add_option (struct options *options, { ho->user_agent = p[2]; } + else if ((streq (p[1], "EXT1") || streq(p[1], "EXT2") || streq(p[1], "CUSTOM-HEADER")) + && p[2]) + { + /* In the wild patched versions use both EXT1/2 and CUSTOM-HEADER + * with either two argument or one */ + + struct http_custom_header *custom_header = NULL; + int i; + /* Find the first free header */ + for (i=0; i < MAX_CUSTOM_HTTP_HEADER; i++) { + if (!ho->custom_headers[i].name) { + custom_header = &ho->custom_headers[i]; + break; + } + } + if (!custom_header) + { + msg (msglevel, "Cannot use more than %d http-proxy-option CUSTOM-HEADER : '%s'", MAX_CUSTOM_HTTP_HEADER, p[1]); + } + else + { + /* We will save p[2] and p[3], the proxy code will detect if + * p[3] is NULL */ + custom_header->name = p[2]; + custom_header->content = p[3]; + } + } else { msg (msglevel, "Bad http-proxy-option or missing parameter: '%s'", p[1]); |