xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

add more error code

This commit is contained in:
yihaoDeng 2023-09-14 15:34:28 +08:00
parent 7aa3bd92a2
commit 2002ed8709
4 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/util/taoserror.h
View File

@ -247,6 +247,9 @@ int32_t* taosGetErrno();
#define TSDB_CODE_MND_AUTH_FAILURE TAOS_DEF_ERROR_CODE(0, 0x0357) #define TSDB_CODE_MND_AUTH_FAILURE TAOS_DEF_ERROR_CODE(0, 0x0357)
#define TSDB_CODE_MND_USER_NOT_AVAILABLE TAOS_DEF_ERROR_CODE(0, 0x0358) #define TSDB_CODE_MND_USER_NOT_AVAILABLE TAOS_DEF_ERROR_CODE(0, 0x0358)
#define TSDB_CODE_MND_PRIVILEDGE_EXIST TAOS_DEF_ERROR_CODE(0, 0x0359) #define TSDB_CODE_MND_PRIVILEDGE_EXIST TAOS_DEF_ERROR_CODE(0, 0x0359)
#define TSDB_CODE_MND_USER_HOST_EXIST TAOS_DEF_ERROR_CODE(0, 0x035A)
#define TSDB_CODE_MND_USER_HOST_NOT_EXIST TAOS_DEF_ERROR_CODE(0, 0x035B)
#define TSDB_CODE_MND_TOO_MANY_USER_HOST TAOS_DEF_ERROR_CODE(0, 0x035C)
// mnode-stable-part1 // mnode-stable-part1
#define TSDB_CODE_MND_STB_ALREADY_EXIST TAOS_DEF_ERROR_CODE(0, 0x0360) #define TSDB_CODE_MND_STB_ALREADY_EXIST TAOS_DEF_ERROR_CODE(0, 0x0360)

2
include/util/tdef.h
View File

@ -202,7 +202,7 @@ typedef enum ELogicConditionType {
#define TSDB_DB_NAME_LEN 65 #define TSDB_DB_NAME_LEN 65
#define TSDB_DB_FNAME_LEN (TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN + TSDB_NAME_DELIMITER_LEN) #define TSDB_DB_FNAME_LEN (TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN + TSDB_NAME_DELIMITER_LEN)
#define TSDB_PRIVILEDGE_CONDITION_LEN 48 * 1024 #define TSDB_PRIVILEDGE_CONDITION_LEN 48 * 1024
#define TSDB_PRIVILEDGE_HOST_LEN 24 * 1024 #define TSDB_PRIVILEDGE_HOST_LEN 48 * 1024
#define TSDB_FUNC_NAME_LEN 65 #define TSDB_FUNC_NAME_LEN 65
#define TSDB_FUNC_COMMENT_LEN 1024 * 1024 #define TSDB_FUNC_COMMENT_LEN 1024 * 1024

38
source/dnode/mnode/impl/src/mndUser.c
View File

@ -437,7 +437,7 @@ static void ipRangeToStr(SIpV4Range *range, char *buf) {
} }
return; return;
} }
static bool isDefualtRange(SIpV4Range *pRange) { static bool isDefaultRange(SIpV4Range *pRange) {
static SIpV4Range val = {.ip = 16777343, .mask = 32}; static SIpV4Range val = {.ip = 16777343, .mask = 32};
return pRange->ip == val.ip && pRange->mask == val.mask; return pRange->ip == val.ip && pRange->mask == val.mask;
} }
@ -446,7 +446,7 @@ static int32_t ipRangeListToStr(SIpV4Range *range, int32_t num, char *buf) {
for (int i = 0; i < num; i++) { for (int i = 0; i < num; i++) {
char tbuf[36] = {0}; char tbuf[36] = {0};
SIpV4Range *pRange = &range[i]; SIpV4Range *pRange = &range[i];
if (isDefualtRange(pRange)) continue; if (isDefaultRange(pRange)) continue;
ipRangeToStr(&range[i], tbuf); ipRangeToStr(&range[i], tbuf);
len += sprintf(buf + len, "%s,", tbuf); len += sprintf(buf + len, "%s,", tbuf);
@ -1245,8 +1245,7 @@ int32_t mndSetUserWhiteListRsp(SMnode *pMnode, SUserObj *pUser, SGetUserWhiteLis
if (pWhiteListRsp->pWhiteLists == NULL) { if (pWhiteListRsp->pWhiteLists == NULL) {
return TSDB_CODE_OUT_OF_MEMORY; return TSDB_CODE_OUT_OF_MEMORY;
} }
memcpy(pWhiteListRsp->pWhiteLists, pUser->pIpWhiteList->pIpRange, memcpy(pWhiteListRsp->pWhiteLists, pUser->pIpWhiteList->pIpRange, pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range));
pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range));
return 0; return 0;
} }
@ -1683,12 +1682,14 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) {
} }
if (alterReq.alterType == TSDB_ALTER_USER_ADD_WHITE_LIST) { if (alterReq.alterType == TSDB_ALTER_USER_ADD_WHITE_LIST) {
taosMemoryFree(newUser.pIpWhiteList); taosMemoryFreeClear(newUser.pIpWhiteList);
int32_t num = pUser->pIpWhiteList->num + alterReq.numIpRanges; int32_t num = pUser->pIpWhiteList->num + alterReq.numIpRanges;
SIpWhiteList *pNew = taosMemoryCalloc(1, sizeof(SIpWhiteList) + sizeof(SIpV4Range) * num); SIpWhiteList *pNew = taosMemoryCalloc(1, sizeof(SIpWhiteList) + sizeof(SIpV4Range) * num);
int32_t idx = pUser->pIpWhiteList->num; int32_t idx = pUser->pIpWhiteList->num;
bool exist = false;
memcpy(pNew->pIpRange, pUser->pIpWhiteList->pIpRange, sizeof(SIpV4Range) * idx); memcpy(pNew->pIpRange, pUser->pIpWhiteList->pIpRange, sizeof(SIpV4Range) * idx);
for (int i = 0; i < alterReq.numIpRanges; i++) { for (int i = 0; i < alterReq.numIpRanges; i++) {
SIpV4Range *range = &(alterReq.pIpRanges[i]); SIpV4Range *range = &(alterReq.pIpRanges[i]);
@ -1697,17 +1698,32 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) {
memcpy(&pNew->pIpRange[idx], range, sizeof(SIpV4Range)); memcpy(&pNew->pIpRange[idx], range, sizeof(SIpV4Range));
idx++; idx++;
continue; continue;
} else {
exist = true;
} }
} }
if (exist) {
taosMemoryFree(pNew);
terrno = TSDB_CODE_MND_USER_HOST_EXIST;
code = terrno;
goto _OVER;
}
pNew->num = idx; pNew->num = idx;
newUser.pIpWhiteList = pNew; newUser.pIpWhiteList = pNew;
newUser.ipWhiteListVer = pUser->ipWhiteListVer + 1; newUser.ipWhiteListVer = pUser->ipWhiteListVer + 1;
if (pNew->num >= TSDB_PRIVILEDGE_HOST_LEN / 24) {
terrno = TSDB_CODE_MND_TOO_MANY_USER_HOST;
code = terrno;
goto _OVER;
}
} }
if (alterReq.alterType == TSDB_ALTER_USER_DROP_WHITE_LIST) { if (alterReq.alterType == TSDB_ALTER_USER_DROP_WHITE_LIST) {
taosMemoryFree(newUser.pIpWhiteList); taosMemoryFreeClear(newUser.pIpWhiteList);
int32_t num = pUser->pIpWhiteList->num; int32_t num = pUser->pIpWhiteList->num;
SIpWhiteList *pNew = taosMemoryCalloc(1, sizeof(SIpWhiteList) + sizeof(SIpV4Range) * num); SIpWhiteList *pNew = taosMemoryCalloc(1, sizeof(SIpWhiteList) + sizeof(SIpV4Range) * num);
bool noexist = true;
if (pUser->pIpWhiteList->num > 0) { if (pUser->pIpWhiteList->num > 0) {
int idx = 0; int idx = 0;
@ -1716,7 +1732,7 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) {
bool found = false; bool found = false;
for (int j = 0; j < alterReq.numIpRanges; j++) { for (int j = 0; j < alterReq.numIpRanges; j++) {
SIpV4Range *range = &alterReq.pIpRanges[j]; SIpV4Range *range = &alterReq.pIpRanges[j];
if (isIpRangeEqual(oldRange, range)) { if (!isDefaultRange(range) && isIpRangeEqual(oldRange, range)) {
found = true; found = true;
break; break;
} }
@ -1725,6 +1741,9 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) {
memcpy(&pNew->pIpRange[idx], oldRange, sizeof(SIpV4Range)); memcpy(&pNew->pIpRange[idx], oldRange, sizeof(SIpV4Range));
idx++; idx++;
} }
if (found == true) {
noexist = false;
}
} }
pNew->num = idx; pNew->num = idx;
newUser.pIpWhiteList = pNew; newUser.pIpWhiteList = pNew;
@ -1735,6 +1754,11 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) {
newUser.pIpWhiteList = pNew; newUser.pIpWhiteList = pNew;
newUser.ipWhiteListVer = pUser->ipWhiteListVer + 1; newUser.ipWhiteListVer = pUser->ipWhiteListVer + 1;
} }
if (noexist) {
terrno = TSDB_CODE_MND_USER_HOST_NOT_EXIST;
code = terrno;
goto _OVER;
}
} }
code = mndAlterUser(pMnode, pUser, &newUser, pReq); code = mndAlterUser(pMnode, pUser, &newUser, pReq);

3
source/util/src/terror.c
View File

@ -194,6 +194,9 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_MANY_USERS, "Too many users")
TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_ALTER_OPER, "Invalid alter operation") TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_ALTER_OPER, "Invalid alter operation")
TAOS_DEFINE_ERROR(TSDB_CODE_MND_AUTH_FAILURE, "Authentication failure") TAOS_DEFINE_ERROR(TSDB_CODE_MND_AUTH_FAILURE, "Authentication failure")
TAOS_DEFINE_ERROR(TSDB_CODE_MND_PRIVILEDGE_EXIST, "User already have this priviledge") TAOS_DEFINE_ERROR(TSDB_CODE_MND_PRIVILEDGE_EXIST, "User already have this priviledge")
TAOS_DEFINE_ERROR(TSDB_CODE_MND_USER_HOST_EXIST, "Host already exist in ip white list")
TAOS_DEFINE_ERROR(TSDB_CODE_MND_USER_HOST_NOT_EXIST, "Host not exist in ip white list")
TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_MANY_USER_HOST, "Too many host in ip white list")
//mnode-stable-part1 //mnode-stable-part1
TAOS_DEFINE_ERROR(TSDB_CODE_MND_STB_ALREADY_EXIST, "STable already exists") TAOS_DEFINE_ERROR(TSDB_CODE_MND_STB_ALREADY_EXIST, "STable already exists")