Merge remote-tracking branch 'origin/3.0' into feature/dnode

tests/system-test/0-others/user_control.py

@@ -6,6 +6,7 @@ import traceback
 from util.log import *
 from util.sql import *
 from util.cases import *
+from util.dnodes import *
 
 
 PRIVILEGES_ALL      = "ALL"
@@ -161,6 +162,8 @@ class TDTestCase:
         for sql in sqls:
             tdSql.error(sql)
 
+        tdSql.execute("DROP USER u1")
+
     def __alter_pass_sql(self, user, passwd):
         return f'''ALTER USER {user} PASS '{passwd}' '''
 
@@ -237,7 +240,7 @@ class TDTestCase:
             f"DROP user {self.__user_list[0]} , {self.__user_list[1]}",
             f"DROP users {self.__user_list[0]}  {self.__user_list[1]}",
             f"DROP users {self.__user_list[0]} , {self.__user_list[1]}",
-            "DROP user root",
+            # "DROP user root",
             "DROP user abcde",
             "DROP user ALL",
         ]
@@ -267,7 +270,7 @@ class TDTestCase:
         # 查看用户
         tdLog.printNoPrefix("==========step2: show user test")
         tdSql.query("show users")
-        tdSql.checkRows(self.users_count + 2)
+        tdSql.checkRows(self.users_count + 1)
 
         # 密码登录认证
         self.login_currrent(self.__user_list[0], self.__passwd_list[0])
@@ -282,22 +285,28 @@ class TDTestCase:
         self.login_err(self.__user_list[0], self.__passwd_list[0])
         self.login_currrent(self.__user_list[0], f"new{self.__passwd_list[0]}")
 
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+
+        tdSql.query("show users")
+        tdSql.checkRows(self.users_count + 1)
+
         # 普通用户权限
         # 密码登录
-        _, user = self.user_login(self.__user_list[0], f"new{self.__passwd_list[0]}")
+        # _, user = self.user_login(self.__user_list[0], f"new{self.__passwd_list[0]}")
-        with taos_connect(user=self.__user_list[0], passwd=f"new{self.__passwd_list[0]}") as conn:
+        with taos_connect(user=self.__user_list[0], passwd=f"new{self.__passwd_list[0]}") as user:
-            user = conn
+            # user = conn
             # 不能创建用户
             tdLog.printNoPrefix("==========step5: normal user can not create user")
             user.error("create use utest1 pass 'utest1pass'")
             # 可以查看用户
             tdLog.printNoPrefix("==========step6: normal user can show user")
             user.query("show users")
-        assert user.queryRows == self.users_count + 2
+            assert user.queryRows == self.users_count + 1
             # 不可以修改其他用户的密码
             tdLog.printNoPrefix("==========step7: normal user can not alter other user pass")
             user.error(self.__alter_pass_sql(self.__user_list[1], self.__passwd_list[1] ))
-        user.error("root", "taosdata_root")
+            user.error(self.__alter_pass_sql("root", "taosdata_root" ))
             # 可以修改自己的密码
             tdLog.printNoPrefix("==========step8: normal user can alter owner pass")
             user.query(self.__alter_pass_sql(self.__user_list[0], self.__passwd_list[0]))
@@ -316,6 +325,20 @@ class TDTestCase:
         tdSql.checkData(0, 0, "root")
         tdSql.checkData(0, 1, "super")
 
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+
+        # 删除后无法登录
+        self.login_err(self.__user_list[0], self.__passwd_list[0])
+        self.login_err(self.__user_list[0], f"new{self.__passwd_list[0]}")
+        self.login_err(self.__user_list[1], self.__passwd_list[1])
+        self.login_err(self.__user_list[1], f"new{self.__passwd_list[1]}")
+
+        tdSql.query("show users")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, "root")
+        tdSql.checkData(0, 1, "super")
+
 
     def stop(self):
         tdSql.close()

tests/system-test/fulltest.sh

@@ -8,6 +8,8 @@ python3 ./test.py -f 0-others/taosShellNetChk.py
 python3 ./test.py -f 0-others/telemetry.py
 python3 ./test.py -f 0-others/taosdMonitor.py
 
+python3 ./test.py -f 0-others/user_control.py
+
 #python3 ./test.py -f 2-query/between.py
 python3 ./test.py -f 2-query/distinct.py
 python3 ./test.py -f 2-query/varchar.py
@@ -53,5 +55,3 @@ python3 ./test.py -f 2-query/arctan.py
 # python3 ./test.py -f 2-query/query_cols_tags_and_or.py
 
 python3 ./test.py -f 7-tmq/basic5.py
-
-