From a3c680fbb00a0019573fb84c29332e845e6efcad Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Fri, 9 Jun 2023 23:34:10 +0100
Subject: [PATCH] Fix for Eclipse #581199

---
 lib/packet_mosq.c                     |  2 +-
 test/broker/01-bad-initial-packets.py | 78 +++++++++++++++++++++++++++
 test/broker/Makefile                  |  1 +
 test/broker/test.py                   |  1 +
 4 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100755 test/broker/01-bad-initial-packets.py

diff --git a/lib/packet_mosq.c b/lib/packet_mosq.c
index da2a6080..d737c185 100644
--- a/lib/packet_mosq.c
+++ b/lib/packet_mosq.c
@@ -378,7 +378,7 @@ int packet__read(struct mosquitto *mosq)
 #ifdef WITH_BROKER
 			G_BYTES_RECEIVED_INC(1);
 			/* Clients must send CONNECT as their first command. */
-			if(!(mosq->bridge) && state == mosq_cs_connected && (byte&0xF0) != CMD_CONNECT){
+			if(!(mosq->bridge) && state == mosq_cs_new && (byte&0xF0) != CMD_CONNECT){
 				return MOSQ_ERR_PROTOCOL;
 			}
 #endif
diff --git a/test/broker/01-bad-initial-packets.py b/test/broker/01-bad-initial-packets.py
new file mode 100755
index 00000000..52f2de95
--- /dev/null
+++ b/test/broker/01-bad-initial-packets.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+
+# Test whether non-CONNECT packets as an initial packet can cause excess memory use
+
+from mosq_test_helper import *
+import psutil
+
+def write_config(filename, port):
+    with open(filename, 'w') as f:
+        f.write(f"listener {port}\n")
+        f.write("allow_anonymous true\n")
+        f.write("sys_interval 1\n")
+
+def do_send(port, socks, payload):
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    socks.append(sock)
+    sock.connect(("127.0.0.1", port))
+    try:
+        sock.send(payload)
+    except ConnectionResetError:
+        pass
+
+def do_test(port):
+    rc = 1
+
+    conf_file = os.path.basename(__file__).replace('.py', '.conf')
+    write_config(conf_file, port)
+    broker = mosq_test.start_broker(filename=os.path.basename(__file__), port=port, use_conf=True)
+
+    try:
+        socks = []
+
+        do_send(port, socks, b"\x20\x80\x80\x80t" + b"\01"*100000000) # CONNACK
+        do_send(port, socks, b"\x30\x80\x80\x80t" + b"\01"*100000000) # PUBLISH
+        do_send(port, socks, b"\x40\x80\x80\x80t" + b"\01"*100000000) # PUBACK
+        do_send(port, socks, b"\x50\x80\x80\x80t" + b"\01"*100000000) # PUBREC
+        do_send(port, socks, b"\x60\x80\x80\x80t" + b"\01"*100000000) # PUBREL
+        do_send(port, socks, b"\x70\x80\x80\x80t" + b"\01"*100000000) # PUBCOMP
+        do_send(port, socks, b"\x80\x80\x80\x80t" + b"\01"*100000000) # SUBSCRIBE
+        do_send(port, socks, b"\x90\x80\x80\x80t" + b"\01"*100000000) # SUBACK
+        do_send(port, socks, b"\xA0\x80\x80\x80t" + b"\01"*100000000) # UNSUBSCRIBE
+        do_send(port, socks, b"\xB0\x80\x80\x80t" + b"\01"*100000000) # UNSUBACK
+        do_send(port, socks, b"\xC0\x80\x80\x80t" + b"\01"*100000000) # PINGREQ
+        do_send(port, socks, b"\xD0\x80\x80\x80t" + b"\01"*100000000) # PINGRESP
+        do_send(port, socks, b"\xE0\x80\x80\x80t" + b"\01"*100000000) # DISCONNECT
+        do_send(port, socks, b"\xF0\x80\x80\x80t" + b"\01"*100000000) # AUTH
+
+        mem = psutil.Process(broker.pid).memory_info().vms
+
+        for s in socks:
+            s.close()
+
+        limit = 25000000
+        if mem > limit:
+            raise mosq_test.TestError(f"Process memory {mem} greater than limit of {limit}")
+
+        rc = 0
+    except MemoryError:
+        print("Memory error!")
+    except Exception as e:
+        print(e)
+    except mosq_test.TestError:
+        pass
+    finally:
+        os.remove(conf_file)
+        broker.terminate()
+        broker.wait()
+        (stdo, stde) = broker.communicate()
+        if rc:
+            print(stde.decode('utf-8'))
+            exit(rc)
+
+
+port = mosq_test.get_port()
+
+do_test(port)
+
+exit(0)
diff --git a/test/broker/Makefile b/test/broker/Makefile
index a65874c2..94cc8026 100644
--- a/test/broker/Makefile
+++ b/test/broker/Makefile
@@ -23,6 +23,7 @@ msg_sequence_test:
 	./msg_sequence_test.py
 
 01 :
+	./01-bad-initial-packets.py
 	./01-connect-575314.py
 	./01-connect-allow-anonymous.py
 	./01-connect-disconnect-v5.py
diff --git a/test/broker/test.py b/test/broker/test.py
index 4afee881..649746d3 100755
--- a/test/broker/test.py
+++ b/test/broker/test.py
@@ -5,6 +5,7 @@ import ptest
 
 tests = [
     #(ports required, 'path'),
+	(1, './01-bad-initial-packets.py'),
     (1, './01-connect-575314.py'),
     (1, './01-connect-allow-anonymous.py'),
     (1, './01-connect-disconnect-v5.py'),