新增：连接验权 auth 处理

git-svn-id: svn://47.119.165.148/zhub@156 e63fbceb-bcc3-4977-ac22-735b83d8d0f4

zsub/msg-consumer.go

@@ -32,6 +32,10 @@ func msgAccept(v Message) {
 	if LogDebug {
 		log.Println("[", v.Conn.sn, "] rcmd: "+strings.Join(rcmd, " "))
 	}
+	if !c.auth && !strings.EqualFold("auth", rcmd[0]) && strings.EqualFold(GetStr("service.auth", "0"), "1") {
+		c.send("-Auth: NOAUTH Authentication required:" + rcmd[0])
+		return
+	}
 
 	if len(rcmd) == 1 {
 		switch strings.ToLower(rcmd[0]) {
@@ -149,6 +153,21 @@ func msgAccept(v Message) {
 				return
 			}
 			zsub._unlock(Lock{key: rcmd[1], uuid: rcmd[2]})
+		case "auth":
+			if len(rcmd) != 2 || strings.IndexAny(rcmd[1], "@") == -1 {
+				c.send("-Error: invalid password!")
+				return
+			}
+
+			inx := strings.IndexAny(rcmd[1], "@") //user@pwd
+
+			if strings.EqualFold(GetStr("auth."+rcmd[1][:inx], ""), rcmd[1][inx+1:]) {
+				c.auth = true
+				c.send("+Auth: ok!")
+			} else {
+				c.send("-Auth: invalid password!")
+			}
+			return
 		default:
 			c.send("-Error: default not supported:[" + strings.Join(rcmd, " ") + "]")
 			return

zsub/zsub.go

@@ -87,6 +87,7 @@ type ZConn struct { //ZConn
 	substoped map[string]chan int // 关闭信号量
 	ping      int64               // 最后心跳时间
 	pong      int64               // 最后心跳回复时间
+	auth      bool                // 是否已验证授权
 }
 
 type Lock struct {
@@ -483,6 +484,7 @@ func Info() map[string]interface{} {
 		m["groupid"] = c.groupid
 		m["topics"] = c.topics
 		m["timers"] = c.timers
+		m["auth"] = c.auth
 		conns = append(conns, m)
 	}