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-12 18:10:37 +08:00
parent d12b3df254
commit 865078ff29
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,6 @@ freeauth_configure_t freeauth_array[RULE_MAX_NUM] = {0};
/*存储序列号的数组*/ /*存储序列号的数组*/
int rule_order[RULE_MAX_NUM] = {0}; int rule_order[RULE_MAX_NUM] = {0};
#define UNAMESIZE (63 + 1)
#define SPECHAR(element) (strpbrk((element), "~!@#$%^&*()_+{}|:\"<>?\\,./;\'[]-=`")) //校验特殊字符 #define SPECHAR(element) (strpbrk((element), "~!@#$%^&*()_+{}|:\"<>?\\,./;\'[]-=`")) //校验特殊字符
#ifdef FREEAUTH_ACK_COOKIES #ifdef FREEAUTH_ACK_COOKIES
@ -273,7 +272,7 @@ ret_code freeauth_mov_json_parse(pointer input, uint *conf_type, rule_mod_t *rul
if(rule_mod) { if(rule_mod) {
memset(rule_mod, 0, sizeof(rule_mod_t)); memset(rule_mod, 0, sizeof(rule_mod_t));
rule_mod->after = struct_rulemod->after; rule_mod->after = struct_rulemod->after;
strncpy(rule_mod->name, struct_rulemod->name, 31); strncpy(rule_mod->name, struct_rulemod->name, UNAMESIZE);
} }
printf("移动数据解析完成\n"); printf("移动数据解析完成\n");
@ -340,7 +339,7 @@ ret_code freeauth_config_json_parse(pointer input, uint *conf_type, freeauth_con
if(freeauth_buff) { if(freeauth_buff) {
memset(freeauth_buff, 0, sizeof(freeauth_configure_t)); memset(freeauth_buff, 0, sizeof(freeauth_configure_t));
freeauth_buff->rule_priority = struct_freeauth->rule_priority; freeauth_buff->rule_priority = struct_freeauth->rule_priority;
strncpy(freeauth_buff->name, struct_freeauth->name, 31); strncpy(freeauth_buff->name, struct_freeauth->name, UNAMESIZE);
inet_pton(AF_INET, struct_freeauth->sip, &freeauth_buff->sip); /*点分十进制-十进制*/ inet_pton(AF_INET, struct_freeauth->sip, &freeauth_buff->sip); /*点分十进制-十进制*/
inet_pton(AF_INET, struct_freeauth->dip, &freeauth_buff->dip); inet_pton(AF_INET, struct_freeauth->dip, &freeauth_buff->dip);
freeauth_buff->dport = struct_freeauth->dport; freeauth_buff->dport = struct_freeauth->dport;
@ -420,7 +419,7 @@ ret_code authfree_config_json_parse_array(pointer input, uint *conf_type, freeau
name = cJSON_GetObjectItem(pArrayItem, "name"); name = cJSON_GetObjectItem(pArrayItem, "name");
if(name) { if(name) {
strncpy(freeauth_buff->name, name->valuestring, 31); strncpy(freeauth_buff->name, name->valuestring, UNAMESIZE);
printf("freeauth_buff->name = %s\n", freeauth_buff->name); printf("freeauth_buff->name = %s\n", freeauth_buff->name);
} }
@ -859,7 +858,7 @@ ret_code freeauth_config_del_proc(uint source, uint config_type,
for(int j = 0; j < cnt; j++) for(int j = 0; j < cnt; j++)
{ {
memset(name, 0, 256); memset(name, 0, 256);
strncpy(name, freeauth_configure[j].name, 31); strncpy(name, freeauth_configure[j].name, UNAMESIZE);
del_authfree(freeauth_configure[j].name, &authfree_result); del_authfree(freeauth_configure[j].name, &authfree_result);

7
Platform/user/configm/config-server/web_config/authfree.h
View File

@ -24,11 +24,12 @@
#define FREEAUTH_CONFIG_GET 4 #define FREEAUTH_CONFIG_GET 4
#define FREEAUTH_CONFIG_DEL_ALL 5 #define FREEAUTH_CONFIG_DEL_ALL 5
#define UNAMESIZE (63)
/*配置消息 */ /*配置消息 */
typedef struct { typedef struct {
int rule_priority; /*未认证权限优先级*/ int rule_priority; /*未认证权限优先级*/
char name[32]; /*未认证权限名称*/ char name[UNAMESIZE + 1]; /*未认证权限名称*/
uint32_t sip; /*未认证权限源IP地址*/ uint32_t sip; /*未认证权限源IP地址*/
uint32_t dip; /*未认证权限目的IP地址*/ uint32_t dip; /*未认证权限目的IP地址*/
int dport; /*未认证权限目的端口号*/ int dport; /*未认证权限目的端口号*/
@ -39,7 +40,7 @@ typedef struct {
/*配置消息 */ /*配置消息 */
typedef struct { typedef struct {
int rule_priority; /*未认证权限优先级*/ int rule_priority; /*未认证权限优先级*/
char name[32]; /*未认证权限名称*/ char name[UNAMESIZE + 1]; /*未认证权限名称*/
char sip[20]; /*未认证权限源IP地址*/ char sip[20]; /*未认证权限源IP地址*/
char dip[20]; /*未认证权限目的IP地址*/ char dip[20]; /*未认证权限目的IP地址*/
int dport; /*未认证权限目的端口号*/ int dport; /*未认证权限目的端口号*/
@ -50,7 +51,7 @@ typedef struct {
/*修改权限消息*/ /*修改权限消息*/
typedef struct { typedef struct {
char name[32]; char name[UNAMESIZE + 1];
int after; int after;
}rule_mod_t; }rule_mod_t;

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

@ -61,7 +61,7 @@ void add_authfree(int rule_priority, char *name, uint32_t sip, uint32_t dip, int
printf("%s(%d) freeauth_array[%d] = %p\n", __FUNCTION__, __LINE__, i, &freeauth_array[i]); printf("%s(%d) freeauth_array[%d] = %p\n", __FUNCTION__, __LINE__, i, &freeauth_array[i]);
memset(&freeauth_array[i], 0, sizeof(freeauth_configure_t)); memset(&freeauth_array[i], 0, sizeof(freeauth_configure_t));
freeauth_array[i].rule_priority = rule_priority; freeauth_array[i].rule_priority = rule_priority;
strncpy(freeauth_array[i].name, name, 31); strncpy(freeauth_array[i].name, name, UNAMESIZE);
freeauth_array[i].sip = sip; freeauth_array[i].sip = sip;
freeauth_array[i].dip = dip; freeauth_array[i].dip = dip;
freeauth_array[i].dport = dport; freeauth_array[i].dport = dport;
@ -192,7 +192,7 @@ void mov_authfree(char *name, int after_arry, authfree_result_t *authfree_result
for(i = 0; i < RULE_MAX_NUM; i++) for(i = 0; i < RULE_MAX_NUM; i++)
{ {
before_array[i].rule_priority = freeauth_array[i].rule_priority; before_array[i].rule_priority = freeauth_array[i].rule_priority;
strncpy(before_array[i].name, freeauth_array[i].name, 31); strncpy(before_array[i].name, freeauth_array[i].name, UNAMESIZE);
before_array[i].rule_priority = freeauth_array[i].rule_priority; before_array[i].rule_priority = freeauth_array[i].rule_priority;
before_array[i].sip = freeauth_array[i].sip; before_array[i].sip = freeauth_array[i].sip;
before_array[i].dip = freeauth_array[i].dip; before_array[i].dip = freeauth_array[i].dip;
@ -214,7 +214,7 @@ void mov_authfree(char *name, int after_arry, authfree_result_t *authfree_result
{ {
/*after-1 change before*/ /*after-1 change before*/
//freeauth_array[after - 1].rule_priority = after; //freeauth_array[after - 1].rule_priority = after;
strncpy(freeauth_array[after - 1].name, before_array[before].name, 31); strncpy(freeauth_array[after - 1].name, before_array[before].name, UNAMESIZE);
freeauth_array[after - 1].sip = before_array[before].sip; freeauth_array[after - 1].sip = before_array[before].sip;
freeauth_array[after - 1].dip = before_array[before].dip; freeauth_array[after - 1].dip = before_array[before].dip;
freeauth_array[after - 1].dport = before_array[before].dport; freeauth_array[after - 1].dport = before_array[before].dport;
@ -223,7 +223,7 @@ void mov_authfree(char *name, int after_arry, authfree_result_t *authfree_result
for(i = (before + 1); i < after; i++) for(i = (before + 1); i < after; i++)
{ {
//freeauth_array[i - 1].rule_priority = i; //freeauth_array[i - 1].rule_priority = i;
strncpy(freeauth_array[i - 1].name, before_array[i].name, 31); strncpy(freeauth_array[i - 1].name, before_array[i].name, UNAMESIZE);
freeauth_array[i - 1].sip = before_array[i].sip; freeauth_array[i - 1].sip = before_array[i].sip;
freeauth_array[i - 1].dip = before_array[i].dip; freeauth_array[i - 1].dip = before_array[i].dip;
freeauth_array[i - 1].dport = before_array[i].dport; freeauth_array[i - 1].dport = before_array[i].dport;
@ -246,7 +246,7 @@ void mov_authfree(char *name, int after_arry, authfree_result_t *authfree_result
{ {
/*after change before*/ /*after change before*/
//freeauth_array[after].rule_priority = before - 1; //freeauth_array[after].rule_priority = before - 1;
strncpy(freeauth_array[after].name, before_array[before].name, 31); strncpy(freeauth_array[after].name, before_array[before].name,UNAMESIZE);
freeauth_array[after].sip = before_array[before].sip; freeauth_array[after].sip = before_array[before].sip;
freeauth_array[after].dip = before_array[before].dip; freeauth_array[after].dip = before_array[before].dip;
freeauth_array[after].dport = before_array[before].dport; freeauth_array[after].dport = before_array[before].dport;
@ -256,7 +256,7 @@ void mov_authfree(char *name, int after_arry, authfree_result_t *authfree_result
for(i = after; i < before; i++) for(i = after; i < before; i++)
{ {
//freeauth_array[i + 1].rule_priority = i + 2; //freeauth_array[i + 1].rule_priority = i + 2;
strncpy(freeauth_array[i + 1].name, before_array[i].name, 31); strncpy(freeauth_array[i + 1].name, before_array[i].name,UNAMESIZE);
freeauth_array[i + 1].sip = before_array[i].sip; freeauth_array[i + 1].sip = before_array[i].sip;
freeauth_array[i + 1].dip = before_array[i].dip; freeauth_array[i + 1].dip = before_array[i].dip;
freeauth_array[i + 1].dport = before_array[i].dport; freeauth_array[i + 1].dport = before_array[i].dport;
@ -293,7 +293,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++)
{ {
del_array[i].rule_priority = freeauth_array[i].rule_priority; del_array[i].rule_priority = freeauth_array[i].rule_priority;
strncpy(del_array[i].name, freeauth_array[i].name, 31); strncpy(del_array[i].name, freeauth_array[i].name,UNAMESIZE);
del_array[i].rule_priority = freeauth_array[i].rule_priority; del_array[i].rule_priority = freeauth_array[i].rule_priority;
del_array[i].sip = freeauth_array[i].sip; del_array[i].sip = freeauth_array[i].sip;
del_array[i].dip = freeauth_array[i].dip; del_array[i].dip = freeauth_array[i].dip;
@ -369,7 +369,7 @@ void del_authfree(char *name, authfree_result_t *authfree_result)
printf("%s(%d) freeauth_array[%d] = %p\n", __FUNCTION__, __LINE__, j, &freeauth_array[j]); printf("%s(%d) freeauth_array[%d] = %p\n", __FUNCTION__, __LINE__, j, &freeauth_array[j]);
memset(&freeauth_array[j], 0, sizeof(freeauth_configure_t)); memset(&freeauth_array[j], 0, sizeof(freeauth_configure_t));
freeauth_array[j].rule_priority = del_array[i].rule_priority; freeauth_array[j].rule_priority = del_array[i].rule_priority;
strncpy(freeauth_array[j].name, del_array[i].name, 31); strncpy(freeauth_array[j].name, del_array[i].name, UNAMESIZE);
freeauth_array[j].sip = del_array[i].sip; freeauth_array[j].sip = del_array[i].sip;
freeauth_array[j].dip = del_array[i].dip; freeauth_array[j].dip = del_array[i].dip;
freeauth_array[j].dport = del_array[i].dport; freeauth_array[j].dport = del_array[i].dport;