From: "mrbff (Code Review)" Date: Wed, 20 Nov 2024 17:42:39 +0000 References: Reply-To: marco@...2726..., 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="bqppZPh+aFM="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: PUSH_UPDATE: Added update_option() function. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --bqppZPh+aFM= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/810?usp=3Demail to review the following change. Change subject: PUSH_UPDATE: Added update_option() function. ...................................................................... PUSH_UPDATE: Added update_option() function. When the function receives an option to update, it first checks whether it = has already received an option of the same type within the same update message. If it has already received it, it simply calls add_option(), otherwise it deletes all the values =E2=80=8B=E2=80=8Balready present regarding that opt= ion. Change-Id: Ia45c99e6df7b3ad24020c10b8a9b3577984ecdc2 Signed-off-by: Marco Baffo --- M src/openvpn/options.c 1 file changed, 216 insertions(+), 0 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/10/810/1 diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 5b4419d..49bd242 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -5759,6 +5759,216 @@ err: msg(msglevel, "Error occurred trying to remove %s option", p[0]); } + +static void +update_option(struct context *c, + struct options *options, + char *p[], + bool is_inline, + const char *file, + int line, + const int level, + const int msglevel, + const unsigned int permission_mask, + unsigned int *option_types_found, + struct env_set *es, + unsigned int *update_options_found) +{ + const bool pull_mode =3D BOOL_CAST(permission_mask & OPT_P_PULL_MODE); + ASSERT(MAX_PARMS >=3D 7); + + if (streq(p[0], "route") && p[1] && !p[5]) + { + if (!(*update_options_found & OPT_P_U_ROUTE)) + { + VERIFY_PERMISSION(OPT_P_ROUTE); + rol_check_alloc(options); + if (pull_mode) + { + if (!ip_or_dns_addr_safe(p[1], options->allow_pull_fqdn) &= & !is_special_addr(p[1])) /* FQDN -- may be DNS name */ + { + msg(msglevel, "route parameter network/IP '%s' must be= a valid address", p[1]); + goto err; + } + if (p[2] && !ip_addr_dotted_quad_safe(p[2])) /* FQDN -- mu= st be IP address */ + { + msg(msglevel, "route parameter netmask '%s' must be an= IP address", p[2]); + goto err; + } + if (p[3] && !ip_or_dns_addr_safe(p[3], options->allow_pull= _fqdn) && !is_special_addr(p[3])) /* FQDN -- may be DNS name */ + { + msg(msglevel, "route parameter gateway '%s' must be a = valid address", p[3]); + goto err; + } + } + if (c->c1.route_list) + { + destroy_routes_v4(c->c1.route_list, c->c1.tuntap, + ROUTE_OPTION_FLAGS(&c->options), + es, &c->net_ctx, options); + } + *update_options_found |=3D OPT_P_U_ROUTE; + } + } + else if (streq(p[0], "route-ipv6") && p[1] && !p[4]) + { + if (!(*update_options_found & OPT_P_U_ROUTE6)) + { + VERIFY_PERMISSION(OPT_P_ROUTE); + rol6_check_alloc(options); + if (pull_mode) + { + if (!ipv6_addr_safe_hexplusbits(p[1])) + { + msg(msglevel, "route-ipv6 parameter network/IP '%s' mu= st be a valid address", p[1]); + goto err; + } + if (p[2] && !ipv6_addr_safe(p[2])) + { + msg(msglevel, "route-ipv6 parameter gateway '%s' must = be a valid address", p[2]); + goto err; + } + /* p[3] is metric, if present */ + } + if (c->c1.route_ipv6_list) + { + destroy_routes_v6(c->c1.route_ipv6_list, c->c1.tuntap, + ROUTE_OPTION_FLAGS(&c->options), + es, &c->net_ctx, options); + } + *update_options_found |=3D OPT_P_U_ROUTE6; + } + } + else if (streq(p[0], "redirect-gateway") || streq(p[0], "redirect-priv= ate")) + { + if (!(*update_options_found & OPT_P_U_REDIR_GATEWAY)) + { + VERIFY_PERMISSION(OPT_P_ROUTE); + if (options->routes) + { + options->routes->flags =3D 0; + } + if (options->routes_ipv6) + { + options->routes_ipv6->flags =3D 0; + } + *update_options_found |=3D OPT_P_U_REDIR_GATEWAY; + } + } + else if (streq(p[0], "dns") && p[1]) + { + if (!(*update_options_found & OPT_P_U_DNS)) + { + VERIFY_PERMISSION(OPT_P_DHCPDNS); + if (streq(p[1], "server") && p[2] && p[3] && p[4]) + { + long priority; + if (!dns_server_priority_parse(&priority, p[2], pull_mode)) + { + msg(msglevel, "--dns server: invalid priority value '%= s'", p[2]); + goto err; + } + + struct dns_server server; + CLEAR(server); + if (streq(p[3], "address") && p[4]) + { + for (int i =3D 4; p[i]; ++i) + { + if (!dns_server_addr_parse(&server, p[i])) + { + msg(msglevel, "--dns server %ld: malformed add= ress or maximum exceeded '%s'", priority, p[i]); + goto err; + } + } + } + else if (streq(p[3], "dnssec") && !p[5]) + { + if (!streq(p[4], "yes") && !streq(p[4], "no") && !stre= q(p[4], "optional")) + { + msg(msglevel, "--dns server %ld: malformed dnssec = value '%s'", priority, p[4]); + goto err; + } + } + else if (streq(p[3], "transport") && !p[5]) + { + if (!streq(p[4], "plain") && !streq(p[4], "DoH") && !s= treq(p[4], "DoT")) + { + msg(msglevel, "--dns server %ld: malformed transpo= rt value '%s'", priority, p[4]); + goto err; + } + } + else if (!streq(p[3], "resolve-domains") + && !(streq(p[3], "sni") && !p[5])) + { + msg(msglevel, "--dns server %ld: unknown option type '= %s' or missing or unknown parameter", priority, p[3]); + goto err; + } + } + else if (!(streq(p[1], "search-domains") && p[2])) + { + msg(msglevel, "--dns: unknown option type '%s' or missing = or unknown parameter", p[1]); + goto err; + } + + gc_free(&options->dns_options.gc); + CLEAR(options->dns_options); + *update_options_found |=3D OPT_P_U_DNS; + } + } +#if defined(_WIN32) || defined(TARGET_ANDROID) + else if (streq(p[0], "dhcp-option") && p[1] && !p[3]) + { + if (!(*update_options_found & OPT_P_U_DHCP)) + { + struct tuntap_options *o =3D &options->tuntap_options; + VERIFY_PERMISSION(OPT_P_DHCPDNS); + + o->domain =3D NULL; + o->netbios_scope =3D NULL; + o->netbios_node_type =3D 0; + o->dns6_len =3D 0; + CLEAR(o->dns6); + o->dns_len =3D 0; + CLEAR(o->dns); + o->wins_len =3D 0; + CLEAR(o->wins); + o->ntp_len =3D 0; + CLEAR(o->ntp); + o->nbdd_len =3D 0; + CLEAR(o->nbdd); + while (o->domain_search_list_len-- > 0) + { + o->domain_search_list[o->domain_search_list_len] =3D NULL; + } + o->disable_nbt =3D 0; + o->dhcp_options =3D 0; +#if defined(TARGET_ANDROID) + o->http_proxy_port =3D 0; + o->http_proxy =3D NULL; +#endif + *update_options_found |=3D OPT_P_U_DHCP; + } + } +#else /* if defined(_WIN32) || defined(TARGET_ANDROID) */ + else if (streq(p[0], "dhcp-option") && p[1] && !p[3]) + { + if (!(*update_options_found & OPT_P_U_DHCP)) + { + VERIFY_PERMISSION(OPT_P_DHCPDNS); + delete_all_dhcp_fo(options, &es->list); + *update_options_found |=3D OPT_P_U_DHCP; + } + } +#endif /* if defined(_WIN32) || defined(TARGET_ANDROID) */ + add_option(options, p, is_inline, file, line, + level, msglevel, permission_mask, + option_types_found, es); + return; +err: + msg(msglevel, "Error occurred trying to update %s option", p[0]); +} + bool apply_push_options(struct context *c, struct options *options, @@ -5772,6 +5982,7 @@ int line_num =3D 0; const char *file =3D "[PUSH-OPTIONS]"; const int msglevel =3D D_PUSH_ERRORS|M_OPTERR; + unsigned int update_options_found =3D 0; while (buf_parse(buf, ',', line, sizeof(line))) { @@ -5797,6 +6008,11 @@ remove_option(c, options, p, false, file, line_num, msglev= el, permission_mask, option_types_found, es); } + else + { + update_option(c, options, p, false, file, line_num, 0, msg= level, + permission_mask, option_types_found, es, &up= date_options_found); + } } } return true; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/810?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: Ia45c99e6df7b3ad24020c10b8a9b3577984ecdc2 Gerrit-Change-Number: 810 Gerrit-PatchSet: 1 Gerrit-Owner: mrbff Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --bqppZPh+aFM= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

mrbff would like plaisthos and flichtenheld to review t= his change.

Vi= ew Change

PUSH_UPDATE: Added update_option() function.

When the = function receives an option to update, it first checks whether it has
al= ready received an option of the same type within the same update message.If it has already received it, it simply calls add_option(), otherwise it=
deletes all the values =E2=80=8B=E2=80=8Balready present regarding that= option.

Change-Id: Ia45c99e6df7b3ad24020c10b8a9b3577984ecdc2
Sig= ned-off-by: Marco Baffo <marco@...2726...>
---
M src/openvpn/op= tions.c
1 file changed, 216 insertions(+), 0 deletions(-)

<= pre style=3D"font-family: monospace,monospace; white-space: pre-wrap;">git = pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/10/810/1d= iff --git a/src/openvpn/options.c b/src/openvpn/options.c
i= ndex 5b4419d..49bd242 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -5759,6 +5759,= 216 @@
err:
msg(msglevel, "Error= occurred trying to remove %s option", p[0]);
}
+
+static void
+update_option(struct context *c,
+ struct options *options,<= /span>
+ char *= p[],
+ b= ool is_inline,
+ = const char *file,
+ int line,
+ const int level,
+ const int msglevel,
+ const unsigned int permis= sion_mask,
+ = unsigned int *option_types_found,
+ struct env_set *es,
+ unsigned int *update_option= s_found)
+{+ const bool pull_mode =3D = BOOL_CAST(permission_mask & OPT_P_PULL_MODE);
+ ASSERT(MAX_PARMS >=3D 7);
+

+ if (streq(p[0], "route") && p= [1] && !p[5])
+ {
+ if (= !(*update_options_found & OPT_P_U_ROUTE))
+ {
+ VERIFY_PERMISSION(OPT_P_ROUTE);
+ rol_check_alloc(options= );

+ if (p= ull_mode)
+ = {
+ = if (!ip_or_dns_addr_safe(p[1], options->allow_pull_fqdn) && !is_= special_addr(p[1])) /* FQDN -- may be DNS name */
+ {
+ msg(msglevel, "route p= arameter network/IP '%s' must be a valid address", p[1]);
+ goto= err;
+ = }
+ = if (p[2] && !ip_addr_dotted_quad_safe(p[2])) /* FQDN -- must be IP = address */
+ = {
+ = msg(msglevel, "route parameter netmask '%s' must be a= n IP address", p[2]);
+ goto err;
+ }
+ if (p[3] && !ip_or_dns_addr_safe(p[3= ], options->allow_pull_fqdn) && !is_special_addr(p[3])) /* FQDN = -- may be DNS name */
+ {
+= msg(msglevel, "route parameter gateway '%s'= ; must be a valid address", p[3]);
+ goto err;
+ }
+ }
+ if (c->c1.route_list)
+ {
+ destroy_routes_v4(c->c= 1.route_list, c->c1.tuntap,
+ ROUTE_OPTION_FLAGS(&c->= options),
+ = es, &c->net_ctx, options);
+ }
+ *update_options_found |=3D OP= T_P_U_ROUTE;
+ = }
+ }
<= span style=3D"color: hsl(120, 100%, 40%);">+ else if (streq(p[0], "= route-ipv6") && p[1] && !p[4])

+ {
+ if (!(*update_options_found & OPT_P_U_ROUTE= 6))
+ {=
+ VERIFY_PERMISS= ION(OPT_P_ROUTE);
+ = rol6_check_alloc(options);
+ if (pull_mode)
+ {
+ if (!ipv6_addr_safe_hexplusbits(p[1]))
+ {
+ msg(= msglevel, "route-ipv6 parameter network/IP '%s' must be a vali= d address", p[1]);
+ goto err;
+ }
+ if (p[2] && !ipv6_addr_safe(p[2]))
+ {=
+ msg(ms= glevel, "route-ipv6 parameter gateway '%s' must be a valid add= ress", p[2]);
+ = goto err;
+ }
+ /* p[3] is metric, if present */
+ }
+ if (c->c1.route_ipv6_list)
+ {+ destroy_route= s_v6(c->c1.route_ipv6_list, c->c1.tuntap,
+ ROUTE_OPTION_= FLAGS(&c->options),
+ es, &c->net_ctx, options);<= /span>
+ }=
+ *update_option= s_found |=3D OPT_P_U_ROUTE6;
+ }
+ = }
+ else if (st= req(p[0], "redirect-gateway") || streq(p[0], "redirect-priva= te"))
+ {
+ if (!(*update_o= ptions_found & OPT_P_U_REDIR_GATEWAY))
+ {
+ VERIFY_PERMISSION(OPT_P_ROUTE);
+ if (options->routes)
+ {+ options->= routes->flags =3D 0;
+ }
+ = if (options->routes_ipv6)
+ {
+ options->routes_ipv6->flags =3D 0;
+ }
<= span style=3D"color: hsl(120, 100%, 40%);">+ *update_options_fou= nd |=3D OPT_P_U_REDIR_GATEWAY;

+ }
= + }
+ else if (= streq(p[0], "dns") && p[1])
+ {
+ if (!(*update_options_found & OPT_P_U_DNS))<= br>+ {
+ VERIFY_PERMISSION(OPT_P_D= HCPDNS);
+ = if (streq(p[1], "server") && p[2] && p[3] &&= amp; p[4])
+ = {
+ = long priority;
+ = if (!dns_server_priority_parse(&priority, p[2], pull_mode))=
+ {
+ m= sg(msglevel, "--dns server: invalid priority value '%s'",= p[2]);
+ = goto err;
+ = }
+
+ struct = dns_server server;
+ = CLEAR(server);
+ if (streq(p[3], "address") && p= [4])
+ = {
+ = for (int i =3D 4; p[i]; ++i)
+ {
+ if (!dns_server_addr_parse(&serve= r, p[i]))
+ = {
+ = msg(msglevel, "--dns server %ld: malformed add= ress or maximum exceeded '%s'", priority, p[i]);
+ goto = err;

+ = }
+ = }
+ = }
+ = else if (streq(p[3], "dnssec") && !p[5])+ {
<= span style=3D"color: hsl(120, 100%, 40%);">+ if (!streq(= p[4], "yes") && !streq(p[4], "no") && != streq(p[4], "optional"))

+ {
+ msg(msglevel, "--dns server %= ld: malformed dnssec value '%s'", priority, p[4]);
<= span style=3D"color: hsl(120, 100%, 40%);">+ goto er= r;

+ = }
+ = }
+ e= lse if (streq(p[3], "transport") && !p[5])
+ {

+ if (!streq(p[4],= "plain") && !streq(p[4], "DoH") && !st= req(p[4], "DoT"))
+ {
+ msg(msglevel, "--dns server %ld: mal= formed transport value '%s'", priority, p[4]);
+ goto err;
+ }=
+ }
+ else = if (!streq(p[3], "resolve-domains")
+ && !(streq(p[3],= "sni") && !p[5]))
+ {
+ msg(msglevel, "--dns server %ld: un= known option type '%s' or missing or unknown parameter", prior= ity, p[3]);
+ = goto err;
+ }
+= }
+ = else if (!(streq(p[1], "search-domains") && p[2]))<= /span>
+ {=
+ msg(msglev= el, "--dns: unknown option type '%s' or missing or unknown par= ameter", p[1]);
= + goto err;
+ }
= +
+ gc_fre= e(&options->dns_options.gc);
+ CLEAR(options->dns_options);
+ *update_options_found |= =3D OPT_P_U_DNS;

+ = }
+ }<= br>+#if defined(_WIN32) || defi= ned(TARGET_ANDROID)
+= else if (streq(p[0], "dhcp-option") && p[1] &&= ; !p[3])
+ {

+ if (!(*update_opt= ions_found & OPT_P_U_DHCP))
+ {
+ struct tuntap_options *o =3D &options->tuntap_options;=
+ VERIFY_= PERMISSION(OPT_P_DHCPDNS);
+
+ = o->domain =3D NULL;
+ o->netbios_node_type =3D 0;<= br>+ o->dns6_len = =3D 0;
+ C= LEAR(o->dns6);
+ = o->dns_len =3D 0;
+ CLEAR(o->dns);
+ o->wins_len =3D 0;
+ CLEAR(o->wins);+ o->ntp_len =3D= 0;
+ CLEA= R(o->ntp);
+ = o->nbdd_len =3D 0;
+ CLEAR(o->nbdd);
+ while (o->domain_search_list_len-- > 0= )
+ {
+ o->do= main_search_list[o->domain_search_list_len] =3D NULL;
+ }
+ o->disable_nbt =3D 0;<= br>+ o->dhcp_opti= ons =3D 0;
+#if defin= ed(TARGET_ANDROID)
+ = o->http_proxy_port =3D 0;
+ o->http_proxy =3D NULL;
+#endif
+ *update_options_found |=3D OPT_P_U_DH= CP;
+ }=
+ }
+#else /* if defined(_WIN32) || defined(T= ARGET_ANDROID) */
+ = else if (streq(p[0], "dhcp-option") && p[1] && = !p[3])
+ {<= br>+ if (!(*update_optio= ns_found & OPT_P_U_DHCP))
+ {
+= VERIFY_PERMISSION(OPT_P_DHCPDNS);
+ delete_all_dhcp_fo(options, &es-&= gt;list);
+ = *update_options_found |=3D OPT_P_U_DHCP;
+ }
+ }
+#= endif /* if defined(_WIN32) || defined(TARGET_ANDROID) */
+ add_option(options, p, is_inline,= file, line,
+ = level, msglevel, permission_mask,
+ option_types_found, es);
+ return;

+err:
+ msg(msglevel, "Error occurred trying to update = %s option", p[0]);
+}
+
bool

apply_push_options(struct context *c,
<= span> struct options *options,

@@ -5772,= 6 +5982,7 @@
int line_num =3D 0;
= const char *file =3D "[PUSH-OPTIONS]";
const= int msglevel =3D D_PUSH_ERRORS|M_OPTERR;
+ unsigned int update_options_found =3D 0;
while (buf_parse(buf, ',', line, siz= eof(line)))
{
@@ -5797,6 +6008,11 @@
remove_option(c, options, p, false, file, l= ine_num, msglevel,
permissio= n_mask, option_types_found, es);
}
<= span style=3D"color: hsl(120, 100%, 40%);">+ else

+ {

+ update_option(c, options= , p, false, file, line_num, 0, msglevel,
+ permission_mask, option_= types_found, es, &update_options_found);
+ }
} }
return true;

=

To view, visit change 810. To unsubscribe, or for help writing mail fil= ters, visit settings.

<= meta itemprop=3D"name" content=3D"View Change"/>
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia45c99e6df7b3ad24020c10b8a9= b3577984ecdc2
Gerrit-Change-Number: 810
Gerrit-PatchSet: 1
Gerrit-Owner: mrbff <marco@...2726...> <= /div>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--bqppZPh+aFM=--