feat: 实现登录、会话令牌、握手与顶号

EOF

internal/broker/hooks.go

@@ -26,13 +26,15 @@ func (h *nixHook) Provides(b byte) bool {
 		mqtt.OnSessionEstablished,
 		mqtt.OnDisconnect,
 		mqtt.OnQosComplete,
+		mqtt.OnSubscribed,
 	}, []byte{b})
 }
 
 func (h *nixHook) OnConnect(cl *mqtt.Client, pk packets.Packet) error {
 	endpointID := string(pk.Connect.Username)
+	clientID := pk.Connect.ClientIdentifier
 	if endpointID == "" {
-		endpointID = pk.Connect.ClientIdentifier
+		endpointID = clientID
 	}
 	remoteIP := remoteIPOf(cl)
 
@@ -45,6 +47,13 @@ func (h *nixHook) OnConnect(cl *mqtt.Client, pk packets.Packet) error {
 		maxPacketSize: pk.Properties.MaximumPacketSize,
 	}
 
+	// ClientID、Username 都必须等于端编号
+	if clientID == "" || endpointID == "" || clientID != endpointID {
+		st.authOK = false
+		h.rememberPending(cl, st)
+		return nil
+	}
+
 	// 心跳校正：超出 10–600 秒就改写 Keepalive 并设 ServerKeepalive
 	ka := pk.Connect.Keepalive
 	if ka < keepaliveMin || ka > keepaliveMax {
@@ -103,6 +112,10 @@ func (h *nixHook) OnACLCheck(cl *mqtt.Client, topic string, write bool) bool {
 }
 
 func (h *nixHook) OnPublish(cl *mqtt.Client, pk packets.Packet) (packets.Packet, error) {
+	// InlineClient 的 PublishDown 走 InjectPacket → OnPublish；必须放行才能分发给订阅者。
+	if cl != nil && cl.Net.Inline {
+		return pk, nil
+	}
 	h.b.connsMu.RLock()
 	st := h.b.byClient[cl]
 	h.b.connsMu.RUnlock()
@@ -122,6 +135,28 @@ func (h *nixHook) OnPublish(cl *mqtt.Client, pk packets.Packet) (packets.Packet,
 	return pk, packets.CodeSuccessIgnore
 }
 
+func (h *nixHook) OnSubscribed(cl *mqtt.Client, pk packets.Packet, reasonCodes []byte) {
+	h.b.connsMu.RLock()
+	st := h.b.byClient[cl]
+	h.b.connsMu.RUnlock()
+	if st == nil {
+		return
+	}
+	down := downTopic(st.endpointID)
+	for i, sub := range pk.Filters {
+		if sub.Filter != down {
+			continue
+		}
+		if i < len(reasonCodes) && reasonCodes[i] >= 0x80 {
+			continue
+		}
+		st.mu.Lock()
+		st.subscribedDown = true
+		st.mu.Unlock()
+		return
+	}
+}
+
 func (h *nixHook) OnPublishDropped(cl *mqtt.Client, pk packets.Packet) {
 	h.b.log.Debug("publish dropped", "client", cl.ID, "topic", pk.TopicName, "size", len(pk.Payload))
 }
@@ -151,14 +186,17 @@ func (h *nixHook) OnDisconnect(cl *mqtt.Client, err error, _ bool) {
 	h.b.connsMu.Lock()
 	st := h.b.byClient[cl]
 	delete(h.b.byClient, cl)
+	isCurrent := false
 	if st != nil && h.b.current[st.endpointID] == st {
 		delete(h.b.current, st.endpointID)
+		isCurrent = true
 	}
 	h.b.connsMu.Unlock()
 	if st == nil {
 		return
 	}
 	h.b.releaseAllLarge(st)
+	h.b.cancelHandshakeDeadline(st.endpointID, st.connID)
 
 	reason := port.DisconnectNormal
 	if err != nil {
@@ -179,6 +217,10 @@ func (h *nixHook) OnDisconnect(cl *mqtt.Client, err error, _ bool) {
 		SessionToken:  st.sessionToken,
 		MaxPacketSize: st.maxPacketSize,
 	}
+	if sess, ok := h.b.uplink.(*Session); ok {
+		sess.HandleDisconnect(context.Background(), info, reason, isCurrent)
+		return
+	}
 	h.b.uplink.OnDisconnect(context.Background(), info, reason)
 }