cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mod aaa-12 修改用户认证-未认证权限移动功能 

RCA：
SOL：
修改人：chenling
检视人：
This commit is contained in:
ChenLing 2019-09-02 14:42:26 +08:00
parent aff9a79031
commit 779b3589ea
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Platform/user/configm/config-server/web_config/authfree.c
View File

@ -599,7 +599,7 @@ ret_code freeauth_config_mov_proc(uint source, uint config_type,
for(i = 0; i < RULE_MAX_NUM; i++) for(i = 0; i < RULE_MAX_NUM; i++)
{ {
printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip, printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip,
freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].dport, i); freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].flag, i);
} }
/*查找要移动的未认证权限是否存在 不存在 则退出程序 */ /*查找要移动的未认证权限是否存在 不存在 则退出程序 */
@ -670,7 +670,7 @@ ret_code freeauth_config_del_proc(uint source, uint config_type,
for(i = 0; i < RULE_MAX_NUM; i++) for(i = 0; i < RULE_MAX_NUM; i++)
{ {
printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip, printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip,
freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].dport, i); freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].flag, i);
} }
printf("打印传过来的json串\n"); printf("打印传过来的json串\n");
@ -857,7 +857,7 @@ ret_code freeauth_config_get_proc(uint source, uint config_type,
for(i = 0; i < RULE_MAX_NUM; i++) for(i = 0; i < RULE_MAX_NUM; i++)
{ {
printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip, printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip,
freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].dport, i); freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].flag, i);
} }
pJsonArry= cJSON_CreateArray(); /*创建数组*/ pJsonArry= cJSON_CreateArray(); /*创建数组*/

28
Platform/user/configm/config-server/web_config/config-adm/user_authfree.c
View File

@ -78,7 +78,7 @@ void add_authfree(int rule_priority, char *name, uint32_t sip, uint32_t dip, int
{ {
freeauth_array[i].rule_priority; freeauth_array[i].rule_priority;
printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip, printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip,
freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].dport, i); freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].flag, i);
} }
/*添加成功*/ /*添加成功*/
@ -107,13 +107,14 @@ void get_priority_by_name(char *name, int *before)
} }
/*移动未认证权限*/ /*移动未认证权限*/
void mov_authfree(char *name, int after, authfree_result_t *authfree_result) void mov_authfree(char *name, int after_arry, authfree_result_t *authfree_result)
{ {
int before_arry = 0; int before_arry = 0;
int ret; int ret;
int num; int num;
int i; int i;
int temp; int temp;
int after;
freeauth_configure_t before_array[RULE_MAX_NUM] = {0}; freeauth_configure_t before_array[RULE_MAX_NUM] = {0};
if(NULL == authfree_result) { if(NULL == authfree_result) {
@ -179,7 +180,8 @@ void mov_authfree(char *name, int after, authfree_result_t *authfree_result)
/*从未认证权限规则的数组中通过name 查询序列号*/ /*从未认证权限规则的数组中通过name 查询序列号*/
get_priority_by_name(name, &before_arry); get_priority_by_name(name, &before_arry);
int before = before_arry - 1; before = before_arry - 1;
after = after_arry - 1;
printf("before:%d\n", before); printf("before:%d\n", before);
printf("after:%d\n", after); printf("after:%d\n", after);
@ -199,7 +201,7 @@ void mov_authfree(char *name, int after, authfree_result_t *authfree_result)
for(i = 0; i < RULE_MAX_NUM; i++) for(i = 0; i < RULE_MAX_NUM; i++)
{ {
printf("[%d %s %d %d %d %d %d]\n", before_array[i].rule_priority, before_array[i].name, before_array[i].sip, printf("[%d %s %d %d %d %d %d]\n", before_array[i].rule_priority, before_array[i].name, before_array[i].sip,
before_array[i].dip, before_array[i].dport, before_array[i].dport, i); before_array[i].dip, before_array[i].dport, before_array[i].flag, i);
} }
/*比如说2移动到5前面*/ /*比如说2移动到5前面*/
@ -230,7 +232,7 @@ void mov_authfree(char *name, int after, authfree_result_t *authfree_result)
for(i = 0; i < RULE_MAX_NUM; i++) for(i = 0; i < RULE_MAX_NUM; i++)
{ {
printf("[%s %d %d %d %d %d]\n", freeauth_array[i].name, freeauth_array[i].sip, printf("[%s %d %d %d %d %d]\n", freeauth_array[i].name, freeauth_array[i].sip,
freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].dport, i); freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].flag, i);
} }
} }
@ -263,7 +265,7 @@ void mov_authfree(char *name, int after, authfree_result_t *authfree_result)
for(i = 0; i < RULE_MAX_NUM; i++) for(i = 0; i < RULE_MAX_NUM; i++)
{ {
printf("[ %s %d %d %d %d %d]\n", freeauth_array[i].name, freeauth_array[i].sip, printf("[ %s %d %d %d %d %d]\n", freeauth_array[i].name, freeauth_array[i].sip,
freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].dport, i); freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].flag, i);
} }
} }
@ -300,7 +302,7 @@ void del_authfree(char *name, authfree_result_t *authfree_result)
for(i = 0; i < RULE_MAX_NUM; i++) for(i = 0; i < RULE_MAX_NUM; i++)
{ {
printf("[%d %s %d %d %d %d %d]\n", del_array[i].rule_priority, del_array[i].name, del_array[i].sip, printf("[%d %s %d %d %d %d %d]\n", del_array[i].rule_priority, del_array[i].name, del_array[i].sip,
del_array[i].dip, del_array[i].dport, del_array[i].dport, i); del_array[i].dip, del_array[i].dport, del_array[i].flag, i);
} }
@ -336,7 +338,7 @@ void del_authfree(char *name, authfree_result_t *authfree_result)
memset(&del_array[i], 0, sizeof(freeauth_configure_t)); memset(&del_array[i], 0, sizeof(freeauth_configure_t));
printf("[%d %s %d %d %d %d %d]\n", del_array[i].rule_priority, del_array[i].name, del_array[i].sip, printf("[%d %s %d %d %d %d %d]\n", del_array[i].rule_priority, del_array[i].name, del_array[i].sip,
del_array[i].dip, del_array[i].dport, del_array[i].dport, i); del_array[i].dip, del_array[i].dport, del_array[i].flag, i);
} }
} }
@ -344,7 +346,7 @@ void del_authfree(char *name, authfree_result_t *authfree_result)
for(i = 0; i < RULE_MAX_NUM; i++) for(i = 0; i < RULE_MAX_NUM; i++)
{ {
printf("[%d %s %d %d %d %d %d]\n", del_array[i].rule_priority, del_array[i].name, del_array[i].sip, printf("[%d %s %d %d %d %d %d]\n", del_array[i].rule_priority, del_array[i].name, del_array[i].sip,
del_array[i].dip, del_array[i].dport, del_array[i].dport, i); del_array[i].dip, del_array[i].dport, del_array[i].flag, i);
} }
for(i = 0; i < RULE_MAX_NUM; i++) for(i = 0; i < RULE_MAX_NUM; i++)
@ -370,7 +372,7 @@ void del_authfree(char *name, authfree_result_t *authfree_result)
freeauth_array[j].dport = del_array[i].dport; freeauth_array[j].dport = del_array[i].dport;
freeauth_array[j].flag = del_array[i].flag; freeauth_array[j].flag = del_array[i].flag;
printf("[%d %s %d %d %d %d %d]\n", freeauth_array[j].rule_priority, freeauth_array[j].name, freeauth_array[j].sip, printf("[%d %s %d %d %d %d %d]\n", freeauth_array[j].rule_priority, freeauth_array[j].name, freeauth_array[j].sip,
freeauth_array[j].dip, freeauth_array[j].dport, freeauth_array[j].dport, j); freeauth_array[j].dip, freeauth_array[j].dport, freeauth_array[j].flag, j);
break; break;
} }
} }
@ -381,7 +383,7 @@ void del_authfree(char *name, authfree_result_t *authfree_result)
printf("打印删除后的数据\n"); printf("打印删除后的数据\n");
for(i = 0; i < RULE_MAX_NUM; i++) { for(i = 0; i < RULE_MAX_NUM; i++) {
printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip, printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip,
freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].dport, i); freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].flag, i);
} }
/*删除成功*/ /*删除成功*/
@ -415,7 +417,7 @@ void mod_authfree(int rule_priority, char *name, uint32_t sip, uint32_t dip, int
freeauth_array[i].dport = dport; freeauth_array[i].dport = dport;
freeauth_array[i].flag = flag; freeauth_array[i].flag = flag;
printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip, printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip,
freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].dport, i); freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].flag, i);
break; break;
} }
} }
@ -424,7 +426,7 @@ void mod_authfree(int rule_priority, char *name, uint32_t sip, uint32_t dip, int
/*打印数组内全部元素*/ /*打印数组内全部元素*/
for(i = 0; i < RULE_MAX_NUM; i++) { for(i = 0; i < RULE_MAX_NUM; i++) {
printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip, printf("[%d %s %d %d %d %d %d]\n", freeauth_array[i].rule_priority, freeauth_array[i].name, freeauth_array[i].sip,
freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].dport, i); freeauth_array[i].dip, freeauth_array[i].dport, freeauth_array[i].flag, i);
} }
/*修改成功*/ /*修改成功*/