From b086dcafac34b4f5547c2221426a198701cc4d3d Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 14 Apr 2022 18:28:05 +0800
Subject: [PATCH] refact<cluster>: adjust auth code

---
 include/dnode/mnode/mnode.h           | 23 +++--------------
 source/dnode/mnode/impl/src/mndAuth.c | 37 +++++++++++++++------------
 2 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/include/dnode/mnode/mnode.h b/include/dnode/mnode/mnode.h
index 9e5f8a4ddd..9848125919 100644
--- a/include/dnode/mnode/mnode.h
+++ b/include/dnode/mnode/mnode.h
@@ -74,26 +74,12 @@ void    mndStop(SMnode *pMnode);
  * @brief Get mnode monitor info.
  *
  * @param pMnode The mnode object.
- * @param pClusterInfo
- * @param pVgroupInfo
- * @param pGrantInfo
+ * @param pCluster
+ * @param pVgroup
+ * @param pGrant
  * @return int32_t 0 for success, -1 for failure.
  */
-int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgroupInfo *pVgroupInfo,
-                          SMonGrantInfo *pGrantInfo);
-
-/**
- * @brief Get user authentication info.
- *
- * @param pMnode The mnode object.
- * @param user
- * @param spi
- * @param encrypt
- * @param secret
- * @param ckey
- * @return int32_t 0 for success, -1 for failure.
- */
-int32_t mndRetriveAuth(SMnode *pMnode, char *user, char *spi, char *encrypt, char *secret, char *ckey);
+int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pCluster, SMonVgroupInfo *pVgroup, SMonGrantInfo *pGrant);
 
 /**
  * @brief Process the read, write, sync request.
@@ -105,7 +91,6 @@ int32_t mndProcessMsg(SNodeMsg *pMsg);
 
 /**
  * @brief Generate machine code
- *
  */
 void mndGenerateMachineCode();
 
diff --git a/source/dnode/mnode/impl/src/mndAuth.c b/source/dnode/mnode/impl/src/mndAuth.c
index 20dd7f1378..fc94ec3645 100644
--- a/source/dnode/mnode/impl/src/mndAuth.c
+++ b/source/dnode/mnode/impl/src/mndAuth.c
@@ -26,22 +26,22 @@ int32_t mndInitAuth(SMnode *pMnode) {
 
 void mndCleanupAuth(SMnode *pMnode) {}
 
-int32_t mndRetriveAuth(SMnode *pMnode, char *user, char *spi, char *encrypt, char *secret, char *ckey) {
-  SUserObj *pUser = mndAcquireUser(pMnode, user);
+static int32_t mndRetriveAuth(SMnode *pMnode, SAuthRsp *pRsp) {
+  SUserObj *pUser = mndAcquireUser(pMnode, pRsp->user);
   if (pUser == NULL) {
-    *secret = 0;
-    mError("user:%s, failed to auth user since %s", user, terrstr());
+    *pRsp->secret = 0;
+    mError("user:%s, failed to auth user since %s", pRsp->user, terrstr());
     return -1;
   }
 
-  *spi = 1;
-  *encrypt = 0;
-  *ckey = 0;
+  pRsp->spi = 1;
+  pRsp->encrypt = 0;
+  *pRsp->ckey = 0;
 
-  memcpy(secret, pUser->pass, TSDB_PASSWORD_LEN);
+  memcpy(pRsp->secret, pUser->pass, TSDB_PASSWORD_LEN);
   mndReleaseUser(pMnode, pUser);
 
-  mDebug("user:%s, auth info is returned", user);
+  mDebug("user:%s, auth info is returned", pRsp->user);
   return 0;
 }
 
@@ -55,14 +55,19 @@ static int32_t mndProcessAuthReq(SNodeMsg *pReq) {
   SAuthReq authRsp = {0};
   memcpy(authRsp.user, authReq.user, TSDB_USER_LEN);
 
-  int32_t code =
-      mndRetriveAuth(pReq->pNode, authRsp.user, &authRsp.spi, &authRsp.encrypt, authRsp.secret, authRsp.ckey);
+  int32_t code = mndRetriveAuth(pReq->pNode, &authRsp);
   mTrace("user:%s, auth req received, spi:%d encrypt:%d ruser:%s", pReq->user, authRsp.spi, authRsp.encrypt,
          authRsp.user);
 
   int32_t contLen = tSerializeSAuthReq(NULL, 0, &authRsp);
   void   *pRsp = rpcMallocCont(contLen);
+  if (pRsp == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
   tSerializeSAuthReq(pRsp, contLen, &authRsp);
+
   pReq->pRsp = pRsp;
   pReq->rspLen = contLen;
   return code;
@@ -95,11 +100,11 @@ int32_t mndCheckAlterUserAuth(SUserObj *pOperUser, SUserObj *pUser, SDbObj *pDb,
     }
   }
 
-    if (pAlter->alterType == TSDB_ALTER_USER_CLEAR_WRITE_DB || pAlter->alterType == TSDB_ALTER_USER_CLEAR_READ_DB) {
-      if (pOperUser->superUser) {
-        return 0;
-      }
+  if (pAlter->alterType == TSDB_ALTER_USER_CLEAR_WRITE_DB || pAlter->alterType == TSDB_ALTER_USER_CLEAR_READ_DB) {
+    if (pOperUser->superUser) {
+      return 0;
     }
+  }
 
   if (pAlter->alterType == TSDB_ALTER_USER_ADD_READ_DB || pAlter->alterType == TSDB_ALTER_USER_REMOVE_READ_DB ||
       pAlter->alterType == TSDB_ALTER_USER_ADD_WRITE_DB || pAlter->alterType == TSDB_ALTER_USER_REMOVE_WRITE_DB) {
@@ -176,4 +181,4 @@ int32_t mndCheckReadAuth(SUserObj *pOperUser, SDbObj *pDb) {
 
   terrno = TSDB_CODE_MND_NO_RIGHTS;
   return -1;
-}
\ No newline at end of file
+}
-- 
GitLab