From dc8888d9c8e7de5c10c81f6b2c6cfd2e02deca4a Mon Sep 17 00:00:00 2001 From: andrewbogo Date: Wed, 26 Nov 2025 16:11:50 +0300 Subject: [PATCH 1/3] removed version validation --- packets/packets.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packets/packets.go b/packets/packets.go index d91975c6..2a74554c 100644 --- a/packets/packets.go +++ b/packets/packets.go @@ -442,13 +442,10 @@ func (pk *Packet) ConnectDecode(buf []byte) error { // ConnectValidate ensures the connect packet is compliant. func (pk *Packet) ConnectValidate() Code { - if !bytes.Equal(pk.Connect.ProtocolName, []byte{'M', 'Q', 'I', 's', 'd', 'p'}) && !bytes.Equal(pk.Connect.ProtocolName, []byte{'M', 'Q', 'T', 'T'}) { - return ErrProtocolViolationProtocolName // [MQTT-3.1.2-1] - } - if (bytes.Equal(pk.Connect.ProtocolName, []byte{'M', 'Q', 'I', 's', 'd', 'p'}) && pk.ProtocolVersion != 3) || - (bytes.Equal(pk.Connect.ProtocolName, []byte{'M', 'Q', 'T', 'T'}) && pk.ProtocolVersion != 4 && pk.ProtocolVersion != 5) { - return ErrProtocolViolationProtocolVersion // [MQTT-3.1.2-2] + if !bytes.Equal(pk.Connect.ProtocolName, []byte{'M', 'Q', 'I', 's', 'd', 'p'}) && + !bytes.Equal(pk.Connect.ProtocolName, []byte{'M', 'Q', 'T', 'T'}) { + return ErrProtocolViolationProtocolName } if pk.ReservedBit != 0 { From 940a95ebec5d0869e7c0d2f6108f4e9309242af7 Mon Sep 17 00:00:00 2001 From: andrewbogo Date: Wed, 26 Nov 2025 17:21:54 +0300 Subject: [PATCH 2/3] chore: update module path to match fork --- go.mod | 3 ++- go.sum | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 74bca2ac..9de7b577 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mochi-mqtt/server/v2 +module github.com/FaceChainTeam/mqtt-mochi-server/v2 go 1.21 @@ -9,6 +9,7 @@ require ( github.com/go-redis/redis/v8 v8.11.5 github.com/gorilla/websocket v1.5.0 github.com/jinzhu/copier v0.3.5 + github.com/mochi-mqtt/server/v2 v2.7.9 github.com/rs/xid v1.4.0 github.com/stretchr/testify v1.8.1 go.etcd.io/bbolt v1.3.5 diff --git a/go.sum b/go.sum index cf06950b..ce877274 100644 --- a/go.sum +++ b/go.sum @@ -203,6 +203,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mochi-mqtt/server/v2 v2.7.9 h1:y0g4vrSLAag7T07l2oCzOa/+nKVLoazKEWAArwqBNYI= +github.com/mochi-mqtt/server/v2 v2.7.9/go.mod h1:lZD3j35AVNqJL5cezlnSkuG05c0FCHSsfAKSPBOSbqc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= From 053bff05c9dae3d4c39b3f880716f7744e7bfa46 Mon Sep 17 00:00:00 2001 From: andrewbogo Date: Thu, 27 Nov 2025 09:47:26 +0300 Subject: [PATCH 3/3] fixed go.mod --- go.mod | 3 +-- go.sum | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 9de7b577..74bca2ac 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/FaceChainTeam/mqtt-mochi-server/v2 +module github.com/mochi-mqtt/server/v2 go 1.21 @@ -9,7 +9,6 @@ require ( github.com/go-redis/redis/v8 v8.11.5 github.com/gorilla/websocket v1.5.0 github.com/jinzhu/copier v0.3.5 - github.com/mochi-mqtt/server/v2 v2.7.9 github.com/rs/xid v1.4.0 github.com/stretchr/testify v1.8.1 go.etcd.io/bbolt v1.3.5 diff --git a/go.sum b/go.sum index ce877274..cf06950b 100644 --- a/go.sum +++ b/go.sum @@ -203,8 +203,6 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mochi-mqtt/server/v2 v2.7.9 h1:y0g4vrSLAag7T07l2oCzOa/+nKVLoazKEWAArwqBNYI= -github.com/mochi-mqtt/server/v2 v2.7.9/go.mod h1:lZD3j35AVNqJL5cezlnSkuG05c0FCHSsfAKSPBOSbqc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=