From: "cron2 (Code Review)" Date: Wed, 29 Jan 2025 16:47:02 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., gianmarco@...2726..., openvpn-devel@lists.sourceforge.net, frank@...2641..., a@...2181... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="zquMXQ8Id8A="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: mroute/management: repair mgmt client-kill for mroute with proto List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: its_Giaan Cc: plaisthos , flichtenheld , openvpn-devel --zquMXQ8Id8A= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/88= 0?usp=3Demail ) Change subject: mroute/management: repair mgmt client-kill for mroute with = proto ...................................................................... mroute/management: repair mgmt client-kill for mroute with proto Fix issue reported by Coverity: CID 1641564: Uninitialized variables (UNINIT) Using unitialized value "maddr.proto" when calling "mroute_addr_equal()". Due to changes at the mroute structure which now includes the protocol, the mgmt iface client-kill-by-addr feature has been updated to include this new value along with IP:port. While at it, changed the mroute_addr_print_ex() format to display the protocol only in case of MR_WITH_PROTO avoid doing it on virtual addresses when MR_WITH_PORT is not specified. Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1 Signed-off-by: Gianmarco De Gregori Acked-by: Gert Doering Message-Id: <20250129161609.19202-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg30= 716.html Signed-off-by: Gert Doering --- M Changes.rst M doc/management-notes.txt M src/openvpn/manage.c M src/openvpn/manage.h M src/openvpn/mroute.c M src/openvpn/mroute.h M src/openvpn/mtcp.c M src/openvpn/multi.c 8 files changed, 49 insertions(+), 15 deletions(-) diff --git a/Changes.rst b/Changes.rst index 16ae6fc..d01816b 100644 --- a/Changes.rst +++ b/Changes.rst @@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as this almost always results in a non-working connection. +- The "kill" by addr management command now requires also the protocol + as string e.g. "udp", "tcp". + Common errors with OpenSSL 3.0 and OpenVPN 2.6 ---------------------------------------------- Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some diff --git a/doc/management-notes.txt b/doc/management-notes.txt index b55135a..f1d2930 100644 --- a/doc/management-notes.txt +++ b/doc/management-notes.txt @@ -205,8 +205,12 @@ kill Test-Client -- kill the client instance having a common name of "Test-Client". - kill 1.2.3.4:4000 -- kill the client instance having a - source address and port of 1.2.3.4:4000 + kill tcp:1.2.3.4:4000 -- kill the client instance having a + source address, port and proto of + tcp:1.2.3.4:4000 + + Note that kill by address won't work for IPv6-connected + clients yet, so rely on kill by CN or CID instead. Use the "status" command to see which clients are connected. diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 0c77f85..484042a 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -544,45 +544,52 @@ struct buffer buf; char p1[128]; char p2[128]; + char p3[128]; int n_killed; buf_set_read(&buf, (uint8_t *) victim, strlen(victim) + 1); buf_parse(&buf, ':', p1, sizeof(p1)); buf_parse(&buf, ':', p2, sizeof(p2)); + buf_parse(&buf, ':', p3, sizeof(p3)); - if (strlen(p1) && strlen(p2)) + if (strlen(p1) && strlen(p2) && strlen(p3)) { /* IP:port specified */ bool status; - const in_addr_t addr =3D getaddr(GETADDR_HOST_ORDER|GETADDR_MS= G_VIRT_OUT, p1, 0, &status, NULL); + const in_addr_t addr =3D getaddr(GETADDR_HOST_ORDER|GETADDR_MS= G_VIRT_OUT, p2, 0, &status, NULL); if (status) { - const int port =3D atoi(p2); - if (port > 0 && port < 65536) + const int port =3D atoi(p3); + const int proto =3D (streq(p1, "tcp")) ? PROTO_TCP_SERVER : + (streq(p1, "udp")) ? PROTO_UDP : PROTO_N= ONE; + + if ((port > 0 && port < 65536) && (proto !=3D PROTO_NONE)) { - n_killed =3D (*man->persist.callback.kill_by_addr)(man= ->persist.callback.arg, addr, port); + n_killed =3D (*man->persist.callback.kill_by_addr)(man= ->persist.callback.arg, addr, port, proto); if (n_killed > 0) { - msg(M_CLIENT, "SUCCESS: %d client(s) at address %s= :%d killed", + msg(M_CLIENT, "SUCCESS: %d client(s) at address %s= :%s:%d killed", n_killed, + proto2ascii(proto, AF_UNSPEC, false), print_in_addr_t(addr, 0, &gc), port); } else { - msg(M_CLIENT, "ERROR: client at address %s:%d not = found", + msg(M_CLIENT, "ERROR: client at address %s:%s:%d n= ot found", + proto2ascii(proto, AF_UNSPEC, false), print_in_addr_t(addr, 0, &gc), port); } } else { - msg(M_CLIENT, "ERROR: port number is out of range: %s"= , p2); + msg(M_CLIENT, "ERROR: port number or protocol out of r= ange: %s %s", p3, p1); } } else { - msg(M_CLIENT, "ERROR: error parsing IP address: %s", p1); + msg(M_CLIENT, "ERROR: error parsing IP address: %s", p2); } } else if (strlen(p1)) diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h index f501543..02ceb82 100644 --- a/src/openvpn/manage.h +++ b/src/openvpn/manage.h @@ -180,7 +180,7 @@ void (*status) (void *arg, const int version, struct status_output *so= ); void (*show_net) (void *arg, const int msglevel); int (*kill_by_cn) (void *arg, const char *common_name); - int (*kill_by_addr) (void *arg, const in_addr_t addr, const int port); + int (*kill_by_addr) (void *arg, const in_addr_t addr, const int port, = const int proto); void (*delete_event) (void *arg, event_t event); int (*n_clients) (void *arg); bool (*send_cc_message) (void *arg, const char *message, const char *p= arameter); diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c index 74923cf..24b9543 100644 --- a/src/openvpn/mroute.c +++ b/src/openvpn/mroute.c @@ -276,6 +276,10 @@ addr->len =3D 6; addr->v4.addr =3D osaddr->addr.in4.sin_addr.s_addr; addr->v4.port =3D osaddr->addr.in4.sin_port; + if (addr->proto !=3D PROTO_NONE) + { + addr->type |=3D MR_WITH_PROTO; + } } else { @@ -295,6 +299,10 @@ addr->len =3D 18; addr->v6.addr =3D osaddr->addr.in6.sin6_addr; addr->v6.port =3D osaddr->addr.in6.sin6_port; + if (addr->proto !=3D PROTO_NONE) + { + addr->type |=3D MR_WITH_PROTO; + } } else { @@ -403,6 +411,10 @@ { buf_printf(&out, "ARP/"); } + if (maddr.type & MR_WITH_PROTO) + { + buf_printf(&out, "%s:", proto2ascii(maddr.proto, AF_IN= ET, false)); + } buf_printf(&out, "%s", print_in_addr_t(ntohl(maddr.v4.addr= ), (flags & MAPF_IA_EM= PTY_IF_UNDEF) ? IA_EMPTY_IF_UNDEF : 0, gc)); if (maddr.type & MR_WITH_NETBITS) @@ -426,6 +438,10 @@ case MR_ADDR_IPV6: { + if (maddr.type & MR_WITH_PROTO) + { + buf_printf(&out, "%s:", proto2ascii(maddr.proto, AF_IN= ET6, false)); + } if (IN6_IS_ADDR_V4MAPPED( &maddr.v6.addr ) ) { buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv= 6.addr, @@ -454,7 +470,6 @@ buf_printf(&out, "UNKNOWN"); break; } - buf_printf(&out, "|%d", maddr.proto); return BSTR(&out); } else diff --git a/src/openvpn/mroute.h b/src/openvpn/mroute.h index 2659695..fbe102a 100644 --- a/src/openvpn/mroute.h +++ b/src/openvpn/mroute.h @@ -72,6 +72,9 @@ /* Indicates than IPv4 addr was extracted from ARP packet */ #define MR_ARP 16 +/* Address type mask indicating that proto # is part of address */ +#define MR_WITH_PROTO 32 + struct mroute_addr { uint8_t len; /* length of address */ uint8_t proto; diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 62ed044..9a8b1cb 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -111,6 +111,7 @@ ASSERT(mi->context.c2.link_sockets[0]->info.lsa->actual.dest.addr.sa.s= a_family =3D=3D AF_INET || mi->context.c2.link_sockets[0]->info.lsa->actual.dest.addr.s= a.sa_family =3D=3D AF_INET6 ); + mi->real.proto =3D mi->context.c2.link_sockets[0]->info.proto; if (!mroute_extract_openvpn_sockaddr(&mi->real, &mi->context.c2.link_sockets[0]->= info.lsa->actual.dest, true)) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 9c8c014..b0e1941 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -794,7 +794,6 @@ { goto err; } - mi->real.proto =3D ls->info.proto; generate_prefix(mi); } @@ -3942,7 +3941,8 @@ } static int -management_callback_kill_by_addr(void *arg, const in_addr_t addr, const in= t port) +management_callback_kill_by_addr(void *arg, const in_addr_t addr, + const int port, const int proto) { struct multi_context *m =3D (struct multi_context *) arg; struct hash_iterator hi; @@ -3957,6 +3957,7 @@ saddr.addr.in4.sin_port =3D htons(port); if (mroute_extract_openvpn_sockaddr(&maddr, &saddr, true)) { + maddr.proto =3D proto; hash_iterator_init(m->iter, &hi); while ((he =3D hash_iterator_next(&hi))) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?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: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1 Gerrit-Change-Number: 880 Gerrit-PatchSet: 7 Gerrit-Owner: its_Giaan Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-CC: ordex Gerrit-MessageType: merged --zquMXQ8Id8A= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

mroute/management: repair mgmt client-kill for=
 mroute with proto

Fix issue reported by Coverity:
CID 1641564: U= ninitialized variables (UNINIT)
Using unitialized value "maddr.prot= o" when
calling "mroute_addr_equal()".

Due to chan= ges at the mroute structure
which now includes the protocol, the mgmtiface client-kill-by-addr feature has been
updated to include this new = value along
with IP:port.

While at it, changed the
mroute_addr= _print_ex() format to display
the protocol only in case of MR_WITH_PROTO=
avoid doing it on virtual addresses when
MR_WITH_PORT is not specifi= ed.

Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Signed-o= ff-by: Gianmarco De Gregori <gianmarco@...2726...>
Acked-by: Gert = Doering <gert@...1296...>
Message-Id: <20250129161609.19202-1-g= ert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@...1697...= .sourceforge.net/msg30716.html
Signed-off-by: Gert Doering <gert@...1386...= 296...>
---
M Changes.rst
M doc/management-notes.txt
M src/o= penvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/mroute.c
M sr= c/openvpn/mroute.h
M src/openvpn/mtcp.c
M src/openvpn/multi.c
8 fi= les changed, 49 insertions(+), 15 deletions(-)

diff --git a/Changes.rst b/Changes.rst
index 16ae6fc..d0= 1816b 100644
--- a/Changes.rst
+++ b/Change= s.rst
@@ -317,6 +317,9 @@
settings will = contradict the setting of allow-compression as this almost
= always results in a non-working connection.

= +- The "kill" by addr= management command now requires also the protocol
+ as string e.g. "udp", "tcp&= quot;.
+
Common errors with OpenSSL 3.0 and OpenVPN 2.6
------= ----------------------------------------
Both OpenVPN 2.6 = and OpenSSL 3.0 tighten the security considerable, so some
= diff --git a/doc/management-notes.txt b/doc/management-notes.txt
= index b55135a..f1d2930 100644
--- a/doc/management-no= tes.txt
+++ b/doc/management-notes.txt
@@ -= 205,8 +205,12 @@

kill Test-Client -- k= ill the client instance having a
com= mon name of "Test-Client".
- kill 1.2.3.4:4000 -- kill the client instance having a

- so= urce address and port of 1.2.3.4:4000
+ kill tcp:1.2.3.4:4000 -- kill the client instance havin= g a
+ = source address, port and proto of
+ tcp:1.2.3.4:4000=
+
+ Note that kill by address won't work fo= r IPv6-connected
+ c= lients yet, so rely on kill by CN or CID instead.
<= br> Use the "status" command to see which clients are conne= cted.

diff --git a/src/openvpn/manage.c b= /src/openvpn/manage.c
index 0c77f85..484042a 100644<= br>--- a/src/openvpn/manage.c
+++ b/src/openvpn/manag= e.c
@@ -544,45 +544,52 @@
struct b= uffer buf;
char p1[128];
= char p2[128];
+ = char p3[128];
int n_killed;

buf_set_read(&buf, (uint8_t *) victim, strlen(vi= ctim) + 1);
buf_parse(&buf, ':', p1, s= izeof(p1));
buf_parse(&buf, ':', p2, s= izeof(p2));
+ = buf_parse(&buf, ':', p3, sizeof(p3));
<= br>- if (strlen(p1) &&= amp; strlen(p2))
+ = if (strlen(p1) && strlen(p2) && strlen(p3))
= {
/* IP:port specified */
bool status;
- const in_addr_t addr =3D getaddr(GETADDR_HOST_OR= DER|GETADDR_MSG_VIRT_OUT, p1, 0, &status, NULL);
+ const in_addr_t addr =3D geta= ddr(GETADDR_HOST_ORDER|GETADDR_MSG_VIRT_OUT, p2, 0, &status, NULL);
if (status)
{=
- const int po= rt =3D atoi(p2);
- = if (port > 0 && port < 65536)
+ const int port =3D atoi(= p3);
+ = const int proto =3D (streq(p1, "tcp")) ? PROTO_TCP_SERVER :
+ = (streq(p1, "udp")) ? PROTO_UDP : PROTO_NONE;
= +
+ if ((port > 0 && port = < 65536) && (proto !=3D PROTO_NONE))
= {
- = n_killed =3D (*man->persist.callback.kill_by_addr)(man->persist= .callback.arg, addr, port);
+ n_killed =3D (*man->persist.callback.kill_by= _addr)(man->persist.callback.arg, addr, port, proto);
= if (n_killed > 0)
= {
- = msg(M_CLIENT, "SUCCESS: %d client(s) at address %s:%d killed&quo= t;,
+ = msg(M_CLIENT, "SUCCESS: %d client(s) at address %s:%s:%d kille= d",
n_killed,
<= span style=3D"color: hsl(120, 100%, 40%);">+ pro= to2ascii(proto, AF_UNSPEC, false),

= print_in_addr_t(addr, 0, &gc),
= port);
}
= else
{
- msg(M_CLIEN= T, "ERROR: client at address %s:%d not found",

+ msg(M_CLIENT, = "ERROR: client at address %s:%s:%d not found",
+ proto2asci= i(proto, AF_UNSPEC, false),
pr= int_in_addr_t(addr, 0, &gc),
= port);
}
= }
else
= {
- = msg(M_CLIENT, "ERROR: port number is out of range: %s", p2);=
+ = msg(M_CLIENT, "ERROR: port number or protocol out of range: %s %s&quo= t;, p3, p1);
}
= }
else
{=
- msg(M_CLIENT= , "ERROR: error parsing IP address: %s", p1);
+ msg(M_CLIENT, "ERR= OR: error parsing IP address: %s", p2);
}=
}
else if (strlen(p1))
diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h
index f501543..02ceb82 100644
--- a/src/openvp= n/manage.h
+++ b/src/openvpn/manage.h
@@ -1= 80,7 +180,7 @@
void (*status) (void *arg, const int ve= rsion, struct status_output *so);
void (*show_net) (vo= id *arg, const int msglevel);
int (*kill_by_cn) (void = *arg, const char *common_name);
- int (*kill_by_addr) (void *arg, const in_addr_t addr, const i= nt port);
+ int (*= kill_by_addr) (void *arg, const in_addr_t addr, const int port, const int p= roto);
void (*delete_event) (void *arg, event_t event)= ;
int (*n_clients) (void *arg);
b= ool (*send_cc_message) (void *arg, const char *message, const char *paramet= er);
diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute= .c
index 74923cf..24b9543 100644
--- a/src/= openvpn/mroute.c
+++ b/src/openvpn/mroute.c
@@ -276,6 +276,10 @@

addr->len =3D 6;<= /span>
addr->v4.addr =3D osaddr->addr.in4.s= in_addr.s_addr;
addr->v4.port =3D osadd= r->addr.in4.sin_port;
+ if (addr->proto !=3D PROTO_NONE)
+ {
+ addr->type |=3D M= R_WITH_PROTO;
+ = }
}
els= e
{
@@ -295,6 +299,10 @@
addr->len =3D 18;
= addr->v6.addr =3D osaddr->addr.in6.sin6_addr;
= addr->v6.port =3D osaddr->addr.in6.sin6_port;=
+ if (addr-&= gt;proto !=3D PROTO_NONE)
+ {
+ addr->type |=3D MR_WITH_PROTO;
+ }
= }
else
= {
@@ -403,6 +411,10 @@
{
buf_printf(&out, "ARP/");=
}
+ if (maddr.type & MR_WITH_PROTO)<= br>+ {+ buf_print= f(&out, "%s:", proto2ascii(maddr.proto, AF_INET, false));
+ }
buf_printf(&out, "%s", print_in_a= ddr_t(ntohl(maddr.v4.addr),
= (flags & MAPF_IA_EMPTY_IF_UNDEF) ? IA_EMPTY_IF= _UNDEF : 0, gc));
if (maddr.type & MR_= WITH_NETBITS)
@@ -426,6 +438,10 @@
=
case MR_ADDR_IPV6:
{
+ if (ma= ddr.type & MR_WITH_PROTO)
+ {
+ buf_printf(&out, "%s:", proto2asc= ii(maddr.proto, AF_INET6, false));
+ }
if (IN6_I= S_ADDR_V4MAPPED( &maddr.v6.addr ) )
{<= /span>
buf_printf(&out, "%s", p= rint_in_addr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@
buf_printf(&out, "UNKNOWN");<= /span>
break;
}- buf_printf(&out, &= quot;|%d", maddr.proto);
return BSTR(&out= );
}
else
diff --= git a/src/openvpn/mroute.h b/src/openvpn/mroute.h
index 265= 9695..fbe102a 100644
--- a/src/openvpn/mroute.h
<= span>+++ b/src/openvpn/mroute.h

@@ -72,6 +72,9 @@ /* Indicates than IPv4 addr was extracted from ARP packet */=
#define MR_ARP 16

= +/* Address type mask indicatin= g that proto # is part of address */
+#define MR_WITH_PROTO 32
+
struct mroute_addr {
uint8_t len; /* length of address */
= uint8_t proto;
diff --git a/src/openvpn/mtcp.c b/src/o= penvpn/mtcp.c
index 62ed044..9a8b1cb 100644
--- a/src/openvpn/mtcp.c

+++ b/src/openvpn/mtcp.c@@ -111,6 +111,7 @@
ASSERT(mi->context.c2.l= ink_sockets[0]->info.lsa->actual.dest.addr.sa.sa_family =3D=3D AF_INE= T
|| mi->context.c2.link_sockets[0]->info= .lsa->actual.dest.addr.sa.sa_family =3D=3D AF_INET6
= );
+ mi-&g= t;real.proto =3D mi->context.c2.link_sockets[0]->info.proto; if (!mroute_extract_openvpn_sockaddr(&mi->real,<= br> &mi->context.c2.l= ink_sockets[0]->info.lsa->actual.dest,
= true))
diff --git a/src/openvpn= /multi.c b/src/openvpn/multi.c
index 9c8c014..b0e1941 10064= 4
--- a/src/openvpn/multi.c
+++ b/src/openv= pn/multi.c
@@ -794,7 +794,6 @@
{
goto err;
}
= - mi->real.proto =3D ls= ->info.proto;
generate_prefix(mi);
}


@@ -3942,7 +3941,8 @@ }

static int
-management_callback_kill_by_addr(void *a= rg, const in_addr_t addr, const int port)
+management_callback_kill_by_addr(void *arg, const in_= addr_t addr,
+ = const int port, const int proto)
= {
struct multi_context *m =3D (struct multi_context *= ) arg;
struct hash_iterator hi;
@@ -39= 57,6 +3957,7 @@
saddr.addr.in4.sin_port =3D htons(port= );
if (mroute_extract_openvpn_sockaddr(&maddr, &am= p;saddr, true))
{
+ maddr.proto =3D proto;
= hash_iterator_init(m->iter, &hi);
while ((h= e =3D hash_iterator_next(&hi)))
{

To view, visit change 880. To unsubscribe, or for help w= riting mail filters, visit s= ettings.

=
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd31= 78eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 7
Gerrit-Owner: its_Giaan <gianmarco@...2786...= ..>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-CC: ordex <a@...2181...>
Gerrit-MessageType: merged
--zquMXQ8Id8A=--