From: "its_Giaan (Code Review)" Date: Wed, 29 Jan 2025 16:13:10 +0000 In-Reply-To: References: Reply-To: gianmarco@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., gert@...1296..., a@...2181... Message-ID: <88f1300954c23b8dfc0ae23573fa9367649dfc9a-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="ZSBLI1oSkAw="; 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: plaisthos , cron2 , flichtenheld Cc: openvpn-devel --ZSBLI1oSkAw= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld, its_Giaan, ordex= , plaisthos. Hello cron2, flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=3Demail to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+2 by cron2 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 --- 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(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/80/880/6 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: 6 Gerrit-Owner: its_Giaan Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-CC: ordex Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: its_Giaan Gerrit-Attention: flichtenheld Gerrit-Attention: ordex Gerrit-MessageType: newpatchset --ZSBLI1oSkAw= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: cron2, flichtenheld, its_Giaan, o= rdex, plaisthos.

its_Giaan uploaded patch set #6 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/880?usp=3Demail">View Chang= e

The following approvals got outdated and were removed: Code-Review+2 by cron2

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

Fix issue reported by Coverity:
CID 1641564: Uniniti= alized 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
av= oid doing it on virtual addresses when
MR_WITH_PORT is not specified.
Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Signed-off-by:= Gianmarco De Gregori <gianmarco@...2726...>
---
M Changes.rst<= br>M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/ma= nage.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 d= eletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/=
changes/80/880/6
diff --git a/Changes.rst b/Changes.rst
<= span>index 16ae6fc..d01816b 100644
--- a/Changes.rst=
+++ b/Changes.rst
@@ -317,6 +317,9 @@
<= span> settings will contradict the setting of allow-compression as this a= lmost
always results in a non-working connection.=

+- The &q= uot;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/managemen= t-notes.txt
index b55135a..f1d2930 100644
-= -- a/doc/management-notes.txt
+++ b/doc/management-notes.tx= t
@@ -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+ t= cp:1.2.3.4:4000
+
+ Note that kill by add= ress won't work for IPv6-connected
+ clients yet, so rely on kill by CN or CID instead.

Use the "status" command to see w= hich 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 @@
<= span> 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(&b= uf, ':', p1, sizeof(p1));
buf_parse(&b= uf, ':', p2, sizeof(p2));
+ buf_parse(&buf, ':', p3, sizeof(p3));

- = if (strlen(p1) && strlen(p2))
+ if (strlen(p1) && strlen(p2) && = strlen(p3))
{
/* IP:p= ort specified */
bool status;
- const in_addr_t addr =3D g= etaddr(GETADDR_HOST_ORDER|GETADDR_MSG_VIRT_OUT, p1, 0, &status, NULL);<= /span>
+ const in= _addr_t addr =3D getaddr(GETADDR_HOST_ORDER|GETADDR_MSG_VIRT_OUT, p2, 0, &a= mp;status, NULL);
if (status)
= {
- = const int port =3D atoi(p2);
- if (port > 0 && port < 65536)=
+ con= st int port =3D atoi(p3);
+ const int proto =3D (streq(p1, "tcp")) ? PR= OTO_TCP_SERVER :
+ = (streq(p1, "udp")) ? PROTO_UDP : P= ROTO_NONE;
++ if ((port &g= t; 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->per= sist.callback.kill_by_addr)(man->persist.callback.arg, addr, port, proto= );
if (n_killed > 0)
{

+ msg(M_CLIENT, "SUCCESS: %d client(s) at a= ddress %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 not found"= ;,
+ = proto2ascii(proto, AF_UNSPEC, false),
= print_in_addr_t(addr, 0, &gc),
= port);
}
}
else<= br> {
- msg(M_CLIENT, "ERROR: port number is out of = range: %s", p2);
+ msg(M_CLIENT, "ERROR: port number or protocol ou= t of range: %s %s", p3, p1);
}=
}
else
= {
- = msg(M_CLIENT, "ERROR: error parsing IP address: %s", p1)= ;
+ ms= g(M_CLIENT, "ERROR: error parsing IP address: %s", p2); }
}
e= lse if (strlen(p1))
diff --git a/src/openvpn/manage.h b/src= /openvpn/manage.h
index f501543..02ceb82 100644
<= span>--- a/src/openvpn/manage.h

+++ b/src/openvpn/manage.h<= /span>
@@ -180,7 +180,7 @@
void (*status) (vo= id *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 i= n_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) (voi= d *arg, event_t event);
int (*n_clients) (void *arg);<= /span>
bool (*send_cc_message) (void *arg, const char *messag= e, const char *parameter);
diff --git a/src/openvpn/mroute.= c b/src/openvpn/mroute.c
index 74923cf..24b9543 100644
--- a/src/openvpn/mroute.c
+++ b/src/openvpn/mr= oute.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_NO= NE)
+ = {
+ = 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_PR= OTO;
+ = }
}
else<= br> {
@@ -403,6 +411,10 @@
{

buf_printf(&o= ut, "ARP/");
}
+ if (maddr.type & = MR_WITH_PROTO)
+ = {
+ = buf_printf(&out, "%s:", proto2ascii(maddr.proto,= AF_INET, false));
+ = }
buf_printf(&out, &quo= t;%s", print_in_addr_t(ntohl(maddr.v4.addr),
= (flags & MAPF_IA_EMPTY_I= F_UNDEF) ? IA_EMPTY_IF_UNDEF : 0, gc));
if= (maddr.type & MR_WITH_NETBITS)
@@ -426,6 +438,10 @@

case MR_ADDR_IPV6:
<= span> {

+= if (maddr.type & MR_WITH_PROTO)
+ {
+ buf_printf(&out, = "%s:", proto2ascii(maddr.proto, AF_INET6, false));
+ }

= if (IN6_IS_ADDR_V4MAPPED( &maddr.v6.addr ) ) {
buf_printf(&= amp;out, "%s", print_in_addr_t(maddr.v4mappedv6.addr,
<= span>@@ -454,7 +470,6 @@

buf_printf(&o= ut, "UNKNOWN");
break; }
- = buf_printf(&out, "|%d", maddr.proto);
= return BSTR(&out);
}
el= se
diff --git a/src/openvpn/mroute.h b/src/openvpn/mroute.h=
index 2659695..fbe102a 100644
--- a/src/op= envpn/mroute.h
+++ b/src/openvpn/mroute.h
@= @ -72,6 +72,9 @@
/* Indicates than IPv4 addr was extracted= from ARP packet */
#define MR_ARP 16

+/* A= ddress type mask indicating that proto # is part of address */
+#define MR_WITH_PROTO = 32

+
struct mroute_addr {

uint8_t len; /* length of ad= dress */
uint8_t proto;
diff --git a/s= rc/openvpn/mtcp.c b/src/openvpn/mtcp.c
index 62ed044..9a8b1= cb 100644
--- a/src/openvpn/mtcp.c
+++ b/sr= c/openvpn/mtcp.c
@@ -111,6 +111,7 @@
A= SSERT(mi->context.c2.link_sockets[0]->info.lsa->actual.dest.addr.s= a.sa_family =3D=3D AF_INET
|| mi->context.c2= .link_sockets[0]->info.lsa->actual.dest.addr.sa.sa_family =3D=3D AF_I= NET6
);
+ 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

ind= ex 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);
}

@@ -3= 942,7 +3941,8 @@
}

stat= ic int
-management_call= back_kill_by_addr(void *arg, const in_addr_t addr, const int port)+management_callback_kill_by_= addr(void *arg, const in_addr_t addr,
+ const int port, const in= t 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_openv= pn_sockaddr(&maddr, &saddr, true))
{+ maddr.proto =3D proto= ;
hash_iterator_init(m->iter, &hi);<= br> while ((he =3D hash_iterator_next(&hi)))
{


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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd31= 78eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 6
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-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: cron2 <gert@...1296...>= ;
Gerrit-Attention: its_Giaan <gianmarco@...1665...= 726...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-Attention: ordex <a@...2181...> <= /div>
Gerrit-MessageType: newpatchset
--ZSBLI1oSkAw=--