[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openbsd-tech
Subject:    Re: snmpd: reject OIDS equal to searchrange.end
From:       Martijn van Duren <openbsd+tech () list ! imperialat ! at>
Date:       2023-10-28 7:50:43
Message-ID: ced707831b127cfe0dd546b8cf188c06b7f69545.camel () list ! imperialat ! at
[Download RAW message or body]

On Sat, 2023-10-28 at 09:45 +0200, Martijn van Duren wrote:
> RFC 2741 section 5.2 states that searchrange.end is non-inclusive.
> appl_varbind_valid() and appl_response() currently tests inclusive.
> The appl_varbind_valid() case is for backends that support
> searchrange.end (like agentx) and the appl_response() case for
> those who do not and need a fixup (basically everything else).
> 
> OK?
> 
> martijn
> 
Here's the regress part I forgot to add.

Index: Makefile
===================================================================
RCS file: /cvs/src/regress/usr.sbin/snmpd/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile	27 Oct 2023 10:26:20 -0000	1.6
+++ Makefile	28 Oct 2023 07:49:31 -0000
@@ -170,6 +170,7 @@ BACKEND_TARGETS+=		backend_getnext_stale
 BACKEND_TARGETS+=		backend_getnext_inclusive_backwards
 BACKEND_TARGETS+=		backend_getnext_toofew
 BACKEND_TARGETS+=		backend_getnext_toomany
+BACKEND_TARGETS+=		backend_getnext_response_equal_end
 BACKEND_TARGETS+=		backend_getbulk_nonrep_zero_maxrep_one
 BACKEND_TARGETS+=		backend_getbulk_nonrep_zero_maxrep_two
 BACKEND_TARGETS+=		backend_getbulk_nonrep_one_maxrep_one
Index: backend.c
===================================================================
RCS file: /cvs/src/regress/usr.sbin/snmpd/backend.c,v
retrieving revision 1.1
diff -u -p -r1.1 backend.c
--- backend.c	24 Oct 2023 14:34:40 -0000	1.1
+++ backend.c	28 Oct 2023 07:49:31 -0000
@@ -2633,6 +2633,62 @@ backend_getnext_toomany(void)
 }
 
 void
+backend_getnext_response_equal_end(void)
+{
+	struct sockaddr_storage ss;
+	struct sockaddr *sa = (struct sockaddr *)&ss;
+	socklen_t salen;
+	int snmp_s, ax_s;
+	uint32_t sessionid1, sessionid2;
+	struct varbind varbind[] = {
+		{
+			.type = TYPE_NULL,
+			.name = OID_STRUCT(MIB_BACKEND_GETNEXT, 26),
+			.data.int32 = 1
+		},
+	};
+	struct searchrange searchrange[] = {
+		{
+			.start = OID_STRUCT(MIB_BACKEND_GETNEXT, 26),
+			.end = OID_STRUCT(MIB_BACKEND_GETNEXT, 26, 1, 1)
+		},
+	};
+	int32_t requestid;
+	char buf[1024];
+	size_t n;
+
+	ax_s = agentx_connect(axsocket);
+	sessionid1 = agentx_open(ax_s, 0, 0,
+	    OID_ARG(MIB_SUBAGENT_BACKEND_GETNEXT, 26, 1),
+	    "backend_getnext_end_equal.1");
+	sessionid2 = agentx_open(ax_s, 0, 0,
+	    OID_ARG(MIB_SUBAGENT_BACKEND_GETNEXT, 26, 2),
+	    "backend_getnext_end_equal.2");
+	agentx_register(ax_s, sessionid1, 0, 0, 127, 0,
+	    OID_ARG(MIB_BACKEND_GETNEXT, 26), 0);
+	agentx_register(ax_s, sessionid2, 0, 0, 127, 0,
+	    OID_ARG(MIB_BACKEND_GETNEXT, 26, 1, 1), 0);
+
+	salen = snmp_resolve(SOCK_DGRAM, hostname, servname, sa);
+	snmp_s = snmp_connect(SOCK_DGRAM, sa, salen);
+	requestid = snmpv2_getnext(snmp_s, community, 0, varbind, 1);
+
+	/* Fool agentx_getnext_handle() */
+	varbind[0].name.subid[varbind[0].name.n_subid++] = 1;
+	varbind[0].type = TYPE_INTEGER;
+	n = agentx_read(ax_s, buf, sizeof(buf), 1000);
+	agentx_getnext_handle(__func__, buf, n, 0, sessionid1, searchrange,
+	    varbind, 1);
+	varbind[0].name = searchrange[0].end;
+	agentx_response(ax_s, buf, NOERROR, 0, varbind, 1);
+	varbind[0].type = TYPE_NULL;
+	varbind[0].name = OID_STRUCT(MIB_BACKEND_GETNEXT, 26),
+
+	snmpv2_response_validate(snmp_s, 1000, community, requestid, GENERR, 1,
+	    varbind, 1);
+}
+
+void
 backend_getbulk_nonrep_zero_maxrep_one(void)
 {
 	struct sockaddr_storage ss;
Index: regress.h
===================================================================
RCS file: /cvs/src/regress/usr.sbin/snmpd/regress.h,v
retrieving revision 1.2
diff -u -p -r1.2 regress.h
--- regress.h	27 Oct 2023 10:26:20 -0000	1.2
+++ regress.h	28 Oct 2023 07:49:31 -0000
@@ -293,6 +293,7 @@ void backend_getnext_stale(void);
 void backend_getnext_inclusive_backwards(void);
 void backend_getnext_toofew(void);
 void backend_getnext_toomany(void);
+void backend_getnext_response_equal_end(void);
 void backend_getbulk_nonrep_zero_maxrep_one(void);
 void backend_getbulk_nonrep_zero_maxrep_two(void);
 void backend_getbulk_nonrep_one_maxrep_one(void);
Index: snmpd_regress.c
===================================================================
RCS file: /cvs/src/regress/usr.sbin/snmpd/snmpd_regress.c,v
retrieving revision 1.2
diff -u -p -r1.2 snmpd_regress.c
--- snmpd_regress.c	27 Oct 2023 10:26:20 -0000	1.2
+++ snmpd_regress.c	28 Oct 2023 07:49:31 -0000
@@ -143,6 +143,7 @@ const struct {
 	{ "backend_getnext_inclusive_backwards", backend_getnext_inclusive_backwards },
 	{ "backend_getnext_toofew", backend_getnext_toofew },
 	{ "backend_getnext_toomany", backend_getnext_toomany },
+	{ "backend_getnext_response_equal_end", backend_getnext_response_equal_end },
 	{ "backend_getbulk_nonrep_zero_maxrep_one", backend_getbulk_nonrep_zero_maxrep_one },
 	{ "backend_getbulk_nonrep_zero_maxrep_two", backend_getbulk_nonrep_zero_maxrep_two },
 	{ "backend_getbulk_nonrep_one_maxrep_one", backend_getbulk_nonrep_one_maxrep_one },

[prev in list] [next in list] [prev in thread] [next in thread]