From 40a3c778f08cb373d8dd91df3bcacc0bcab6d30c Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 25 Sep 2023 18:39:49 +0800 Subject: [PATCH 1/2] disable ip on community --- source/dnode/mnode/impl/src/mndPrivilege.c | 2 +- source/dnode/mnode/impl/src/mndUser.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndPrivilege.c b/source/dnode/mnode/impl/src/mndPrivilege.c index 2769c3ac4c..d9ffd8979c 100644 --- a/source/dnode/mnode/impl/src/mndPrivilege.c +++ b/source/dnode/mnode/impl/src/mndPrivilege.c @@ -66,7 +66,7 @@ int32_t mndSetUserAuthRsp(SMnode *pMnode, SUserObj *pUser, SGetUserAuthRsp *pRsp return 0; } -int32_t mndEnableIpWhiteList(SMnode *pMnode) { return 1; } +int32_t mndEnableIpWhiteList(SMnode *pMnode) { return 0; } int32_t mndFetchIpWhiteList(SIpWhiteList *ipList, char **buf) { *buf = NULL; diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index a82623ae1b..d95976658b 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -193,17 +193,17 @@ int64_t mndGetIpWhiteVer(SMnode *pMnode) { int64_t ver = 0; taosThreadRwlockWrlock(&ipWhiteMgt.rw); if (ipWhiteMgt.ver == 0) { - // user and dnode r + // get user and dnode ip white list ipWhiteMgtUpdateAll(pMnode); ipWhiteMgt.ver = taosGetTimestampMs(); } ver = ipWhiteMgt.ver; taosThreadRwlockUnlock(&ipWhiteMgt.rw); - mDebug("ip-white-list on mnode ver: %" PRId64 "", ver); if (mndEnableIpWhiteList(pMnode) == 0 || tsEnableWhiteList == false) { - return 0; + ver = 0; } + mDebug("ip-white-list on mnode ver: %" PRId64 "", ver); return ver; } From 05ab04b87fcfb0d5b8797e248934f43dcc56b757 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 25 Sep 2023 19:10:50 +0800 Subject: [PATCH 2/2] disable ip on community --- source/libs/transport/src/transSvr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c index fd00c6b773..ca7e411874 100644 --- a/source/libs/transport/src/transSvr.c +++ b/source/libs/transport/src/transSvr.c @@ -325,7 +325,7 @@ bool uvWhiteListFilte(SIpWhiteListTab* pWhite, char* user, uint32_t ip, int64_t } bool uvWhiteListCheckConn(SIpWhiteListTab* pWhite, SSvrConn* pConn) { if (pConn->inType == TDMT_MND_STATUS || pConn->inType == TDMT_MND_RETRIEVE_IP_WHITE || - pConn->serverIp == pConn->clientIp || + pConn->serverIp == pConn->clientIp || pWhite->ver == pConn->whiteListVer /*|| strncmp(pConn->user, "_dnd", strlen("_dnd")) == 0*/) return true; @@ -1382,6 +1382,7 @@ void uvHandleUpdate(SSvrMsg* msg, SWorkThrd* thrd) { tFreeSUpdateIpWhiteReq(req); taosMemoryFree(req); } else { + tInfo("ip-white-list disable on trans"); thrd->enableIpWhiteList = 0; } taosMemoryFree(msg);