gfwleak/tango-fw-dns-plug
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gfwleak:v3.0.3
Branches Tags
gfwleak:master gfwleak:feature-enforce-direction
gfwleak:v4.0.5 gfwleak:v4.0.4 gfwleak:v4.0.3 gfwleak:v4.0.2 gfwleak:v4.0.1 gfwleak:v4.0.0 gfwleak:v3.1.0 gfwleak:v3.0.9 gfwleak:v3.0.8 gfwleak:v3.0.7 gfwleak:v3.0.6 gfwleak:v3.0.5 gfwleak:v3.0.4 gfwleak:v3.0.3 gfwleak:v3.0.2.20.11 gfwleak:v3.0.1.20.09 gfwleak:v3.0.0.20.07 gfwleak:v1.0.4 gfwleak:v1.0.3.20.04 gfwleak:v1.0.2 gfwleak:v1.0.1
...
compare: gfwleak:v3.0.5
Branches Tags
gfwleak:feature-enforce-direction gfwleak:master
gfwleak:v4.0.5 gfwleak:v4.0.4 gfwleak:v4.0.3 gfwleak:v4.0.2 gfwleak:v4.0.1 gfwleak:v4.0.0 gfwleak:v3.1.0 gfwleak:v3.0.9 gfwleak:v3.0.8 gfwleak:v3.0.7 gfwleak:v3.0.6 gfwleak:v3.0.5 gfwleak:v3.0.4 gfwleak:v3.0.3 gfwleak:v3.0.2.20.11 gfwleak:v3.0.1.20.09 gfwleak:v3.0.0.20.07 gfwleak:v1.0.4 gfwleak:v1.0.3.20.04 gfwleak:v1.0.2 gfwleak:v1.0.1

2 Commits
v3.0.3 ... v3.0.5

Author SHA1 Message Date
liuxueli
2a25c20cea 控制日志输出，在FATAL模式下不调用printaddr 2021-04-19 20:21:26 +08:00
刘学利
ab097e3bff 命中策略后返回GIVEME，处理链接上后续的DNS请求 
用户自定义没有符合的欺骗IP时，串联环境丢弃真实应答包
 2021-04-17 13:38:01 +00:00
1 changed files with 36 additions and 25 deletions
Expand all files Collapse all files

61
src/fw_dns_plug.cpp
View File

@@ -35,6 +35,10 @@ static __attribute__((__used__)) const char * GIT_VERSION_UNKNOWN = NULL;
} }
#endif #endif
#ifndef PRINTADDR
#define PRINTADDR(a, b) ((b)<RLOG_LV_FATAL ? printaddr(&(a->addr), a->threadnum) : "")
#endif
char *g_fw_dns_conffile=(char *)"tsgconf/main.conf"; char *g_fw_dns_conffile=(char *)"tsgconf/main.conf";
char FW_DNS_PLUG_VERSION_20191220=0; char FW_DNS_PLUG_VERSION_20191220=0;
@@ -112,7 +116,7 @@ static char fw_dns_action(struct streaminfo *a_stream, dns_info_t *dns_info, Maa
p_result->service_defined, p_result->service_defined,
(char *)dns_info->query_question.qname, (char *)dns_info->query_question.qname,
dns_info->query_question.qtype, dns_info->query_question.qtype,
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
} }
else else
@@ -131,7 +135,7 @@ static char fw_dns_action(struct streaminfo *a_stream, dns_info_t *dns_info, Maa
tmp_buff, tmp_buff,
(char *)dns_info->query_question.qname, (char *)dns_info->query_question.qname,
dns_info->query_question.qtype, dns_info->query_question.qtype,
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
} }
@@ -147,7 +151,7 @@ static char fw_dns_action(struct streaminfo *a_stream, dns_info_t *dns_info, Maa
(tmp_buff==NULL) ? p_result->service_defined : tmp_buff, (tmp_buff==NULL) ? p_result->service_defined : tmp_buff,
(char *)dns_info->query_question.qname, (char *)dns_info->query_question.qname,
dns_info->query_question.qtype, dns_info->query_question.qtype,
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
if(tmp_buff!=NULL) if(tmp_buff!=NULL)
@@ -156,7 +160,7 @@ static char fw_dns_action(struct streaminfo *a_stream, dns_info_t *dns_info, Maa
tmp_buff=NULL; tmp_buff=NULL;
} }
return PROT_STATE_GIVEME; return PROT_STATE_GIVEME|PROT_STATE_DROPPKT;
} }
item=cJSON_GetObjectItem(object, "method"); item=cJSON_GetObjectItem(object, "method");
@@ -168,7 +172,7 @@ static char fw_dns_action(struct streaminfo *a_stream, dns_info_t *dns_info, Maa
switch(method_type) switch(method_type)
{ {
case TSG_METHOD_TYPE_DROP: case TSG_METHOD_TYPE_DROP:
state=PROT_STATE_DROPME|PROT_STATE_DROPPKT; state=PROT_STATE_GIVEME|PROT_STATE_DROPPKT;
break; break;
case TSG_METHOD_TYPE_REDIRECTION: case TSG_METHOD_TYPE_REDIRECTION:
if(g_fw_dns_plug_info.mode==0 && dns_info->hdr_info.qr==1) //mirror if(g_fw_dns_plug_info.mode==0 && dns_info->hdr_info.qr==1) //mirror
@@ -240,6 +244,16 @@ static char fw_dns_action(struct streaminfo *a_stream, dns_info_t *dns_info, Maa
payload_len=build_cheat_pkt(cheat_pkt_payload, MAX_CHEAT_PKT_PAYLOAD_LEN, &dns_info->query_question, cheat_opt, used_num); payload_len=build_cheat_pkt(cheat_pkt_payload, MAX_CHEAT_PKT_PAYLOAD_LEN, &dns_info->query_question, cheat_opt, used_num);
if(payload_len==-1) if(payload_len==-1)
{ {
MESA_handle_runtime_log(g_fw_dns_plug_info.logger,
RLOG_LV_FATAL,
"DO_ACTION",
"Hit policy_id: %d service: %d action: %d build_cheat_pkt ret: %d addr: %s",
p_result->config_id,
p_result->service_id,
p_result->action,
payload_len,
PRINTADDR(a_stream, g_fw_dns_plug_info.level)
);
return -1; return -1;
} }
@@ -252,7 +266,6 @@ static char fw_dns_action(struct streaminfo *a_stream, dns_info_t *dns_info, Maa
senddir = a_stream->routedir; senddir = a_stream->routedir;
} }
ret=MESA_inject_pkt(a_stream, (const char *)cheat_pkt_payload, payload_len, (const char *)a_packet, senddir); ret=MESA_inject_pkt(a_stream, (const char *)cheat_pkt_payload, payload_len, (const char *)a_packet, senddir);
if(ret<0) if(ret<0)
{ {
MESA_handle_runtime_log(g_fw_dns_plug_info.logger, MESA_handle_runtime_log(g_fw_dns_plug_info.logger,
@@ -264,11 +277,11 @@ static char fw_dns_action(struct streaminfo *a_stream, dns_info_t *dns_info, Maa
dns_info->query_question.qtype, dns_info->query_question.qtype,
p_result->config_id, p_result->config_id,
p_result->service_id, p_result->service_id,
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
} }
state=PROT_STATE_DROPME|PROT_STATE_DROPPKT; state=PROT_STATE_GIVEME|PROT_STATE_DROPPKT;
} }
else else
{ {
@@ -282,9 +295,9 @@ static char fw_dns_action(struct streaminfo *a_stream, dns_info_t *dns_info, Maa
(tmp_buff==NULL) ? p_result->service_defined : tmp_buff, (tmp_buff==NULL) ? p_result->service_defined : tmp_buff,
(char *)dns_info->query_question.qname, (char *)dns_info->query_question.qname,
dns_info->query_question.qtype, dns_info->query_question.qtype,
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
state=PROT_STATE_GIVEME; state=PROT_STATE_GIVEME|PROT_STATE_DROPPKT;
} }
break; break;
default: default:
@@ -343,10 +356,11 @@ static int fw_dns_send_log(struct streaminfo *a_stream, dns_info_t *dns_info, st
} }
cname=cJSON_PrintUnformatted(cname_array); cname=cJSON_PrintUnformatted(cname_array);
if(strlen(cname)>0) if(cname!=NULL && strlen(cname)>0)
{ {
TLD_append(handle, (char *)"dns_cname", (void *)cname, TLD_TYPE_STRING); TLD_append(handle, (char *)"dns_cname", (void *)cname, TLD_TYPE_STRING);
free(cname); cJSON_free(cname);
cname=NULL;
} }
cJSON_Delete(cname_array); cJSON_Delete(cname_array);
cname_array=NULL; cname_array=NULL;
@@ -359,7 +373,7 @@ static int fw_dns_send_log(struct streaminfo *a_stream, dns_info_t *dns_info, st
cJSON_Delete(object); cJSON_Delete(object);
object=NULL; object=NULL;
free(rr_buf); cJSON_free(rr_buf);
rr_buf=NULL; rr_buf=NULL;
TLD_append(handle, (char *)"dns_sub", (void *)(long)dns_sec, TLD_TYPE_LONG); TLD_append(handle, (char *)"dns_sub", (void *)(long)dns_sec, TLD_TYPE_LONG);
@@ -385,7 +399,7 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info, void **pme, int
struct Maat_rule_t result[MAX_RESULT_NUM], *p_result=NULL; struct Maat_rule_t result[MAX_RESULT_NUM], *p_result=NULL;
dns_info_t *dns_info=(dns_info_t *)session_info->app_info; dns_info_t *dns_info=(dns_info_t *)session_info->app_info;
if(dns_info==NULL) if(dns_info==NULL || a_stream==NULL)
{ {
return state; return state;
} }
@@ -397,7 +411,7 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info, void **pme, int
"DNS_PLUG", "DNS_PLUG",
"Qname is %s, addr: %s", "Qname is %s, addr: %s",
(dns_info==NULL) ? "NULL" : ((strlen((char *)dns_info->query_question.qname)==0) ? "NULL" : (char *)dns_info->query_question.qname), (dns_info==NULL) ? "NULL" : ((strlen((char *)dns_info->query_question.qname)==0) ? "NULL" : (char *)dns_info->query_question.qname),
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
return state; return state;
} }
@@ -414,7 +428,7 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info, void **pme, int
result[hit_num].action, result[hit_num].action,
(char *)dns_info->query_question.qname, (char *)dns_info->query_question.qname,
dns_info->query_question.qtype, dns_info->query_question.qtype,
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
hit_num+=ret; hit_num+=ret;
} }
@@ -427,7 +441,7 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info, void **pme, int
(char *)dns_info->query_question.qname, (char *)dns_info->query_question.qname,
dns_info->query_question.qtype, dns_info->query_question.qtype,
ret, ret,
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
} }
@@ -455,7 +469,7 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info, void **pme, int
result[hit_num].config_id, result[hit_num].config_id,
result[hit_num].service_id, result[hit_num].service_id,
result[hit_num].action, result[hit_num].action,
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
hit_num+=ret; hit_num+=ret;
} }
@@ -468,7 +482,7 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info, void **pme, int
(char *)dns_info->query_question.qname, (char *)dns_info->query_question.qname,
dns_info->query_question.qtype, dns_info->query_question.qtype,
ret, ret,
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
} }
@@ -488,7 +502,7 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info, void **pme, int
result[hit_num].config_id, result[hit_num].config_id,
result[hit_num].service_id, result[hit_num].service_id,
result[hit_num].action, result[hit_num].action,
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
hit_num+=ret; hit_num+=ret;
} }
@@ -501,7 +515,7 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info, void **pme, int
(char *)dns_info->query_question.qname, (char *)dns_info->query_question.qname,
category_id[i], category_id[i],
ret, ret,
(g_fw_dns_plug_info.level<RLOG_LV_FATAL ? printaddr(&a_stream->addr, a_stream->threadnum) : "") PRINTADDR(a_stream, g_fw_dns_plug_info.level)
); );
} }
@@ -514,10 +528,7 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info, void **pme, int
if(p_result!=NULL) if(p_result!=NULL)
{ {
state=fw_dns_action(a_stream, dns_info, p_result, a_packet); state=fw_dns_action(a_stream, dns_info, p_result, a_packet);
if(PROT_STATE_GIVEME!=state) fw_dns_send_log(a_stream, dns_info, p_result, 1, thread_seq);
{
fw_dns_send_log(a_stream, dns_info, p_result, 1, thread_seq);
}
} }
else else
{ {