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

Merge branch 'enh/ipWhiteList' of https://github.com/taosdata/TDengine into enh/ipWhiteList

This commit is contained in:
yihaoDeng 2023-09-14 17:56:44 +08:00
parent 02f5f4f017
commit 2af180c763
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1126,23 +1126,30 @@ static int32_t mndCreateUser(SMnode *pMnode, char *acct, SCreateUserReq *pCreate
return terrno; return terrno;
} }
SIpWhiteList *p = taosMemoryCalloc(1, sizeof(SIpWhiteList) + (pCreate->numIpRanges + 1) * sizeof(SIpV4Range)); bool localHost = false;
bool localHost = false;
for (int i = 0; i < pCreate->numIpRanges; i++) {
p->pIpRange[i].ip = pCreate->pIpRanges[i].ip;
p->pIpRange[i].mask = pCreate->pIpRanges[i].mask;
if (isDefaultRange(&pCreate->pIpRanges[i])) { for (int i = 0; i < pCreate->numIpRanges; i++) {
SIpV4Range *pRange = &pCreate->pIpRanges[i];
if (isDefaultRange(pRange)) {
localHost = true; localHost = true;
break;
} }
} }
int32_t numOfRanges = localHost ? pCreate->numIpRanges : pCreate->numIpRanges + 1;
SIpWhiteList *p = taosMemoryCalloc(1, sizeof(SIpWhiteList) + numOfRanges * sizeof(SIpV4Range));
int idx = 0;
if (localHost == false) { if (localHost == false) {
p->pIpRange[pCreate->numIpRanges].ip = defaultIpRange.ip; p->pIpRange[idx].ip = defaultIpRange.ip;
p->pIpRange[pCreate->numIpRanges].mask = defaultIpRange.mask; p->pIpRange[idx].mask = defaultIpRange.mask;
p->num = pCreate->numIpRanges + 1; idx++;
} else {
p->num = pCreate->numIpRanges;
} }
for (int i = idx, j = 0; i < numOfRanges; i++, j++) {
p->pIpRange[i].ip = pCreate->pIpRanges[j].ip;
p->pIpRange[i].mask = pCreate->pIpRanges[j].mask;
}
p->num = numOfRanges;
userObj.pIpWhiteList = p; userObj.pIpWhiteList = p;
} }