From: "cron2 (Code Review)" Date: Tue, 29 Jul 2025 14:52:56 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., marco@...2726..., openvpn-devel@lists.sourceforge.net, frank@...2641..., lstipakov@...277... Message-ID: <355db39c172799570a83cbfd93df78434b3be4b2-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="JbNPcc07iyY="; charset=UTF-8 Subject: [Openvpn-devel] [L] Change in openvpn[master]: PUSH_UPDATE: Added update_option() function. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mrbff Cc: stipa , plaisthos , flichtenheld , openvpn-devel --JbNPcc07iyY= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/81= 0?usp=3Demail ) 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 already present for that option first. Change-Id: Ia45c99e6df7b3ad24020c10b8a9b3577984ecdc2 Signed-off-by: Marco Baffo Acked-by: Gert Doering Message-Id: <20250729104110.27704-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 408.html Signed-off-by: Gert Doering --- M src/openvpn/options.c 1 file changed, 331 insertions(+), 124 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 469360d..b7328d7 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -5360,6 +5360,20 @@ struct env_set *es); 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); + +static void read_config_file(struct options *options, const char *file, int level, @@ -5545,6 +5559,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))) { @@ -5590,6 +5605,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; @@ -5728,6 +5748,13 @@ return options->forward_compatible ? M_WARN : msglevel; } +#define RESET_OPTION_ROUTES(option_ptr, field) \ + if (option_ptr) \ + { \ + option_ptr->field =3D NULL; \ + option_ptr->flags =3D 0; \ + } + /** * @brief Resets options found in the PUSH_UPDATE message that are precede= d by the `-` flag. * This function is used in push-updates to reset specified options. @@ -5782,11 +5809,7 @@ delete_routes_v4(c->c1.route_list, c->c1.tuntap, ROUTE_OPTION_FLAGS(&c->options), es, &c->net_ctx); - if (options->routes) - { - options->routes->routes =3D NULL; - options->routes->flags =3D 0; - } + RESET_OPTION_ROUTES(options->routes, routes); } } else if (streq(p[0], "route-ipv6") && !p[1]) @@ -5797,11 +5820,7 @@ delete_routes_v6(c->c1.route_ipv6_list, c->c1.tuntap, ROUTE_OPTION_FLAGS(&c->options), es, &c->net_ctx); - if (options->routes_ipv6) - { - options->routes_ipv6->routes_ipv6 =3D NULL; - options->routes_ipv6->flags =3D 0; - } + RESET_OPTION_ROUTES(options->routes_ipv6, routes_ipv6); } } else if (streq(p[0], "route-gateway") && !p[1]) @@ -5921,6 +5940,303 @@ msg(msglevel, "Error occurred trying to remove %s option", p[0]); } + +static bool +check_route_option(struct options *options, char *p[], const int msglevel,= bool pull_mode) +{ + rol_check_alloc(options); + if (pull_mode) + { + if (!ip_or_dns_addr_safe(p[1], options->allow_pull_fqdn) && !is_sp= ecial_addr(p[1])) /* FQDN -- may be DNS name */ + { + msg(msglevel, "route parameter network/IP '%s' must be a valid= address", p[1]); + return false; + } + if (p[2] && !ip_addr_dotted_quad_safe(p[2])) /* FQDN -- must be IP= address */ + { + msg(msglevel, "route parameter netmask '%s' must be an IP addr= ess", p[2]); + return false; + } + 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 ad= dress", p[3]); + return false; + } + } + return true; +} + + +static bool +check_route6_option(struct options *options, char *p[], const int msglevel= , bool pull_mode) +{ + 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 = valid address", p[1]); + return false; + } + if (p[2] && !ipv6_addr_safe(p[2])) + { + msg(msglevel, "route-ipv6 parameter gateway '%s' must be a val= id address", p[2]); + return false; + } + /* p[3] is metric, if present */ + } + return true; +} + +static bool +check_dns_option(struct options *options, char *p[], const int msglevel, b= ool pull_mode) +{ + if (streq(p[1], "search-domains") && p[2]) + { + dns_domain_list_append(&options->dns_options.search_domains, &p[2]= , &options->dns_options.gc); + } + else 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= ]); + return false; + } + + struct dns_server *server =3D dns_server_get(&options->dns_options= .servers, priority, &options->dns_options.gc); + + 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 address or = maximum exceeded '%s'", priority, p[i]); + return false; + } + } + } + else if (streq(p[3], "resolve-domains")) + { + dns_domain_list_append(&server->domains, &p[4], &options->dns_= options.gc); + } + else if (streq(p[3], "dnssec") && !p[5]) + { + if (streq(p[4], "yes")) + { + server->dnssec =3D DNS_SECURITY_YES; + } + else if (streq(p[4], "no")) + { + server->dnssec =3D DNS_SECURITY_NO; + } + else if (streq(p[4], "optional")) + { + server->dnssec =3D DNS_SECURITY_OPTIONAL; + } + else + { + msg(msglevel, "--dns server %ld: malformed dnssec value '%= s'", priority, p[4]); + return false; + } + } + else if (streq(p[3], "transport") && !p[5]) + { + if (streq(p[4], "plain")) + { + server->transport =3D DNS_TRANSPORT_PLAIN; + } + else if (streq(p[4], "DoH")) + { + server->transport =3D DNS_TRANSPORT_HTTPS; + } + else if (streq(p[4], "DoT")) + { + server->transport =3D DNS_TRANSPORT_TLS; + } + else + { + msg(msglevel, "--dns server %ld: malformed transport value= '%s'", priority, p[4]); + return false; + } + } + else if (streq(p[3], "sni") && !p[5]) + { + server->sni =3D p[4]; + } + else + { + msg(msglevel, "--dns server %ld: unknown option type '%s' or m= issing or unknown parameter", priority, p[3]); + return false; + } + } + else + { + msg(msglevel, "--dns: unknown option type '%s' or missing or unkno= wn parameter", p[1]); + return false; + } + return true; +} + +/** + * @brief Processes an option to update. It first checks whether it has al= ready + * received an option of the same type within the same update messa= ge. + * If the option has already been received, it calls add_option(). + * Otherwise, it deletes all existing values related to that option= before calling add_option(). + * + * @param c The context structure. + * @param options A pointer to the options structure. + * @param p An array of strings containing the options and their parameter= s. + * @param is_inline A boolean indicating if the option is inline. + * @param file The file where the function is called. + * @param line The line number where the function is called. + * @param level The level of the option. + * @param msglevel The message level for logging. + * @param permission_mask The permission mask used by VERIFY_PERMISSION(). + * @param option_types_found A pointer to the variable where the flags cor= responding to the options found are stored. + * @param es The environment set structure. + * @param update_options_found A pointer to the variable where the flags c= orresponding to the update options found are stored, + * used to check if an option of the same type= has already been processed by update_option() within the same push-update = message. + */ +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); + if (!check_route_option(options, p, msglevel, pull_mode)) + { + goto err; + } + if (c->c1.route_list) + { + delete_routes_v4(c->c1.route_list, c->c1.tuntap, + ROUTE_OPTION_FLAGS(&c->options), + es, &c->net_ctx); + RESET_OPTION_ROUTES(options->routes, routes); + } + *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); + if (!check_route6_option(options, p, msglevel, pull_mode)) + { + goto err; + } + if (c->c1.route_ipv6_list) + { + delete_routes_v6(c->c1.route_ipv6_list, c->c1.tuntap, + ROUTE_OPTION_FLAGS(&c->options), + es, &c->net_ctx); + RESET_OPTION_ROUTES(options->routes_ipv6, routes_ipv6); + } + *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 (!check_dns_option(options, p, msglevel, pull_mode)) + { + 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]); +} + static void set_user_script(struct options *options, const char **script, @@ -7284,45 +7600,18 @@ else if (streq(p[0], "route") && p[1] && !p[5]) { VERIFY_PERMISSION(OPT_P_ROUTE); - rol_check_alloc(options); - if (pull_mode) + if (!check_route_option(options, p, msglevel, pull_mode)) { - if (!ip_or_dns_addr_safe(p[1], options->allow_pull_fqdn) && !i= s_special_addr(p[1])) /* FQDN -- may be DNS name */ - { - msg(msglevel, "route parameter network/IP '%s' must be a v= alid address", p[1]); - goto err; - } - if (p[2] && !ip_addr_dotted_quad_safe(p[2])) /* FQDN -- must b= e 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_fqd= n) && !is_special_addr(p[3])) /* FQDN -- may be DNS name */ - { - msg(msglevel, "route parameter gateway '%s' must be a vali= d address", p[3]); - goto err; - } - /* p[4] is metric, if specified */ + goto err; } add_route_to_option_list(options->routes, p[1], p[2], p[3], p[4], = options->route_default_table_id); } else if (streq(p[0], "route-ipv6") && p[1] && !p[4]) { VERIFY_PERMISSION(OPT_P_ROUTE); - rol6_check_alloc(options); - if (pull_mode) + if (!check_route6_option(options, p, msglevel, pull_mode)) { - if (!ipv6_addr_safe_hexplusbits(p[1])) - { - msg(msglevel, "route-ipv6 parameter network/IP '%s' must b= e 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 specified */ + goto err; } add_route_ipv6_to_option_list(options->routes_ipv6, p[1], p[2], p[= 3], options->route_default_table_id); } @@ -8410,90 +8699,8 @@ else if (streq(p[0], "dns") && p[1]) { VERIFY_PERMISSION(OPT_P_DHCPDNS); - - if (streq(p[1], "search-domains") && p[2]) + if (!check_dns_option(options, p, msglevel, pull_mode)) { - dns_domain_list_append(&options->dns_options.search_domains, &= p[2], &options->dns_options.gc); - } - else 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 =3D dns_server_get(&options->dns_opt= ions.servers, priority, &options->dns_options.gc); - - 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 address= or maximum exceeded '%s'", priority, p[i]); - goto err; - } - } - } - else if (streq(p[3], "resolve-domains")) - { - dns_domain_list_append(&server->domains, &p[4], &options->= dns_options.gc); - } - else if (streq(p[3], "dnssec") && !p[5]) - { - if (streq(p[4], "yes")) - { - server->dnssec =3D DNS_SECURITY_YES; - } - else if (streq(p[4], "no")) - { - server->dnssec =3D DNS_SECURITY_NO; - } - else if (streq(p[4], "optional")) - { - server->dnssec =3D DNS_SECURITY_OPTIONAL; - } - else - { - msg(msglevel, "--dns server %ld: malformed dnssec valu= e '%s'", priority, p[4]); - goto err; - } - } - else if (streq(p[3], "transport") && !p[5]) - { - if (streq(p[4], "plain")) - { - server->transport =3D DNS_TRANSPORT_PLAIN; - } - else if (streq(p[4], "DoH")) - { - server->transport =3D DNS_TRANSPORT_HTTPS; - } - else if (streq(p[4], "DoT")) - { - server->transport =3D DNS_TRANSPORT_TLS; - } - else - { - msg(msglevel, "--dns server %ld: malformed transport v= alue '%s'", priority, p[4]); - goto err; - } - } - else if (streq(p[3], "sni") && !p[5]) - { - server->sni =3D p[4]; - } - else - { - msg(msglevel, "--dns server %ld: unknown option type '%s' = or missing or unknown parameter", priority, p[3]); - goto err; - } - } - else - { - msg(msglevel, "--dns: unknown option type '%s' or missing or u= nknown parameter", p[1]); goto err; } } -- 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: 24 Gerrit-Owner: mrbff Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-Reviewer: stipa Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --JbNPcc07iyY= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

PUSH_UPDATE: Added update_option() function.
When the function receives an option to update, it first checks wheth= er it has
already received an option of the same type within the same up= date message.
If it has already received it, it simply calls add_option(= ), otherwise it
deletes all the values already present for that option f= irst.

Change-Id: Ia45c99e6df7b3ad24020c10b8a9b3577984ecdc2
Signed= -off-by: Marco Baffo <marco@...2726...>
Acked-by: Gert Doering <= ;gert@...1296...>
Message-Id: <20250729104110.27704-1-gert@...1726...= ...>
URL: https://www.mail-archive.com/openvpn-devel@...1483...= e.net/msg32408.html
Signed-off-by: Gert Doering <gert@...1296...><= br>---
M src/openvpn/options.c
1 file changed, 331 insertions(+), 124= deletions(-)

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 469360d..b7328d7 100644
--- a/src/openvpn/options.= c
+++ b/src/openvpn/options.c
@@ -5360,6 +5= 360,20 @@
struct env_set *es);

static void
+update_option(struct context *c,
+ struct options *options,+ char *p[],
+ bool is_in= line,
+ = const char *file,
+ = int line,
+ const int level,
+ const int msglevel,
+ const unsigned int permission_mask= ,
+ unsi= gned int *option_types_found,
+ struct env_set *es,
+ unsigned int *update_options_found);<= /span>
+
+static void
read_confi= g_file(struct options *options,
const cha= r *file,
int level,
@@ -5= 545,6 +5559,7 @@
int line_num =3D 0;
= const char *file =3D "[PUSH-OPTIONS]";
c= onst int msglevel =3D D_PUSH_ERRORS|M_OPTERR;
+ unsigned int update_options_found =3D 0;

while (buf_parse(buf, ',', line,= sizeof(line)))
{
@@ -5590,6 +5605,11 = @@
remove_option(c, options, p, false, fil= e, line_num, msglevel,
permi= ssion_mask, option_types_found, es);
}<= br>+ else
= + {
+ update_option(c, opt= ions, p, false, file, line_num, 0, msglevel,
+ permission_mask, opt= ion_types_found, es, &update_options_found);
+ }
}
}
return true;
@@ -572= 8,6 +5748,13 @@
return options->forward_compatible = ? M_WARN : msglevel;
}

+#define RESET_OPTION_ROUTES(option_pt= r, field) \
+ if (= option_ptr) \
+ { \
+ option_ptr->field =3D = NULL; \

+ = option_ptr->flags =3D 0; \
+ }
+
/**
* @brief Resets option= s found in the PUSH_UPDATE message that are preceded by the `-` flag.
* This function is used in push-updates to reset specif= ied options.
@@ -5782,11 +5809,7 @@
= delete_routes_v4(c->c1.route_list, c->c1.tuntap,
ROUTE_OPTION_FLAGS(&c->options),

es, &c->net_ctx);<= br>- if (options->r= outes)
- {
- options= ->routes->routes =3D NULL;
- options->routes->flags =3D 0;
- }

+ RESET_OPTION_ROUTES(options-= >routes, routes);
}
}
else if (streq(p[0], "route-ipv6") && !p= [1])
@@ -5797,11 +5820,7 @@
de= lete_routes_v6(c->c1.route_ipv6_list, c->c1.tuntap,
= ROUTE_OPTION_FLAGS(&c->options),=
es, &c->net_ctx);
= - if (options->rout= es_ipv6)
- {=
- optio= ns->routes_ipv6->routes_ipv6 =3D NULL;
- options->routes_ipv6->flags = =3D 0;
- }
+ RESET_OPT= ION_ROUTES(options->routes_ipv6, routes_ipv6);
= }
}
else if (streq(p[0], "ro= ute-gateway") && !p[1])
@@ -5921,6 +5940,303 @= @
msg(msglevel, "Error occurred trying to remove = %s option", p[0]);
}

+

+static bool
+check_route_option(struct options *options, char *p[], const = int msglevel, bool pull_mode)
+{
+ rol_= check_alloc(options);
+ if (pull_mode)
= + {
+ if (!= ip_or_dns_addr_safe(p[1], options->allow_pull_fqdn) && !is_speci= al_addr(p[1])) /* FQDN -- may be DNS name */
+ {
+ msg(msglevel, "route parameter network/IP &= #39;%s' must be a valid address", p[1]);
+ return false;
+ }
+ if (p[2] && !ip_addr_dotted_quad_= safe(p[2])) /* FQDN -- must be IP address */
+ {
+ msg(msglevel, "route parameter netmask '= ;%s' must be an IP address", p[2]);
+ return false;
+ }
+ 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]);
+ return false;
+ }
+ = }
+ return true;=
+}
+
+
+= static bool
+check_ro= ute6_option(struct options *options, char *p[], const int msglevel, bool pu= ll_mode)
+{+ rol6_check_alloc(options)= ;
+ if (pull_mode)=
+ {
+ if (!ipv6_addr_safe_hexpl= usbits(p[1]))

+ = {
+ msg(= msglevel, "route-ipv6 parameter network/IP '%s' must be a vali= d address", p[1]);
+ return false;
+ }
+= if (p[2] && !ipv6_addr_safe(p[2]))
+ {
+ msg(msglevel, "route-ipv6 parameter g= ateway '%s' must be a valid address", p[2]);
+ return false;
<= span style=3D"color: hsl(120, 100%, 40%);">+ }
+ /* p[3] is metric, if present */<= /span>
+ }
+ return true;

+}
+
= +static bool
+check_d= ns_option(struct options *options, char *p[], const int msglevel, bool pull= _mode)
+{
<= span style=3D"color: hsl(120, 100%, 40%);">+ if (streq(p[1], "searc= h-domains") && p[2])
+ {
+= dns_domain_list_append(&options->dns_options.search_domains,= &p[2], &options->dns_options.gc);
+ }
+ else if (streq(p[1], "server") && p[2] &a= mp;& 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]);
+ return false;=
+ }
+
+ struct dns_server *server =3D dns_server_get(&a= mp;options->dns_options.servers, priority, &options->dns_options.= gc);
+
+ if (streq(p[3], "addr= ess") && p[4])
+ {
+ = for (int i =3D 4; p[i]; ++i)
+ {
+ if (!dns_server_addr_parse(server, p[i]))

+ {=
+ msg(ms= glevel, "--dns server %ld: malformed address or maximum exceeded '= %s'", priority, p[i]);
+ return false;
+ }
+ }
+ }
+ else if (streq(p[3], "resolve-domains"))+ {
+ dns_domain_list_append(&am= p;server->domains, &p[4], &options->dns_options.gc);+ }
+ else if (streq(p[3], "dns= sec") && !p[5])
+ {
+ = if (streq(p[4], "yes"))
+ {
+ server->dnssec =3D DNS_SECURITY_YES;<= /span>
+ }=
+ else if (streq= (p[4], "no"))
+ {
+ = server->dnssec =3D DNS_SECURITY_NO;
+ }
+ else if (streq(p[4], "optional= "))
+ = {
+ s= erver->dnssec =3D DNS_SECURITY_OPTIONAL;
+ }
+ else
+ {
+ msg(msglevel, "--dns server %ld: malformed dn= ssec value '%s'", priority, p[4]);
+ return false;
+ }
+ }
+ else if (streq(p[3], "transport")= && !p[5])
+ = {
+ = if (streq(p[4], "plain"))
+ {
+ server->transport =3D DNS_TRANSPORT_PLAIN;

+ }+ else if (streq(p= [4], "DoH"))
+ = server->transport =3D DNS_TRANSPORT_HTTPS;
+ }
+ else if (streq(p[4], "Do= T"))
+ = {
+ = server->transport =3D DNS_TRANSPORT_TLS;
+ }
+ else
+ {
+ msg(msglevel, "--dns server %ld: malformed tr= ansport value '%s'", priority, p[4]);
+ return false;
+ }
+ }
+ else if (streq(p[3], "sni") &= ;& !p[5])
+ = {
+ serv= er->sni =3D p[4];
= + }
+ e= lse
+ {=
+ msg(msglevel, = "--dns server %ld: unknown option type '%s' or missing or unkn= own parameter", priority, p[3]);
+ return false;
+ }
+ }
+= else
+ {
+ msg(msglevel, &qu= ot;--dns: unknown option type '%s' or missing or unknown parameter&= quot;, p[1]);
+ = return false;
+ = }
+ return true;
+}
+
+/**
= + * @brief Processes an option to update. It first checks whether it has al= ready
+ * rece= ived an option of the same type within the same update message.
<= span style=3D"color: hsl(120, 100%, 40%);">+ * If the option has alr= eady been received, it calls add_option().

+ * Otherwise, it deletes all existing values = related to that option before calling add_option().
+ *
+ * @param c The context structure.
+ * @param options A pointer to the option= s structure.
+ * @par= am p An array of strings containing the options and their parameters.
+ * @param is_inline A boo= lean indicating if the option is inline.
+ * @param file The file where the function is called.<= /span>
+ * @param line The l= ine number where the function is called.
+ * @param level The level of the option.
+ * @param msglevel The message le= vel for logging.

+ * = @param permission_mask The permission mask used by VERIFY_PERMISSION().

+ * @param option_types_= found A pointer to the variable where the flags corresponding to the option= s found are stored.
+= * @param es The environment set structure.
+ * @param update_options_found A pointer to the var= iable where the flags corresponding to the update options found are stored,=
+ * = used to check if an option of the same type has already been pr= ocessed by update_option() within the same push-update message.
<= span style=3D"color: hsl(120, 100%, 40%);">+ */
+static void
+update_option(struct context *c,
+ struct options *options,
+ char *p[= ],
+ boo= l is_inline,
+ = const char *file,
+ int line,
+ const int level,
+ const int msglevel,
+ const unsigned int permissi= on_mask,
+ = unsigned int *option_types_found,
+ struct env_set *es,
+ unsigned int *update_options_f= ound)
+{
+ const bool pull_mode =3D BOO= L_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);
+ if (!check_route_option(op= tions, p, msglevel, pull_mode))
+ {
+ goto err;
+ }
+ if (c->c1.route_list)
+ {
+ delete_routes_v4(c->c1.route_list, c-&g= t;c1.tuntap,
+ = ROUTE_OPTION_FLAGS(&c->options),+ = es, &c->net_ctx);
+ RESET_OPTION_ROUTES(options->routes, routes);
+ }<= br>+ *update_options= _found |=3D OPT_P_U_ROUTE;
+ }
+ = }
+ else if (stre= q(p[0], "route-ipv6") && p[1] && !p[4])+ {
+ if (!(*update_options_found &= OPT_P_U_ROUTE6))
+ = {
+ = VERIFY_PERMISSION(OPT_P_ROUTE);
+ if (!check_route6_option(options, p, msglevel, pull= _mode))
+ = {
+ go= to err;
+ = }
+ if (c-= >c1.route_ipv6_list)
+ {
+ = delete_routes_v6(c->c1.route_ipv6_list, c->c1.tuntap,
+ = ROUTE_OPTION_FLAGS(&c->options),
+ es, &= ;c->net_ctx);
+ = RESET_OPTION_ROUTES(options->routes_ipv6, routes_ipv6);

+ }+ *update_options_f= ound |=3D OPT_P_U_ROUTE6;
+ }
+ = }
+ else if (streq= (p[0], "redirect-gateway") || streq(p[0], "redirect-private&= quot;))
+ {=
+ if (!(*update_opti= ons_found & OPT_P_U_REDIR_GATEWAY))
+ {
+ VERIFY_PERMISSION(OPT_P_ROUTE);
+ if (options->routes)
+ {
<= span style=3D"color: hsl(120, 100%, 40%);">+ options->rou= tes->flags =3D 0;

= + }
+ = if (options->routes_ipv6)
+ {
+ options->routes_ipv6->flags =3D 0;+ }
+ *update_options_found = |=3D OPT_P_U_REDIR_GATEWAY;
+ }
+ = }
+ else if (str= eq(p[0], "dns") && p[1])
+ {
+ if (!(*update_options_found & OPT_P_U_DNS))
= + {
+ VERIFY_PERMISSION(OPT_P_DHCP= DNS);
+ if= (!check_dns_option(options, p, msglevel, pull_mode))
+ {
+ goto err;
+ }
+ gc_free(&options->dns_option= s.gc);
+ C= LEAR(options->dns_options);
+ *update_options_found |=3D OPT_P_U_DNS;
+ }
+ }
+#if defined(_WIN32) || defined(TARGET_ANDROID)+ else if (streq(p[0], &qu= ot;dhcp-option") && p[1] && !p[3])
+ {
+ if (!(*update_options_found & OPT_P_U_DHC= P))
+ {=
+ 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;<= /span>
+ CLEAR(o-= >nbdd);
+ = while (o->domain_search_list_len-- > 0)
+ {
+ o->domain_search_list[o->domai= n_search_list_len] =3D NULL;
+ }
+ 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_PERMISSIO= N(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, per= mission_mask,

+ = option_types_found, es);
+ return;
+err:
+ msg(m= sglevel, "Error occurred trying to update %s option", p[0]);

+}
+
static void
<= span> set_user_script(struct options *options,
= const char **script,
@@ -7284,45 +7600,18 @@ else if (streq(p[0], "route") && p[1] &&a= mp; !p[5])
{
VERIFY_PERMISSIO= N(OPT_P_ROUTE);
- = rol_check_alloc(options);
- if (pull_mode)
+ if (!check_route_option(options, p, msglevel, pull_mode))<= /span>
{
- if (!ip_or_dns_addr_safe(p[1], options->allow_pull_fqdn= ) && !is_special_addr(p[1])) /* FQDN -- may be DNS name */- {
- msg(msglevel, "ro= ute parameter 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, &q= uot;route parameter netmask '%s' must be an IP address", p[2])= ;
- goto= err;
- }
- if (p[3] &am= p;& !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;

<= span style=3D"color: hsl(0, 100%, 40%);">- }

- /* p[4] is metric, if specifi= ed */
+ go= to err;
}
add_route_to_op= tion_list(options->routes, p[1], p[2], p[3], p[4], options->route_def= ault_table_id);
}
else if (streq(= p[0], "route-ipv6") && p[1] && !p[4])
<= span> {

VERIFY_PERMISSION(OPT_P_ROUTE);=
- rol6_check_alloc(opt= ions);
- if (pul= l_mode)
+ if (= !check_route6_option(options, p, msglevel, pull_mode))
= {
- if = (!ipv6_addr_safe_hexplusbits(p[1]))
- {
- msg(msglevel, "route-ipv6 parameter network/IP &= #39;%s' must be a valid address", p[1]);
- goto err;
- }
- if (p[2] && !ipv6_addr_safe(p[2= ]))
- {
- msg(msglev= el, "route-ipv6 parameter gateway '%s' must be a valid address= ", p[2]);
- = goto err;
- = }
- = /* p[3] is metric, if specified */
+ goto err;
}
= add_route_ipv6_to_option_list(options->routes_ipv6, p[1],= p[2], p[3], options->route_default_table_id);
}
@@ -8410,90 +8699,8 @@
else if (streq(p[= 0], "dns") && p[1])
{
VERIFY_PERMISSION(OPT_P_DHCPDNS);

-
- if (streq(p[1], "search-domains") && p[2])
+ if (!check_dns_o= ption(options, p, msglevel, pull_mode))
{- dns_domain_list_ap= pend(&options->dns_options.search_domains, &p[2], &options-&= gt;dns_options.gc);
- = }
- else i= f (streq(p[1], "server") && p[2] && p[3] &&am= p; 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 =3D dns_server_get(&options-&= gt;dns_options.servers, priority, &options->dns_options.gc);<= br>-
- if (streq(p[3], "address") &= amp;& p[4])
- = {
- = for (int i =3D 4; p[i]; ++i)
- {
- if (!dns_server_addr_parse(server, p[i]))- {- msg(ms= glevel, "--dns server %ld: malformed address or maximum exceeded '= %s'", priority, p[i]);
- goto err;
- }
- }
- }
- else if (streq(p[3], "resolve-domains"))
- {
= - dns_domain_list_= append(&server->domains, &p[4], &options->dns_options.gc)= ;
- }=
- else if (streq(p= [3], "dnssec") && !p[5])
- {
- if (streq(p[4], "yes"))
- {

- server->dnssec = =3D DNS_SECURITY_YES;
-= }
- = else if (streq(p[4], "no"))
- {
- server->dnssec =3D DNS_SECUR= ITY_NO;
- = }
- el= se if (streq(p[4], "optional"))
- {
- server->dnssec =3D DNS_SECURITY_OPTI= ONAL;
- = }
- else=
- {
- msg(m= sglevel, "--dns server %ld: malformed dnssec value '%s'",= priority, p[4]);
- = goto err;
- }
-= }
- = else if (streq(p[3], "transport") && !p[5])- {
- if (streq(p[4], "p= lain"))
- = {
- = server->transport =3D DNS_TRANSPORT_PLAIN;
- }
- else if (streq(p[4], "DoH&= quot;))
- = {
- = server->transport =3D DNS_TRANSPORT_HTTPS;
- }
- else if (streq(p[4], "DoT")= )
- {
- serv= er->transport =3D DNS_TRANSPORT_TLS;
- }
- else
- {
- msg(msglevel, "--dns server %ld: malforme= d transport value '%s'", priority, p[4]);
- goto err;
- }

- }
- else if (streq(p[3], "sni&quo= t;) && !p[5])
-= {
- = server->sni =3D p[4];
- }
- = {
- = msg(msglevel, "--dns server %ld: unknown option type '%s'= ; or missing or unknown parameter", priority, p[3]);
- goto err;
- }

- }
- else
- {
- = msg(msglevel, "--dns: unknown option type '%s' or m= issing or unknown parameter", p[1]);
goto= err;
}
}

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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia45c99e6df7b3ad24020c10b8a9= b3577984ecdc2
Gerrit-Change-Number: 810
Gerrit-PatchSet: 24
Gerrit-Owner: mrbff <marco@...2726...> <= /div>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-Reviewer: stipa <lstipakov@...277...= >
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--JbNPcc07iyY=--