Merge branch '4416-fix-reading-multiple-rndc-messages-in-single-TCP-message' into 'main'

Rework isccc_ccmsg to support multiple messages per tcp read

Closes #4416

See merge request isc-projects/bind9!8956

CHANGES

@@ -1,3 +1,6 @@
+6375.	[func]		Allow multiple RNDC message to be processed from
+			a single TCP read. [GL #4416]
+
 6374.	[func]		Don't count expired / future RRSIGs in verification
 			failure quota. [GL #4586]
 

bin/rndc/rndc.c

@@ -305,8 +305,7 @@ rndc_recvdone(isc_nmhandle_t *handle, isc_result_t result, void *arg) {
 		fatal("recv failed: %s", isc_result_totext(result));
 	}
 
-	source.rstart = isc_buffer_base(ccmsg->buffer);
-	source.rend = isc_buffer_used(ccmsg->buffer);
+	isccc_ccmsg_toregion(ccmsg, &source);
 
 	DO("parse message",
 	   isccc_cc_fromwire(&source, &response, algorithm, &secret));
@@ -381,8 +380,7 @@ rndc_recvnonce(isc_nmhandle_t *handle ISC_ATTR_UNUSED, isc_result_t result,
 		fatal("recv failed: %s", isc_result_totext(result));
 	}
 
-	source.rstart = isc_buffer_base(ccmsg->buffer);
-	source.rend = isc_buffer_used(ccmsg->buffer);
+	isccc_ccmsg_toregion(ccmsg, &source);
 
 	DO("parse message",
 	   isccc_cc_fromwire(&source, &response, algorithm, &secret));

doc/notes/notes-current.rst

@@ -20,8 +20,6 @@ Security Fixes
 New Features
 ~~~~~~~~~~~~
 
-- None.
-
 - A new option :any:`signatures-jitter` is added to :any:`dnssec-policy` to
   spread out signature expiration times over a period of time. :gl:`#4554`
 
@@ -40,6 +38,12 @@ Feature Changes
   the signature inception and expiration dates no longer count towards maximum
   validation and maximum validation failures limits. :gl:`#4586`
 
+- Multiple RNDC messages will be processed when sent in a single TCP
+  message.
+
+  ISC would like to thank Dominik Thalhammer for reporting the issue
+  and preparing the initial patch. :gl:`#4416`
+
 Bug Fixes
 ~~~~~~~~~
 

lib/isccc/ccmsg.c

@@ -42,6 +42,35 @@
 #define CCMSG_MAGIC	 ISC_MAGIC('C', 'C', 'm', 's')
 #define VALID_CCMSG(foo) ISC_MAGIC_VALID(foo, CCMSG_MAGIC)
 
+/*
+ * Try parsing a message from the internal read_buffer and set state
+ * accordingly. Returns true if a message was successfully parsed, false if not.
+ * If no message could be parsed the ccmsg struct remains untouched.
+ */
+static isc_result_t
+try_parse_message(isccc_ccmsg_t *ccmsg) {
+	REQUIRE(ccmsg != NULL);
+
+	uint32_t len = 0;
+	if (isc_buffer_peekuint32(ccmsg->buffer, &len) != ISC_R_SUCCESS) {
+		return ISC_R_NOMORE;
+	}
+	if (len == 0) {
+		return ISC_R_UNEXPECTEDEND;
+	}
+	if (len > ccmsg->maxsize) {
+		return ISC_R_RANGE;
+	}
+	if (isc_buffer_remaininglength(ccmsg->buffer) < sizeof(uint32_t) + len)
+	{
+		return ISC_R_NOMORE;
+	}
+	/* Skip the size we just peeked */
+	isc_buffer_forward(ccmsg->buffer, sizeof(uint32_t));
+	ccmsg->size = len;
+	return ISC_R_SUCCESS;
+}
+
 static void
 recv_data(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
 	  void *arg) {
@@ -56,50 +85,20 @@ recv_data(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
 
 	REQUIRE(region != NULL);
 
-	if (!ccmsg->length_received) {
-		if (region->length < sizeof(uint32_t)) {
-			eresult = ISC_R_UNEXPECTEDEND;
+	/* Copy the received data to our reassembly buffer */
+	eresult = isc_buffer_copyregion(ccmsg->buffer, region);
+	if (eresult != ISC_R_SUCCESS) {
 		goto done;
 	}
+	isc_region_consume(region, region->length);
 
-		ccmsg->size = ntohl(*(uint32_t *)region->base);
-
-		if (ccmsg->size == 0) {
-			eresult = ISC_R_UNEXPECTEDEND;
-			goto done;
-		}
-		if (ccmsg->size > ccmsg->maxsize) {
-			eresult = ISC_R_RANGE;
-			goto done;
-		}
-
-		isc_region_consume(region, sizeof(uint32_t));
-		isc_buffer_allocate(ccmsg->mctx, &ccmsg->buffer, ccmsg->size);
-
-		ccmsg->length_received = true;
-	}
-
-	/*
-	 * If there's no more data, wait for more
-	 */
-	if (region->length == 0) {
+	/* Try to parse a single message of the buffer */
+	eresult = try_parse_message(ccmsg);
+	/* No results from parsing, we need more data */
+	if (eresult == ISC_R_NOMORE) {
 		return;
 	}
 
-	/* We have some data in the buffer, read it */
-
-	size_t size = ISC_MIN(isc_buffer_availablelength(ccmsg->buffer),
-			      region->length);
-	isc_buffer_putmem(ccmsg->buffer, region->base, size);
-	isc_region_consume(region, size);
-
-	if (isc_buffer_usedlength(ccmsg->buffer) == ccmsg->size) {
-		goto done;
-	}
-
-	/* Wait for more data to come */
-	return;
-
 done:
 	isc_nm_read_stop(handle);
 	ccmsg->recv_cb(handle, eresult, ccmsg->recv_cbarg);
@@ -120,6 +119,10 @@ isccc_ccmsg_init(isc_mem_t *mctx, isc_nmhandle_t *handle,
 		.mctx = mctx,
 	};
 
+	/* Preallocate the buffer to maximum single TCP read */
+	isc_buffer_allocate(ccmsg->mctx, &ccmsg->buffer,
+			    UINT16_MAX + sizeof(uint16_t));
+
 	isc_nmhandle_attach(handle, &ccmsg->handle);
 }
 
@@ -134,15 +137,25 @@ void
 isccc_ccmsg_readmessage(isccc_ccmsg_t *ccmsg, isc_nm_cb_t cb, void *cbarg) {
 	REQUIRE(VALID_CCMSG(ccmsg));
 
-	if (ccmsg->buffer != NULL) {
-		isc_buffer_free(&ccmsg->buffer);
+	if (ccmsg->size != 0) {
+		/* Remove the previously read message from the buffer */
+		isc_buffer_forward(ccmsg->buffer, ccmsg->size);
+		ccmsg->size = 0;
+		isc_buffer_trycompact(ccmsg->buffer);
 	}
 
 	ccmsg->recv_cb = cb;
 	ccmsg->recv_cbarg = cbarg;
-	ccmsg->length_received = false;
 
+	/* If we have previous data still in the buffer, try to parse it */
+	isc_result_t result = try_parse_message(ccmsg);
+	if (result == ISC_R_NOMORE) {
+		/* We need to read more data */
 		isc_nm_read(ccmsg->handle, recv_data, ccmsg);
+		return;
+	}
+
+	ccmsg->recv_cb(ccmsg->handle, result, ccmsg->recv_cbarg);
 }
 
 static void
@@ -187,18 +200,19 @@ isccc_ccmsg_disconnect(isccc_ccmsg_t *ccmsg) {
 void
 isccc_ccmsg_invalidate(isccc_ccmsg_t *ccmsg) {
 	REQUIRE(VALID_CCMSG(ccmsg));
+	REQUIRE(ccmsg->handle == NULL);
 
 	ccmsg->magic = 0;
 
-	if (ccmsg->buffer != NULL) {
 	isc_buffer_free(&ccmsg->buffer);
 }
-}
 
 void
 isccc_ccmsg_toregion(isccc_ccmsg_t *ccmsg, isccc_region_t *ccregion) {
 	REQUIRE(VALID_CCMSG(ccmsg));
+	REQUIRE(ccmsg->buffer);
+	REQUIRE(isc_buffer_remaininglength(ccmsg->buffer) >= ccmsg->size);
 
-	ccregion->rstart = isc_buffer_base(ccmsg->buffer);
-	ccregion->rend = isc_buffer_used(ccmsg->buffer);
+	ccregion->rstart = isc_buffer_current(ccmsg->buffer);
+	ccregion->rend = ccregion->rstart + ccmsg->size;
 }

lib/isccc/include/isccc/ccmsg.h

@@ -45,7 +45,6 @@ typedef struct isccc_ccmsg {
 	/* private (don't touch!) */
 	unsigned int	magic;
 	uint32_t	size;
-	bool		length_received;
 	isc_buffer_t   *buffer;
 	unsigned int	maxsize;
 	isc_mem_t      *mctx;