TSG-792 增加校验条件的命中路径信息
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
#include <event2/event.h>
|
||||
#include "verify_policy_utils.h"
|
||||
|
||||
enum tsg_policy_type
|
||||
enum verify_policy_type
|
||||
{
|
||||
PXY_TABLE_SECURITY,
|
||||
PXY_TABLE_MANIPULATION,
|
||||
@@ -81,7 +81,7 @@ enum tfe_http_event
|
||||
EV_HTTP_SUBSCRIBE_ID = 1ULL << SUBSCRIBE_ID,
|
||||
};
|
||||
|
||||
struct verify_proxy_thread
|
||||
struct verify_policy_thread
|
||||
{
|
||||
int id;
|
||||
pthread_t pid;
|
||||
@@ -92,24 +92,48 @@ struct verify_proxy_thread
|
||||
void * (*routine)(void *);
|
||||
};
|
||||
|
||||
struct verify_proxy
|
||||
struct verify_policy
|
||||
{
|
||||
char name[VERIFY_SYMBOL_MAX];
|
||||
void * logger;
|
||||
unsigned int log_level;
|
||||
unsigned int nr_work_threads;
|
||||
unsigned int listen_port;
|
||||
struct verify_proxy_thread *work_threads[TFE_THREAD_MAX];
|
||||
struct verify_policy_thread *work_threads[TFE_THREAD_MAX];
|
||||
};
|
||||
|
||||
extern struct verify_proxy * g_verify_proxy;
|
||||
struct verify_policy_query_obj
|
||||
{
|
||||
int protocol_field;
|
||||
|
||||
char *keyword;
|
||||
char *attri_name;
|
||||
|
||||
struct ipaddr *ip_addr;
|
||||
|
||||
char *subscriberid;
|
||||
|
||||
int nth_scan;
|
||||
cJSON* attributes;
|
||||
|
||||
};
|
||||
|
||||
struct verify_policy_query
|
||||
{
|
||||
enum verify_policy_type type;
|
||||
struct verify_policy_query_obj query_obj[32];
|
||||
};
|
||||
|
||||
extern struct verify_policy * g_verify_proxy;
|
||||
|
||||
void * pangu_http_ctx_new(unsigned int thread_id);
|
||||
|
||||
void pangu_http_ctx_free(void * pme);
|
||||
|
||||
void http_scan(const char *value, enum tsg_policy_type policy_type, int protocol_field, struct ipaddr *ip_addr, cJSON *data_obj, void *pme);
|
||||
size_t http_scan(enum verify_policy_type policy_type, struct verify_policy_query_obj *query_obj, cJSON *data_obj, void *pme);
|
||||
|
||||
int security_policy_init(struct verify_proxy * verify, const char* profile_path);
|
||||
void get_scan_status(struct verify_policy_query_obj *query_obj, cJSON *attributes, cJSON *data_obj, void *pme);
|
||||
|
||||
int security_policy_init(struct verify_policy * verify, const char* profile_path);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -28,25 +28,7 @@
|
||||
#include "verify_policy_utils.h"
|
||||
#include "verify_policy_logging.h"
|
||||
|
||||
struct verify_proxy * g_verify_proxy = NULL;
|
||||
|
||||
struct policy_table_obj
|
||||
{
|
||||
int protocol_field;
|
||||
|
||||
char *keyword;
|
||||
char *keyword_scope;
|
||||
|
||||
struct ipaddr *ip_addr;
|
||||
|
||||
char *subscriberid;
|
||||
};
|
||||
|
||||
struct policy_query_list
|
||||
{
|
||||
enum tsg_policy_type type;
|
||||
struct policy_table_obj table_obj[32];
|
||||
};
|
||||
struct verify_policy * g_verify_proxy = NULL;
|
||||
|
||||
/* VERSION STRING */
|
||||
#ifdef TARGET_GIT_VERSION
|
||||
@@ -59,9 +41,9 @@ const char * version()
|
||||
return git_ver;
|
||||
}
|
||||
|
||||
extern int pangu_policy_init(struct verify_proxy * verify, const char* profile_path);
|
||||
extern int pangu_policy_init(struct verify_policy * verify, const char* profile_path);
|
||||
|
||||
static int verify_policy_init(struct verify_proxy * verify, const char *profile)
|
||||
static int verify_policy_init(struct verify_policy * verify, const char *profile)
|
||||
{
|
||||
int xret = -1;
|
||||
|
||||
@@ -78,7 +60,7 @@ static int verify_policy_init(struct verify_proxy * verify, const char *profile)
|
||||
return xret;
|
||||
}
|
||||
|
||||
enum tsg_policy_type tsg_policy_type_str2idx(const char *action_str)
|
||||
enum verify_policy_type tsg_policy_type_str2idx(const char *action_str)
|
||||
{
|
||||
const char * policy_name[__SCAN_POLICY_MAX];
|
||||
policy_name[PXY_TABLE_SECURITY] = "tsg_security";
|
||||
@@ -93,10 +75,10 @@ enum tsg_policy_type tsg_policy_type_str2idx(const char *action_str)
|
||||
break;
|
||||
}
|
||||
mesa_runtime_log(RLOG_LV_DEBUG, MODULE_NAME, "[I] policyType= %s", action_str);
|
||||
return (enum tsg_policy_type)i;
|
||||
return (enum verify_policy_type)i;
|
||||
}
|
||||
|
||||
int protoco_field_type_str2idx(enum tsg_policy_type type, const char *action_str, char *buff, char *p)
|
||||
int protoco_field_type_str2idx(enum verify_policy_type type, const char *action_str, char *buff, char **p)
|
||||
{
|
||||
const char * table_name[__SECURITY_TABLE_MAX] ={0};
|
||||
|
||||
@@ -148,13 +130,27 @@ int protoco_field_type_str2idx(enum tsg_policy_type type, const char *action_str
|
||||
if (0 == strcasecmp(action_str, table_name[i]))
|
||||
break;
|
||||
}
|
||||
p += snprintf(p, sizeof(buff) - (p - buff), "protocolField=%s,%d",action_str, (int)i);
|
||||
*p += snprintf(*p, sizeof(buff) - (*p - buff), ", protocolField=%s,%d",action_str, (int)i);
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
struct ipaddr *ip_to_stream_addr(char *clientIp1, unsigned int clientPort1, char *serverIp1, unsigned int serverPort1, int addr_type)
|
||||
#if 0
|
||||
struct ipaddr *ip_to_stream_addr(struct policy_attribute_obj *attribute_obj, int cnt)
|
||||
{
|
||||
int i = 0;
|
||||
int addr_type=0, __attribute__((__unused__))protocol=0;
|
||||
char *clientIp1=NULL,*serverIp1=NULL;
|
||||
unsigned int clientPort1=0,serverPort1=0;
|
||||
for(i = 0; i < cnt; i++)
|
||||
{
|
||||
if (0 == strcasecmp(attribute_obj[i].attributeName, "clientIp")) clientIp1 = attribute_obj[i].attributeValue;
|
||||
if (0 == strcasecmp(attribute_obj[i].attributeName, "clientPort")) clientPort1 = atoi(attribute_obj[i].attributeValue);
|
||||
if (0 == strcasecmp(attribute_obj[i].attributeName, "serverIp")) serverIp1 = attribute_obj[i].attributeValue;
|
||||
if (0 == strcasecmp(attribute_obj[i].attributeName, "serverPort")) serverPort1 = atoi(attribute_obj[i].attributeValue);
|
||||
if (0 == strcasecmp(attribute_obj[i].attributeName, "addrType")) addr_type = atoi(attribute_obj[i].attributeValue);
|
||||
if (0 == strcasecmp(attribute_obj[i].attributeName, "protocol")) protocol = atoi(attribute_obj[i].attributeValue);
|
||||
}
|
||||
|
||||
struct ipaddr *ip_addr = ALLOC(struct ipaddr, 1);
|
||||
if(addr_type == 4)
|
||||
{
|
||||
@@ -181,6 +177,36 @@ struct ipaddr *ip_to_stream_addr(char *clientIp1, unsigned int clientPort1, char
|
||||
|
||||
return ip_addr;
|
||||
}
|
||||
#endif
|
||||
|
||||
struct ipaddr *ip_to_stream_addr(char *clientIp1, unsigned int clientPort1, char *serverIp1, unsigned int serverPort1, int addr_type)
|
||||
{
|
||||
struct ipaddr *ip_addr = ALLOC(struct ipaddr, 1);
|
||||
if(addr_type == 4)
|
||||
{
|
||||
struct stream_tuple4_v4 *v4_addr = ALLOC(struct stream_tuple4_v4, 1);
|
||||
ip_addr->addrtype=ADDR_TYPE_IPV4;
|
||||
inet_pton(AF_INET,clientIp1,&(v4_addr->saddr));
|
||||
v4_addr->source=htons(clientPort1);
|
||||
inet_pton(AF_INET,serverIp1,&(v4_addr->daddr));
|
||||
v4_addr->dest=htons(serverPort1);
|
||||
ip_addr->v4=v4_addr;
|
||||
}
|
||||
if(addr_type == 6)
|
||||
{
|
||||
struct stream_tuple4_v6 *v6_addr = ALLOC(struct stream_tuple4_v6, 1);
|
||||
ip_addr->addrtype=ADDR_TYPE_IPV6;
|
||||
inet_pton(AF_INET6,clientIp1,&(v6_addr->saddr));
|
||||
v6_addr->source=htons(clientPort1);
|
||||
inet_pton(AF_INET6,serverIp1,&(v6_addr->daddr));
|
||||
v6_addr->dest=htons(serverPort1);
|
||||
ip_addr->v6=v6_addr;
|
||||
}
|
||||
mesa_runtime_log(RLOG_LV_DEBUG, MODULE_NAME, "[I] attributeName = ip, clientIp1=%s, clientPort1=%d, serverIp=%s, serverPort=%d, addr_type = %d",
|
||||
clientIp1, clientPort1, serverIp1, serverPort1, addr_type);
|
||||
|
||||
return ip_addr;
|
||||
}
|
||||
|
||||
void ipaddr_free(struct ipaddr *ip_addr)
|
||||
{
|
||||
@@ -199,6 +225,7 @@ void ipaddr_free(struct ipaddr *ip_addr)
|
||||
cJSON *get_query_from_request(const char *data, int thread_id)
|
||||
{
|
||||
int i = 0;
|
||||
size_t hit_cnt = 0;
|
||||
char buff[VERIFY_STRING_MAX], *p = NULL;;
|
||||
|
||||
cJSON* data_json = cJSON_Parse(data);
|
||||
@@ -207,108 +234,124 @@ cJSON *get_query_from_request(const char *data, int thread_id)
|
||||
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "invalid policy parameter");
|
||||
return NULL;
|
||||
}
|
||||
cJSON *policy_obj=NULL, *data_obj=NULL, *list_arry = NULL;
|
||||
cJSON *policy_obj=NULL, *data_obj=NULL;
|
||||
policy_obj=cJSON_CreateObject();
|
||||
|
||||
cJSON_AddNumberToObject(policy_obj, "code", 200);
|
||||
cJSON_AddStringToObject(policy_obj, "msg", "Success");
|
||||
cJSON_AddNumberToObject(policy_obj, "success", 1);
|
||||
|
||||
data_obj = cJSON_CreateObject();
|
||||
cJSON_AddItemToObject(policy_obj, "data", data_obj);
|
||||
|
||||
list_arry=cJSON_CreateArray();
|
||||
cJSON_AddItemToObject(data_obj, "list", list_arry);
|
||||
char *log_payload=NULL;
|
||||
|
||||
cJSON* item = NULL, *subitem = NULL, *subchild = NULL;
|
||||
cJSON* attributes=NULL, *attributeValue=NULL;
|
||||
item = cJSON_GetObjectItem(data_json,"verifyList");
|
||||
if(item && item->type==cJSON_Array)
|
||||
{
|
||||
for (subitem = item->child; subitem != NULL; subitem = subitem->next)
|
||||
{
|
||||
struct policy_query_list *query_list = ALLOC(struct policy_query_list, 1);
|
||||
|
||||
struct verify_policy_query *policy_query = ALLOC(struct verify_policy_query, 1);
|
||||
item = cJSON_GetObjectItem(subitem,"policyType");
|
||||
if(item && item->type==cJSON_String)
|
||||
{
|
||||
query_list->type = tsg_policy_type_str2idx(item->valuestring);
|
||||
policy_query->type = tsg_policy_type_str2idx(item->valuestring);
|
||||
}
|
||||
item = cJSON_GetObjectItem(subitem,"verifyConditions");
|
||||
if(item && item->type==cJSON_Array)
|
||||
item = cJSON_GetObjectItem(subitem,"verifySession");
|
||||
if(item == NULL || item->type!=cJSON_Object)
|
||||
{
|
||||
goto end;
|
||||
}
|
||||
attributes = cJSON_GetObjectItem(item,"attributes");
|
||||
if(attributes && attributes->type==cJSON_Array)
|
||||
{
|
||||
void *ctx = pangu_http_ctx_new(thread_id);
|
||||
|
||||
for (subchild = item->child; subchild != NULL; subchild = subchild->next)
|
||||
for (subchild = attributes->child; subchild != NULL; subchild = subchild->next)
|
||||
{
|
||||
p = buff;
|
||||
item = cJSON_GetObjectItem(subchild, "contentType");
|
||||
item = cJSON_GetObjectItem(subchild, "attributeName");
|
||||
if(item && item->type==cJSON_String)
|
||||
{
|
||||
query_list->table_obj[i].keyword_scope = item->valuestring;
|
||||
p += snprintf(p, sizeof(buff) - (p - buff), "contentType = %s",query_list->table_obj[i].keyword_scope);
|
||||
policy_query->query_obj[i].attri_name = item->valuestring;
|
||||
p += snprintf(p, sizeof(buff) - (p - buff), "attributeName = %s",policy_query->query_obj[i].attri_name);
|
||||
}
|
||||
if(0 == strcasecmp(query_list->table_obj[i].keyword_scope, "subscriberid"))
|
||||
{
|
||||
item = cJSON_GetObjectItem(subchild,"subscriberid");
|
||||
if(item && item->type==cJSON_String)
|
||||
{
|
||||
query_list->table_obj[i].subscriberid = item->valuestring;
|
||||
p += snprintf(p, sizeof(buff) - (p - buff), "subscriberid = %s",query_list->table_obj[i].subscriberid);
|
||||
}
|
||||
http_scan(query_list->table_obj[i].keyword, query_list->type, EV_HTTP_SUBSCRIBE_ID, NULL, list_arry, ctx);
|
||||
policy_query->query_obj[i].attributes=cJSON_Duplicate(subchild, 1);
|
||||
|
||||
i++;
|
||||
continue;
|
||||
item = cJSON_GetObjectItem(subchild, "tableName");
|
||||
if(item && item->type==cJSON_String)
|
||||
{
|
||||
policy_query->query_obj[i].protocol_field = protoco_field_type_str2idx(policy_query->type, item->valuestring, buff, &p);
|
||||
}
|
||||
if(0 == strcasecmp(query_list->table_obj[i].keyword_scope, "ip"))
|
||||
|
||||
attributeValue = cJSON_GetObjectItem(subchild, "attributeValue");
|
||||
if(attributeValue == NULL || attributeValue->type!=cJSON_Object)
|
||||
{
|
||||
goto end;
|
||||
}
|
||||
if(0 == strcasecmp(policy_query->query_obj[i].attri_name, "ip"))
|
||||
{
|
||||
int addr_type=0, __attribute__((__unused__))protocol=0;
|
||||
char *clientIp1=NULL,*serverIp1=NULL;
|
||||
unsigned int clientPort1=0,serverPort1=0;
|
||||
|
||||
item = cJSON_GetObjectItem(subchild,"clientIp");
|
||||
item = cJSON_GetObjectItem(attributeValue,"clientIp");
|
||||
if(item && item->type==cJSON_String) clientIp1 = item->valuestring;
|
||||
item = cJSON_GetObjectItem(subchild,"serverIp");
|
||||
item = cJSON_GetObjectItem(attributeValue,"serverIp");
|
||||
if(item && item->type==cJSON_String) serverIp1 = (item->valuestring);
|
||||
item = cJSON_GetObjectItem(subchild,"clientPort");
|
||||
item = cJSON_GetObjectItem(attributeValue,"clientPort");
|
||||
if(item && item->type==cJSON_String) clientPort1 =atoi(item->valuestring);
|
||||
item = cJSON_GetObjectItem(subchild,"serverPort");
|
||||
item = cJSON_GetObjectItem(attributeValue,"serverPort");
|
||||
if(item && item->type==cJSON_String) serverPort1 =atoi(item->valuestring);
|
||||
item = cJSON_GetObjectItem(subchild,"protocol");
|
||||
item = cJSON_GetObjectItem(attributeValue,"protocol");
|
||||
if(item && item->type==cJSON_Number) protocol = item->valueint;
|
||||
item=cJSON_GetObjectItem(subchild,"addrType");
|
||||
item=cJSON_GetObjectItem(attributeValue,"addrType");
|
||||
if(item && item->type==cJSON_Number) addr_type = item->valueint;
|
||||
query_list->table_obj[i].ip_addr = ip_to_stream_addr(clientIp1, clientPort1, serverIp1, serverPort1, addr_type);
|
||||
policy_query->query_obj[i].ip_addr = ip_to_stream_addr(clientIp1, clientPort1, serverIp1, serverPort1, addr_type);
|
||||
|
||||
http_scan(NULL, query_list->type, PXY_CTRL_IP, query_list->table_obj[i].ip_addr, list_arry, ctx);
|
||||
hit_cnt = http_scan(policy_query->type, &policy_query->query_obj[i], data_obj, ctx);
|
||||
|
||||
ipaddr_free(query_list->table_obj[i].ip_addr);
|
||||
ipaddr_free(policy_query->query_obj[i].ip_addr);
|
||||
i++;
|
||||
continue;
|
||||
}
|
||||
item = cJSON_GetObjectItem(subchild, "protocolField");
|
||||
if(item && item->type==cJSON_String)
|
||||
item = cJSON_GetObjectItem(attributeValue,"string");
|
||||
{
|
||||
query_list->table_obj[i].protocol_field = protoco_field_type_str2idx(query_list->type, item->valuestring, buff, p);
|
||||
}
|
||||
item = cJSON_GetObjectItem(subchild, "content");
|
||||
if(item && item->type==cJSON_String)
|
||||
{
|
||||
query_list->table_obj[i].keyword = item->valuestring;
|
||||
p += snprintf(p, sizeof(buff) - (p - buff), ", content = %s",query_list->table_obj[i].keyword);
|
||||
policy_query->query_obj[i].keyword = item->valuestring;
|
||||
p += snprintf(p, sizeof(buff) - (p - buff), ", content = %s",policy_query->query_obj[i].keyword);
|
||||
}
|
||||
mesa_runtime_log(RLOG_LV_DEBUG, MODULE_NAME, "[I] %s", buff);
|
||||
|
||||
http_scan(query_list->table_obj[i].keyword, query_list->type, query_list->table_obj[i].protocol_field, NULL, list_arry, ctx);
|
||||
|
||||
hit_cnt = http_scan(policy_query->type, &policy_query->query_obj[i], data_obj, ctx);
|
||||
i++;
|
||||
memset(buff, 0, VERIFY_STRING_MAX);
|
||||
}
|
||||
if (hit_cnt > 0)
|
||||
{
|
||||
int item = 0;
|
||||
cJSON *verfifySession = cJSON_CreateObject();
|
||||
cJSON_AddItemToObject(data_obj, "verfifySession", verfifySession);
|
||||
cJSON *attributes=cJSON_CreateArray();
|
||||
cJSON_AddItemToObject(verfifySession, "attributes", attributes);
|
||||
for (item = 0; item < i; item++)
|
||||
{
|
||||
get_scan_status(&policy_query->query_obj[item], attributes,data_obj, ctx);
|
||||
}
|
||||
}
|
||||
pangu_http_ctx_free(ctx);
|
||||
}
|
||||
|
||||
i=0;
|
||||
FREE(&query_list);
|
||||
FREE(&policy_query);
|
||||
}
|
||||
end:
|
||||
if (hit_cnt > 0)
|
||||
{
|
||||
cJSON_AddBoolToObject(policy_obj, "success", true);
|
||||
}
|
||||
else
|
||||
{
|
||||
cJSON_AddBoolToObject(policy_obj, "success", false);
|
||||
}
|
||||
}
|
||||
cJSON_Delete(data_json);
|
||||
@@ -345,7 +388,7 @@ void evhttp_request_cb(struct evhttp_request *evh_req, void *arg)
|
||||
struct evbuffer * evbuf_body = NULL;
|
||||
char *input = NULL; ssize_t inputlen=0;
|
||||
|
||||
struct verify_proxy_thread *thread_ctx = (struct verify_proxy_thread *)arg;
|
||||
struct verify_policy_thread *thread_ctx = (struct verify_policy_thread *)arg;
|
||||
|
||||
if (evhttp_request_get_command(evh_req) != EVHTTP_REQ_POST)
|
||||
{
|
||||
@@ -380,10 +423,10 @@ finish:
|
||||
return;
|
||||
}
|
||||
|
||||
void * verify_policy_thread(void * arg)
|
||||
void * verify_policy_thread_func(void * arg)
|
||||
{
|
||||
struct evhttp_bound_socket *bound = NULL;
|
||||
struct verify_proxy_thread *thread_ctx = (struct verify_proxy_thread *)arg;
|
||||
struct verify_policy_thread *thread_ctx = (struct verify_policy_thread *)arg;
|
||||
|
||||
thread_ctx->base = event_base_new();
|
||||
if (! thread_ctx->base)
|
||||
@@ -398,7 +441,7 @@ void * verify_policy_thread(void * arg)
|
||||
goto error;
|
||||
}
|
||||
|
||||
evhttp_set_cb(thread_ctx->http, "/v1/policy/verification", evhttp_request_cb, thread_ctx);
|
||||
evhttp_set_cb(thread_ctx->http, "/v1/policy/verify", evhttp_request_cb, thread_ctx);
|
||||
|
||||
bound = evhttp_accept_socket_with_handle(thread_ctx->http, thread_ctx->accept_fd);
|
||||
if (bound != NULL)
|
||||
@@ -509,11 +552,11 @@ err:
|
||||
return fd;
|
||||
}
|
||||
|
||||
int pangu_policy_work_thread_run(struct verify_proxy * verify)
|
||||
int pangu_policy_work_thread_run(struct verify_policy * verify)
|
||||
{
|
||||
int xret = 0;
|
||||
unsigned int tid = 0;
|
||||
struct verify_proxy_thread *thread_ctx = NULL;
|
||||
struct verify_policy_thread *thread_ctx = NULL;
|
||||
|
||||
struct sockaddr_in sin;
|
||||
memset(&sin, 0, sizeof(struct sockaddr_in));
|
||||
@@ -528,11 +571,11 @@ int pangu_policy_work_thread_run(struct verify_proxy * verify)
|
||||
|
||||
for (tid = 0; tid < verify->nr_work_threads; tid++)
|
||||
{
|
||||
verify->work_threads[tid] = ALLOC(struct verify_proxy_thread, 1);
|
||||
verify->work_threads[tid] = ALLOC(struct verify_policy_thread, 1);
|
||||
thread_ctx = verify->work_threads[tid];
|
||||
thread_ctx->id = tid;
|
||||
thread_ctx->accept_fd =accept_fd;
|
||||
thread_ctx->routine = verify_policy_thread;
|
||||
thread_ctx->routine = verify_policy_thread_func;
|
||||
|
||||
if (pthread_create(&thread_ctx->pid, thread_ctx->attr, thread_ctx->routine, thread_ctx))
|
||||
{
|
||||
@@ -568,7 +611,7 @@ int main(int argc, char * argv[])
|
||||
break;
|
||||
}
|
||||
}
|
||||
g_verify_proxy = ALLOC(struct verify_proxy, 1);
|
||||
g_verify_proxy = ALLOC(struct verify_policy, 1);
|
||||
assert(g_verify_proxy);
|
||||
strcpy(g_verify_proxy->name, "verify_policy");
|
||||
|
||||
|
||||
@@ -8,6 +8,6 @@
|
||||
#ifndef _PANGGU_HTTP_H
|
||||
#define _PANGGU_HTTP_H
|
||||
|
||||
extern int pangu_policy_init(struct verify_proxy * verify, const char* profile_path);
|
||||
extern int pangu_policy_init(struct verify_policy * verify, const char* profile_path);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -62,6 +62,8 @@ struct pangu_http_ctx
|
||||
struct Maat_rule_t result[MAX_SCAN_RESULT];
|
||||
size_t n_enforce;
|
||||
struct Maat_rule_t * enforce_rules;
|
||||
int n_read;
|
||||
struct Maat_hit_path_t hit_path[128];
|
||||
int thread_id;
|
||||
};
|
||||
|
||||
@@ -192,10 +194,42 @@ static enum pangu_action decide_ctrl_action(const struct Maat_rule_t * hit_rules
|
||||
return prior_action;
|
||||
}
|
||||
|
||||
void http_scan(const char *value, enum tsg_policy_type policy_type, int protocol_field, struct ipaddr *ip_addr, cJSON *list_arry, void *pme)
|
||||
void get_scan_status(struct verify_policy_query_obj *query_obj, cJSON *attributes, cJSON *data_obj, void *pme)
|
||||
{
|
||||
int scan_ret = 0;
|
||||
size_t hit_cnt = 0, i = 0;
|
||||
int i=0;
|
||||
cJSON *attributeObj=NULL,*hitPaths=NULL;
|
||||
|
||||
struct pangu_http_ctx * ctx = (struct pangu_http_ctx *) pme;
|
||||
|
||||
attributeObj=query_obj->attributes;
|
||||
cJSON_AddItemToArray(attributes, attributeObj);
|
||||
|
||||
hitPaths=cJSON_CreateArray();
|
||||
cJSON_AddItemToObject(attributeObj, "hitPaths", hitPaths);
|
||||
|
||||
cJSON *histObj=NULL;
|
||||
for(i=0; i< ctx->n_read; i++)
|
||||
{
|
||||
if (query_obj->nth_scan == ctx->hit_path[i].Nth_scan)
|
||||
{
|
||||
histObj=cJSON_CreateObject();
|
||||
cJSON_AddItemToArray(hitPaths, histObj);
|
||||
cJSON_AddNumberToObject(histObj, "itemId", ctx->hit_path[i].region_id);
|
||||
cJSON_AddNumberToObject(histObj, "objectId", ctx->hit_path[i].sub_group_id);
|
||||
if(ctx->hit_path[i].compile_id > 0)
|
||||
{
|
||||
cJSON_AddNumberToObject(histObj, "topObjectId", ctx->hit_path[i].top_group_id);
|
||||
cJSON_AddNumberToObject(histObj, "protocolField", ctx->hit_path[i].virtual_table_id);
|
||||
cJSON_AddNumberToObject(histObj, "policyId", ctx->hit_path[i].compile_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
size_t http_scan(enum verify_policy_type policy_type, struct verify_policy_query_obj *query_obj, cJSON *data_obj, void *pme)
|
||||
{
|
||||
int scan_ret=0, n_read;
|
||||
size_t hit_cnt=0, i=0;
|
||||
|
||||
struct http_field_name req_fields[]={ {"User-Agent", TFE_HTTP_USER_AGENT},
|
||||
{"Cookie", TFE_HTTP_COOKIE}};
|
||||
@@ -205,14 +239,20 @@ void http_scan(const char *value, enum tsg_policy_type policy_type, int protocol
|
||||
|
||||
struct pangu_http_ctx * ctx = (struct pangu_http_ctx *) pme;
|
||||
|
||||
int protocol_field = query_obj->protocol_field;
|
||||
const char *value = query_obj->keyword;
|
||||
|
||||
if (protocol_field == PXY_CTRL_IP)
|
||||
{
|
||||
scan_ret = Maat_scan_proto_addr(g_pangu_rt->maat[policy_type], g_pangu_rt->scan_table_id[policy_type][PXY_CTRL_IP], ip_addr, 0,
|
||||
scan_ret = Maat_scan_proto_addr(g_pangu_rt->maat[policy_type], g_pangu_rt->scan_table_id[policy_type][PXY_CTRL_IP], query_obj->ip_addr, 0,
|
||||
ctx->result+hit_cnt, MAX_SCAN_RESULT-hit_cnt, &(ctx->scan_mid), ctx->thread_id);
|
||||
if (scan_ret > 0)
|
||||
{
|
||||
hit_cnt += scan_ret;
|
||||
}
|
||||
n_read=Maat_get_scan_status(g_pangu_rt->maat[policy_type], &(ctx->scan_mid), MAAT_GET_SCAN_HIT_PATH, ctx->hit_path, sizeof(ctx->hit_path));
|
||||
query_obj->nth_scan = ctx->hit_path[ctx->n_read].Nth_scan;
|
||||
ctx->n_read=n_read;
|
||||
goto decide;
|
||||
}
|
||||
|
||||
@@ -234,6 +274,9 @@ void http_scan(const char *value, enum tsg_policy_type policy_type, int protocol
|
||||
hit_cnt += scan_ret;
|
||||
}
|
||||
}
|
||||
n_read=Maat_get_scan_status(g_pangu_rt->maat[policy_type], &(ctx->scan_mid), MAAT_GET_SCAN_HIT_PATH, ctx->hit_path, sizeof(ctx->hit_path));
|
||||
query_obj->nth_scan = ctx->hit_path[ctx->n_read].Nth_scan;
|
||||
ctx->n_read=n_read;
|
||||
goto decide;
|
||||
}
|
||||
scan_ret = Maat_full_scan_string(g_pangu_rt->maat[policy_type], g_pangu_rt->scan_table_id[policy_type][protocol_field],
|
||||
@@ -244,41 +287,37 @@ void http_scan(const char *value, enum tsg_policy_type policy_type, int protocol
|
||||
{
|
||||
hit_cnt+=scan_ret;
|
||||
}
|
||||
n_read=Maat_get_scan_status(g_pangu_rt->maat[policy_type], &(ctx->scan_mid), MAAT_GET_SCAN_HIT_PATH, ctx->hit_path, sizeof(ctx->hit_path));
|
||||
query_obj->nth_scan = ctx->hit_path[ctx->n_read].Nth_scan;
|
||||
ctx->n_read=n_read;
|
||||
decide:
|
||||
if (hit_cnt > 0)
|
||||
{
|
||||
ctx->action = decide_ctrl_action(ctx->result, hit_cnt, &ctx->enforce_rules, &ctx->n_enforce);
|
||||
ctx->hit_cnt = hit_cnt;
|
||||
cJSON *execute_obj=NULL, *hit_obj=NULL;
|
||||
cJSON *item_obj=NULL, *policy_obj=NULL;
|
||||
|
||||
item_obj=cJSON_CreateObject();
|
||||
cJSON_AddItemToArray(list_arry, item_obj);
|
||||
|
||||
cJSON *hit_obj=NULL, *policy_obj=NULL;
|
||||
hit_obj=cJSON_CreateArray();
|
||||
cJSON_AddItemToObject(item_obj, "hitPolicyList", hit_obj);
|
||||
cJSON_AddItemToObject(data_obj, "hitPolicyList", hit_obj);
|
||||
if (ctx->hit_cnt >= 1)
|
||||
{
|
||||
for (i = 0; i < ctx->hit_cnt; i++)
|
||||
{
|
||||
policy_obj=cJSON_CreateObject();
|
||||
cJSON_AddNumberToObject(policy_obj, "policyId",ctx->result[i].config_id);
|
||||
cJSON_AddStringToObject(policy_obj, "policyName", "");
|
||||
if (ctx->enforce_rules[0].config_id == ctx->result[i].config_id)
|
||||
{
|
||||
cJSON_AddBoolToObject(policy_obj, "isExecutePolicy", true);
|
||||
}
|
||||
else
|
||||
{
|
||||
cJSON_AddBoolToObject(policy_obj, "isExecutePolicy", false);
|
||||
}
|
||||
cJSON_AddItemToArray(hit_obj, policy_obj);
|
||||
}
|
||||
}
|
||||
/*executePolicyList **/
|
||||
execute_obj=cJSON_CreateArray();
|
||||
cJSON_AddItemToObject(item_obj, "executePolicyList", execute_obj);
|
||||
policy_obj=cJSON_CreateObject();
|
||||
cJSON_AddNumberToObject(policy_obj, "policyId", ctx->enforce_rules[0].config_id);
|
||||
cJSON_AddItemToArray(execute_obj, policy_obj);
|
||||
}
|
||||
return ;
|
||||
}
|
||||
|
||||
char * verify_policy_str_to_addr()
|
||||
{
|
||||
return NULL;
|
||||
return hit_cnt;
|
||||
}
|
||||
|
||||
static Maat_feather_t create_maat_feather(const char * instance_name, const char * profile, const char * section, const char *table_name, int max_thread, void * logger)
|
||||
@@ -420,7 +459,7 @@ void subscribe_id_dup_cb(int table_id, MAAT_PLUGIN_EX_DATA* to, MAAT_PLUGIN_EX_D
|
||||
return;
|
||||
}
|
||||
|
||||
int pangu_policy_init(struct verify_proxy * verify, const char* profile_path)
|
||||
int pangu_policy_init(struct verify_policy * verify, const char* profile_path)
|
||||
{
|
||||
int ret = -1;
|
||||
|
||||
@@ -428,7 +467,6 @@ int pangu_policy_init(struct verify_proxy * verify, const char* profile_path)
|
||||
|
||||
g_pangu_rt->thread_num = verify->nr_work_threads;
|
||||
g_pangu_rt->local_logger = verify->logger;
|
||||
|
||||
g_pangu_rt->maat[PXY_TABLE_MANIPULATION] = create_maat_feather("static", profile_path, "MAAT", "table_info", g_pangu_rt->thread_num, g_pangu_rt->local_logger);
|
||||
if (!g_pangu_rt->maat[PXY_TABLE_MANIPULATION])
|
||||
{
|
||||
@@ -479,7 +517,7 @@ error_out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
int security_policy_init(struct verify_proxy * verify, const char* profile_path)
|
||||
int security_policy_init(struct verify_policy * verify, const char* profile_path)
|
||||
{
|
||||
int ret = -1;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user