TSG-4965 功能端通过界面下发的 JA3 Fingerprint 识别 Pinning APP 和未装根证书的 APP
This commit is contained in:
@@ -1,8 +1,154 @@
|
||||
#include <ssl_service_cache.h>
|
||||
#include <tfe_utils.h>
|
||||
#include <MESA/MESA_htable.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <MESA/Maat_rule.h>
|
||||
#include <tfe_resource.h>
|
||||
#include <ssl_stream.h>
|
||||
|
||||
struct ssl_ja3_enforcer
|
||||
{
|
||||
Maat_feather_t maat;
|
||||
int table_id;
|
||||
};
|
||||
|
||||
struct ssl_svc_ja3
|
||||
{
|
||||
char ja3_hash[33];
|
||||
int fingerprint_id;
|
||||
int pinning_state;
|
||||
int is_valid;
|
||||
int ref_cnt;
|
||||
};
|
||||
|
||||
static struct ssl_ja3_enforcer g_static_enforcer = {0};
|
||||
|
||||
static void ssl_svc_ja3_param_dup_cb(int table_id, MAAT_PLUGIN_EX_DATA *to, MAAT_PLUGIN_EX_DATA *from, long argl, void *argp)
|
||||
{
|
||||
struct ssl_svc_ja3 *param = (struct ssl_svc_ja3 *)*from;
|
||||
if (param)
|
||||
{
|
||||
__sync_add_and_fetch(&(param->ref_cnt), 1);
|
||||
*to = param;
|
||||
}
|
||||
else
|
||||
{
|
||||
*to = NULL;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
static void ssl_svc_ja3_param_new_cb(int table_id, const char *key, const char *table_line, MAAT_PLUGIN_EX_DATA *ad, long argl, void *argp)
|
||||
{
|
||||
int is_valid = 0;
|
||||
int pinning_state = 0;
|
||||
int fingerprint_id = 0;
|
||||
char ja3_hash[33] = {0};
|
||||
|
||||
if (sscanf(table_line, "%d\t%s\t%d\t%d", &fingerprint_id, ja3_hash, &pinning_state, &is_valid) != 4)
|
||||
{
|
||||
TFE_LOG_ERROR(g_default_logger, "Invalid JA3 policy: %s", table_line);
|
||||
return;
|
||||
}
|
||||
|
||||
struct ssl_svc_ja3 *param = ALLOC(struct ssl_svc_ja3, 1);
|
||||
param->fingerprint_id = fingerprint_id;
|
||||
memcpy(param->ja3_hash, ja3_hash, 32);
|
||||
param->pinning_state = pinning_state;
|
||||
param->is_valid = is_valid;
|
||||
param->ref_cnt = 1;
|
||||
|
||||
*ad = param;
|
||||
TFE_LOG_INFO(g_default_logger, "Add JA3 policy: id:%d, ja3_hash:%s, pinning_state:%d, is_valid:%d, ref_cnt:%d",
|
||||
param->fingerprint_id, param->ja3_hash, param->pinning_state, param->is_valid, param->ref_cnt);
|
||||
}
|
||||
|
||||
static void ssl_svc_ja3_param_free_cb(int table_id, MAAT_PLUGIN_EX_DATA *ad, long argl, void *argp)
|
||||
{
|
||||
struct ssl_svc_ja3 *param = (struct ssl_svc_ja3 *)*ad;
|
||||
if (param == NULL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if ((__sync_sub_and_fetch(¶m->ref_cnt, 1) == 0))
|
||||
{
|
||||
TFE_LOG_INFO(g_default_logger, "Del JA3 policy: id:%d, ja3_hash:%s, pinning_state:%d, is_valid:%d, ref_cnt:%d",
|
||||
param->fingerprint_id, param->ja3_hash, param->pinning_state, param->is_valid, param->ref_cnt);
|
||||
free(param);
|
||||
*ad = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static void ssl_svc_ja3_param_free(struct ssl_svc_ja3 *param)
|
||||
{
|
||||
ssl_svc_ja3_param_free_cb(0, (void **)¶m, 0, NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
static int ssl_svc_ja3_init(const char *table_name)
|
||||
{
|
||||
g_static_enforcer.maat = (Maat_feather_t)tfe_bussiness_resouce_get(STATIC_MAAT);
|
||||
g_static_enforcer.table_id = Maat_table_register(g_static_enforcer.maat, table_name);
|
||||
if (g_static_enforcer.table_id < 0)
|
||||
{
|
||||
TFE_LOG_ERROR(g_default_logger, "Maat table %s register failed.", table_name);
|
||||
return 0;
|
||||
}
|
||||
int ret = Maat_plugin_EX_register(g_static_enforcer.maat,
|
||||
g_static_enforcer.table_id,
|
||||
ssl_svc_ja3_param_new_cb,
|
||||
ssl_svc_ja3_param_free_cb,
|
||||
ssl_svc_ja3_param_dup_cb,
|
||||
NULL,
|
||||
0,
|
||||
&g_static_enforcer);
|
||||
if (ret < 0)
|
||||
{
|
||||
TFE_LOG_ERROR(g_default_logger, "failed at Maat_plugin_EX_register(%s), table_id = %d, ret = %d",
|
||||
table_name, g_static_enforcer.table_id, ret);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
enum ssl_ja3_pinning_status ssl_svc_ja3_scan(char *ja3_hash, char *addr_str)
|
||||
{
|
||||
enum ssl_ja3_pinning_status ret = JA3_PINNING_STATUS_UNKNOWN;
|
||||
struct ssl_svc_ja3 *param = NULL;
|
||||
param = (struct ssl_svc_ja3 *)Maat_plugin_get_EX_data(g_static_enforcer.maat, g_static_enforcer.table_id, ja3_hash);
|
||||
if (param == NULL)
|
||||
{
|
||||
ret = JA3_PINNING_STATUS_UNKNOWN;
|
||||
goto end;
|
||||
}
|
||||
TFE_LOG_INFO(g_default_logger, "Hit JA3 policy: id:%d, ja3_hash:%s, pinning_state:%d, is_valid:%d, ref_cnt:%d, addr:%s",
|
||||
param->fingerprint_id, param->ja3_hash, param->pinning_state, param->is_valid, param->ref_cnt, addr_str);
|
||||
|
||||
if (!param->is_valid)
|
||||
{
|
||||
ret = JA3_PINNING_STATUS_UNKNOWN;
|
||||
goto end;
|
||||
}
|
||||
|
||||
// 1 - pinning
|
||||
if (param->pinning_state)
|
||||
{
|
||||
ret = JA3_PINNING_STATUS_IS_PINNING;
|
||||
}
|
||||
// 0 - not pinning
|
||||
else
|
||||
{
|
||||
ret = JA3_PINNING_STATUS_NOT_PINNING;
|
||||
}
|
||||
|
||||
end:
|
||||
if (param)
|
||||
{
|
||||
ssl_svc_ja3_param_free(param);
|
||||
param = NULL;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct ssl_svc_client_st
|
||||
{
|
||||
@@ -20,11 +166,6 @@ struct ssl_svc_server_st
|
||||
long long ct_st_switched;
|
||||
struct ssl_service_cache* ref_svc_cache;
|
||||
};
|
||||
struct ssl_svc_app_st
|
||||
{
|
||||
unsigned int down_ssl_success_cnt;
|
||||
struct ssl_service_cache* ref_svc_cache;
|
||||
};
|
||||
struct ssl_service_write_args
|
||||
{
|
||||
struct ssl_service_cache* cache;
|
||||
@@ -66,16 +207,6 @@ static void ssl_svc_free_server_st(void * data)
|
||||
free(p);
|
||||
return;
|
||||
}
|
||||
static void ssl_svc_free_app_st(void* data)
|
||||
{
|
||||
struct ssl_svc_app_st* p= (struct ssl_svc_app_st*)data;
|
||||
struct ssl_service_cache* svc_cache=p->ref_svc_cache;
|
||||
if(p->down_ssl_success_cnt>svc_cache->succ_as_app_not_pinning_count)
|
||||
{
|
||||
svc_cache->stat.app_not_pinning_cnt--;
|
||||
}
|
||||
free(p);
|
||||
}
|
||||
static size_t ssl_svc_server_st_mk_key(const struct ssl_chello* chello, const struct tfe_stream_addr * addr, char* key_buff, size_t sz)
|
||||
{
|
||||
size_t key_len=0;
|
||||
@@ -289,45 +420,6 @@ static long srv_st_write_cb(void * data, const uchar * key, uint size, void * us
|
||||
// assert(srv_st->ev_st_switched<2&&srv_st->ct_st_switched<2);
|
||||
return 1;
|
||||
}
|
||||
static long app_st_read_cb(void * data, const uchar * key, uint size, void * user_arg)
|
||||
{
|
||||
struct ssl_svc_app_st* app_st=(struct ssl_svc_app_st*)data;
|
||||
struct ssl_service_status* result=(struct ssl_service_status*)user_arg;
|
||||
if (app_st == NULL)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
if(app_st->down_ssl_success_cnt>app_st->ref_svc_cache->succ_as_app_not_pinning_count)
|
||||
{
|
||||
result->is_app_not_pinning=1;
|
||||
}
|
||||
return 1;
|
||||
|
||||
}
|
||||
static long app_st_write_cb(void * data, const uchar * key, uint size, void * user_arg)
|
||||
{
|
||||
struct ssl_svc_app_st* app_st=(struct ssl_svc_app_st*)data;
|
||||
struct ssl_service_write_args* args=(struct ssl_service_write_args*)user_arg;
|
||||
const struct ssl_service_status* status=args->status;
|
||||
struct ssl_service_cache* cache=args->cache;
|
||||
UNUSED int ret = 0;
|
||||
if(app_st==NULL)
|
||||
{
|
||||
app_st=ALLOC(struct ssl_svc_app_st, 1);
|
||||
app_st->ref_svc_cache=cache;
|
||||
ret = MESA_htable_add(cache->app_st_hash, key, size, app_st);
|
||||
assert(ret >= 0);
|
||||
}
|
||||
if(status->is_app_not_pinning)
|
||||
{
|
||||
app_st->down_ssl_success_cnt++;
|
||||
}
|
||||
if(app_st->down_ssl_success_cnt>cache->succ_as_app_not_pinning_count)
|
||||
{
|
||||
cache->stat.app_not_pinning_cnt++;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ssl_service_cache_read(struct ssl_service_cache *svc_cache, const struct ssl_chello *chello, const struct tfe_stream *tcp_stream, struct ssl_service_status *result)
|
||||
{
|
||||
@@ -356,16 +448,28 @@ int ssl_service_cache_read(struct ssl_service_cache *svc_cache, const struct ssl
|
||||
TFE_LOG_DEBUG(g_default_logger, "server table, hash:%s, found:%d, sni:%s, addr:%s, ct:%d, ev:%d",
|
||||
hash_key, svr_st_cb_ret, chello->sni, addr_str, result->is_ct, result->is_ev);
|
||||
|
||||
memset(hash_key, 0, sizeof(hash_key));
|
||||
temp_key_sz = ssl_svc_app_st_mk_key(chello, tcp_stream, temp_key, sizeof(temp_key));
|
||||
hash_key_sz = tfe_hexdump(hash_key, (unsigned char *)temp_key, temp_key_sz) - hash_key;
|
||||
MESA_htable_search_cb(svc_cache->app_st_hash, hash_key, (unsigned int) hash_key_sz, app_st_read_cb, result, &app_st_cb_ret);
|
||||
TFE_LOG_DEBUG(g_default_logger, "app table, hash:%s, found:%d, sni:%s, addr:%s, app_not_pinning:%d",
|
||||
hash_key, app_st_cb_ret, chello->sni, addr_str, result->is_app_not_pinning);
|
||||
char ja3_hash[64] = {0};
|
||||
uint16_t ja3_len = 0;
|
||||
result->ja3_pinning_status = JA3_PINNING_STATUS_UNKNOWN;
|
||||
struct tfe_cmsg *cmsg = tfe_stream_get0_cmsg(tcp_stream);
|
||||
if (cmsg)
|
||||
{
|
||||
int ret = tfe_cmsg_get_value(cmsg, TFE_CMSG_SSL_CLIENT_JA3_FINGERPRINT, (unsigned char *)ja3_hash, sizeof(ja3_hash), &ja3_len);
|
||||
if (ret == 0)
|
||||
{
|
||||
result->ja3_pinning_status = ssl_svc_ja3_scan(ja3_hash, addr_str);
|
||||
if (result->ja3_pinning_status != JA3_PINNING_STATUS_UNKNOWN)
|
||||
{
|
||||
app_st_cb_ret = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
TFE_LOG_DEBUG(g_default_logger, "app table, hash:%s, found:%d, sni:%s, addr:%s, ja3_pinning_status:%d",
|
||||
ja3_hash, app_st_cb_ret, chello->sni, addr_str, result->ja3_pinning_status);
|
||||
|
||||
free(addr_str);
|
||||
|
||||
if(cli_st_cb_ret||svr_st_cb_ret||app_st_cb_ret)
|
||||
if(cli_st_cb_ret||svr_st_cb_ret||app_st_cb_ret)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
@@ -407,21 +511,18 @@ void ssl_service_cache_write(struct ssl_service_cache *svc_cache, const struct s
|
||||
hash_key, chello->sni, addr_str, status->is_ct, status->is_ev);
|
||||
MESA_htable_search_cb(svc_cache->srv_st_hash, hash_key, (unsigned int) hash_key_sz, srv_st_write_cb, &write_args, &svr_st_cb_ret);
|
||||
}
|
||||
if(status->is_app_not_pinning)
|
||||
{
|
||||
memset(hash_key, 0, sizeof(hash_key));
|
||||
temp_key_sz = ssl_svc_app_st_mk_key(chello, tcp_stream, temp_key, sizeof(temp_key));
|
||||
hash_key_sz = tfe_hexdump(hash_key, (unsigned char *)temp_key, temp_key_sz) - hash_key;
|
||||
TFE_LOG_DEBUG(g_default_logger, "app table, hash:%s, sni:%s, addr:%s, app_not_pinning:%d",
|
||||
hash_key, chello->sni, addr_str, status->is_app_not_pinning);
|
||||
MESA_htable_search_cb(svc_cache->app_st_hash, hash_key, (unsigned int) hash_key_sz, app_st_write_cb, &write_args, &svr_st_cb_ret);
|
||||
}
|
||||
|
||||
free(addr_str);
|
||||
}
|
||||
struct ssl_service_cache* ssl_service_cache_create(unsigned int slot_size, unsigned int expire_seconds, int fail_as_pinning_cnt, int fail_as_proto_err_cnt, int succ_as_app_not_pinning_cnt, int fail_time_win)
|
||||
struct ssl_service_cache *ssl_service_cache_create(unsigned int slot_size, unsigned int expire_seconds, int fail_as_pinning_cnt, int fail_as_proto_err_cnt, int fail_time_win
|
||||
, char *ja3_table_name)
|
||||
{
|
||||
struct ssl_service_cache * cache = ALLOC(struct ssl_service_cache, 1);
|
||||
if (ssl_svc_ja3_init(ja3_table_name) == 0)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
struct ssl_service_cache * cache = ALLOC(struct ssl_service_cache, 1);
|
||||
unsigned max_num = slot_size * 4;
|
||||
UNUSED int ret = 0;
|
||||
MESA_htable_handle htable=NULL, saved[3];
|
||||
@@ -429,9 +530,8 @@ struct ssl_service_cache* ssl_service_cache_create(unsigned int slot_size, unsig
|
||||
cache->fail_as_cli_pinning_count=fail_as_pinning_cnt;
|
||||
cache->fail_as_proto_err_count=fail_as_proto_err_cnt;
|
||||
cache->fail_time_window=fail_time_win;
|
||||
cache->succ_as_app_not_pinning_count = succ_as_app_not_pinning_cnt;
|
||||
void (*free_func[])(void *)={ssl_svc_free_client_st, ssl_svc_free_server_st, ssl_svc_free_app_st};
|
||||
for(i=0; i<3; i++)
|
||||
void (*free_func[])(void *)={ssl_svc_free_client_st, ssl_svc_free_server_st};
|
||||
for(i=0; i<2; i++)
|
||||
{
|
||||
htable = MESA_htable_born();
|
||||
opt_val=0;
|
||||
@@ -442,21 +542,10 @@ struct ssl_service_cache* ssl_service_cache_create(unsigned int slot_size, unsig
|
||||
ret = MESA_htable_set_opt(htable, MHO_MUTEX_NUM, &opt_val, sizeof(opt_val));
|
||||
ret = MESA_htable_set_opt(htable, MHO_HASH_SLOT_SIZE, &slot_size, sizeof(slot_size));
|
||||
ret = MESA_htable_set_opt(htable, MHO_HASH_MAX_ELEMENT_NUM, &max_num, sizeof(max_num));
|
||||
// for app table
|
||||
if (i == 2)
|
||||
{
|
||||
unsigned int app_expire_seconds = 2 * expire_seconds;
|
||||
ret = MESA_htable_set_opt(htable, MHO_EXPIRE_TIME, &app_expire_seconds, sizeof(app_expire_seconds));
|
||||
opt_val = HASH_ELIMINATE_ALGO_LRU;
|
||||
ret = MESA_htable_set_opt(htable, MHO_ELIMIMINATE_TYPE, &opt_val, sizeof(int));
|
||||
}
|
||||
// for client table and server table
|
||||
else
|
||||
{
|
||||
ret = MESA_htable_set_opt(htable, MHO_EXPIRE_TIME, &expire_seconds, sizeof(expire_seconds));
|
||||
opt_val = HASH_ELIMINATE_ALGO_FIFO;
|
||||
ret = MESA_htable_set_opt(htable, MHO_ELIMIMINATE_TYPE, &opt_val, sizeof(int));
|
||||
}
|
||||
ret = MESA_htable_set_opt(htable, MHO_EXPIRE_TIME, &expire_seconds, sizeof(expire_seconds));
|
||||
opt_val = HASH_ELIMINATE_ALGO_FIFO;
|
||||
ret = MESA_htable_set_opt(htable, MHO_ELIMIMINATE_TYPE, &opt_val, sizeof(int));
|
||||
|
||||
ret = MESA_htable_set_opt(htable, MHO_CBFUN_DATA_FREE,
|
||||
(void*)free_func[i], sizeof(free_func[i]));
|
||||
@@ -467,8 +556,8 @@ struct ssl_service_cache* ssl_service_cache_create(unsigned int slot_size, unsig
|
||||
}
|
||||
cache->cli_st_hash=saved[0];
|
||||
cache->srv_st_hash=saved[1];
|
||||
cache->app_st_hash=saved[2];
|
||||
return cache;
|
||||
|
||||
return cache;
|
||||
}
|
||||
void ssl_service_cache_destroy(struct ssl_service_cache* cache)
|
||||
{
|
||||
@@ -476,8 +565,6 @@ void ssl_service_cache_destroy(struct ssl_service_cache* cache)
|
||||
cache->cli_st_hash=NULL;
|
||||
MESA_htable_destroy(cache->srv_st_hash, NULL);
|
||||
cache->srv_st_hash=NULL;
|
||||
MESA_htable_destroy(cache->app_st_hash, NULL);
|
||||
cache->app_st_hash=NULL;
|
||||
free(cache);
|
||||
return;
|
||||
}
|
||||
@@ -485,6 +572,4 @@ void ssl_service_cache_stat(struct ssl_service_cache* svc_cache, struct ssl_serv
|
||||
{
|
||||
*result=svc_cache->stat;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user