From 4cdfd0e1e8be1d6ed556fe3638efeb542a7c5eb0 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 19 Jul 2023 10:50:46 +0800 Subject: [PATCH 1/3] conflict --- source/dnode/mnode/impl/src/mndUser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index 65393399d5..06523c7c9b 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -620,7 +620,7 @@ static int32_t mndProcessCreateUserReq(SRpcMsg *pReq) { goto _OVER; } - if (createReq.user[0] == 0) { + if (createReq.user[0] == 0 || strlen(createReq.pass) >= TSDB_PASSWORD_LEN) { terrno = TSDB_CODE_MND_INVALID_USER_FORMAT; goto _OVER; } From 8f709ea7829173345c7cccc505643327f927d022 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 19 Jul 2023 13:06:59 +0800 Subject: [PATCH 2/3] fix test case --- tests/system-test/1-insert/boundary.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-test/1-insert/boundary.py b/tests/system-test/1-insert/boundary.py index 29dcbc7c46..4476236ca6 100644 --- a/tests/system-test/1-insert/boundary.py +++ b/tests/system-test/1-insert/boundary.py @@ -33,7 +33,7 @@ class TDTestCase: self.colname_length_boundary = self.boundary.COL_KEY_MAX_LENGTH self.tagname_length_boundary = self.boundary.TAG_KEY_MAX_LENGTH self.username_length_boundary = 23 - self.password_length_boundary = 128 + self.password_length_boundary = 31 def dbname_length_check(self): dbname_length = randint(1,self.dbname_length_boundary-1) for dbname in [tdCom.get_long_name(self.dbname_length_boundary),tdCom.get_long_name(dbname_length)]: From 69fae6200387df5d79f970864658e9d5373405be Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 19 Jul 2023 15:04:39 +0800 Subject: [PATCH 3/3] error message --- source/dnode/mnode/impl/src/mndUser.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index 06523c7c9b..cbde56a860 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -620,7 +620,7 @@ static int32_t mndProcessCreateUserReq(SRpcMsg *pReq) { goto _OVER; } - if (createReq.user[0] == 0 || strlen(createReq.pass) >= TSDB_PASSWORD_LEN) { + if (createReq.user[0] == 0) { terrno = TSDB_CODE_MND_INVALID_USER_FORMAT; goto _OVER; } @@ -630,6 +630,11 @@ static int32_t mndProcessCreateUserReq(SRpcMsg *pReq) { goto _OVER; } + if (strlen(createReq.pass) >= TSDB_PASSWORD_LEN){ + terrno = TSDB_CODE_PAR_NAME_OR_PASSWD_TOO_LONG; + goto _OVER; + } + pUser = mndAcquireUser(pMnode, createReq.user); if (pUser != NULL) { terrno = TSDB_CODE_MND_USER_ALREADY_EXIST;