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

feature:适配MAAT4动态库名变更

Browse Source
This commit is contained in:
fengweihao
2023-12-20 17:57:20 +08:00
parent 36614dd842
commit 937b0f0ff9
3 changed files with 100 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci/travis.sh
View File

@@ -34,7 +34,7 @@ env | sort
# Install dependency from YUM # Install dependency from YUM
yum install -y libcjson-devel libmaat4-devel libMESA_field_stat2-devel libMESA_handle_logger-devel libbreakpad_mini-devel.x86_64 yum install -y libcjson-devel libmaatframe-devel libMESA_field_stat2-devel libMESA_handle_logger-devel libbreakpad_mini-devel.x86_64
yum install -y libMESA_prof_load-devel libwiredcfg-devel libWiredLB-devel yum install -y libMESA_prof_load-devel libwiredcfg-devel libWiredLB-devel
mkdir build || true mkdir build || true

152
program/src/cert_session.cpp
View File

@@ -954,8 +954,7 @@ static int redis_async_connect(struct event_base *base, struct redisAsyncContext
return 0; return 0;
} }
static int static int evhttp_socket_send_error(struct evhttp_request *req, int error)
evhttp_socket_send_error(struct evhttp_request *req, int error)
{ {
FS_operate(g_FP_instance.handle, g_FP_instance.line_ids[KEYPAIR_ACTION_ERR], 0, FS_OP_ADD, 1); FS_operate(g_FP_instance.handle, g_FP_instance.line_ids[KEYPAIR_ACTION_ERR], 0, FS_OP_ADD, 1);
evhttp_send_error(req, error, 0); evhttp_send_error(req, error, 0);
@@ -964,8 +963,7 @@ evhttp_socket_send_error(struct evhttp_request *req, int error)
/* Callback used for the /dump URI, and for every non-GET request: /* Callback used for the /dump URI, and for every non-GET request:
* dumps all information to stdout and gives back a trivial 200 ok */ * dumps all information to stdout and gives back a trivial 200 ok */
static int static int evhttp_socket_send(struct evhttp_request *req, char *sendbuf)
evhttp_socket_send(struct evhttp_request *req, char *sendbuf)
{ {
struct evbuffer *evb = NULL; struct evbuffer *evb = NULL;
@@ -989,8 +987,7 @@ done:
return 0; return 0;
} }
static void static void redis_reget_callback(redisAsyncContext __attribute__((__unused__))*cl_ctx,
redis_reget_callback(redisAsyncContext __attribute__((__unused__))*cl_ctx,
void *r, void *privdata) void *r, void *privdata)
{ {
redisReply *reply = (redisReply*)r; redisReply *reply = (redisReply*)r;
@@ -1522,51 +1519,67 @@ void _urldecode(char url[])
free(res); free(res);
} }
static int http_decode_uri(struct evhttp_request *evh_req, struct http_request *request) int http_get_headers(struct evhttp_request *evh_req, struct evkeyvalq *headers)
{ {
int rv = 0; int xret = -1;
struct evkeyvalq params;
const char *uri = evhttp_request_get_uri(evh_req); const char *uri = evhttp_request_get_uri(evh_req);
rv = evhttp_parse_query(uri, &params); if(!uri)
if (rv != 0)
{ {
return -1; return xret;
} }
const char *health_check = evhttp_find_header(&params, "health_check"); return evhttp_parse_query(uri, headers);
if (health_check) }
int http_get_heal_check(struct evhttp_request *evh_req)
{
int xret = -1;
struct evkeyvalq headers;
xret = http_get_headers(evh_req, &headers);
if(xret != 0)
{ {
evhttp_clear_headers(&params); return xret;
return -2;
} }
const char *keyring_id = evhttp_find_header(&params, "keyring_id");
xret = (evhttp_find_header(&headers, "health_check") != NULL) ? 1 : 0;
evhttp_clear_headers(&headers);
return xret;
}
int http_get_request_uri(struct evhttp_request *evh_req, struct http_request *request)
{
int xret=-1;
struct evkeyvalq headers;
xret = http_get_headers(evh_req, &headers);
if(xret != 0)
{
return xret;
}
const char *keyring_id = evhttp_find_header(&headers, "keyring_id");
if (keyring_id) if (keyring_id)
{ {
request->keyring_id = atoi(keyring_id); request->keyring_id = atoi(keyring_id);
} }
const char *is_valid = evhttp_find_header(&params, "is_valid"); const char *is_valid = evhttp_find_header(&headers, "is_valid");
if (is_valid) if (is_valid)
{ {
request->is_valid = atoi(is_valid); request->is_valid = atoi(is_valid);
} }
const char *sni = evhttp_find_header(&params, "sni"); const char *sni = evhttp_find_header(&headers, "sni");
if (sni) if (sni)
{ {
request->sni = strdup(sni); request->sni = strdup(sni);
} }
evhttp_clear_headers(&params); evhttp_clear_headers(&headers);
mesa_runtime_log(RLOG_LV_INFO, MODULE_NAME, "[Thread %d]Received request for uri, kering_id:%d, sni:%s, valid:%d", request->thread_id, request->keyring_id, request->sni, request->is_valid);
mesa_runtime_log(RLOG_LV_INFO, MODULE_NAME, "[Thread %d]Received request for uri, kering_id:%d, sni:%s, valid:%d",
request->thread_id, request->keyring_id, request->sni, request->is_valid);
return 0; return 0;
} }
static void static void evhttp_socket_close_cb(struct evhttp_connection *evcon, void __attribute__((__unused__))*arg)
evhttp_socket_close_cb(struct evhttp_connection *evcon,
void __attribute__((__unused__))*arg)
{ {
if (NULL == evcon){ if (NULL == evcon)
{
goto finish; goto finish;
} }
@@ -1574,8 +1587,7 @@ finish:
return; return;
} }
static int static int x509_get_rkey(X509 *origin, int keyring_id, char *rkey, int is_valid)
x509_get_rkey(X509 *origin, int keyring_id, char *rkey, int is_valid)
{ {
unsigned int len = 0, i = 0; unsigned int len = 0, i = 0;
char hex[EVP_MAX_MD_SIZE] = {0}; char hex[EVP_MAX_MD_SIZE] = {0};
@@ -1598,8 +1610,7 @@ finish:
return 0; return 0;
} }
static int static int redis_sync_command(struct http_request *request, struct redisContext __attribute__((__unused__))*c)
redis_sync_command(struct http_request *request, struct redisContext __attribute__((__unused__))*c)
{ {
int xret = -1; int xret = -1;
redisReply *reply; redisReply *reply;
@@ -1651,36 +1662,46 @@ static int get_x509_msg(struct http_request *request, char *input, ssize_t input
return 0; return 0;
} }
static int get_keypair_cache(x509_forge_thread *info, struct http_request *request, int mode) int get_keyring_from_local( struct http_request *request)
{ {
int xret = 0; int ret =0;
ret = redis_clnt_pdu_send(request);
if (info->sync == NULL) if (ret < 0)
{
xret = redis_clnt_pdu_send(request);
if (xret < 0)
{ {
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Local sign certificate failed"); mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Local sign certificate failed");
} }
}else{ return ret;
if(mode) }
int get_keyring_form_redis(x509_forge_thread *info, struct http_request *request, int mode)
{
int ret=0;
switch (mode)
{ {
xret = redisAsyncCommand(info->cl_ctx, redis_get_callback, request, "GET %s", request->rkey); case 0:
if (xret < 0) ret = redis_sync_command(request, info->sync);
if (ret < 0)
{ {
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Failed to get information from redis server"); mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Failed to get information from redis server");
} }
} break;
else case 1:
{ ret = redisAsyncCommand(info->cl_ctx, redis_get_callback, request, "GET %s", request->rkey);
xret = redis_sync_command(request, info->sync); if (ret < 0)
if (xret < 0)
{ {
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Failed to get information from redis server"); mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Failed to get information from redis server");
} }
break;
default:
break;
} }
} return ret;
return xret; }
static int get_keypair_cache(x509_forge_thread *info, struct http_request *request, int mode)
{
return info->sync == NULL ? get_keyring_from_local(request) : get_keyring_form_redis(info, request, mode);
} }
void http_get_cb(struct evhttp_request *evh_req, void *arg) void http_get_cb(struct evhttp_request *evh_req, void *arg)
@@ -1691,39 +1712,37 @@ void http_get_cb(struct evhttp_request *evh_req, void *arg)
char *input = NULL; ssize_t inputlen=0; char *input = NULL; ssize_t inputlen=0;
x509_forge_thread *info = (x509_forge_thread *)arg; x509_forge_thread *info = (x509_forge_thread *)arg;
if (evhttp_request_get_command(evh_req) != EVHTTP_REQ_POST) { if (evhttp_request_get_command(evh_req) != EVHTTP_REQ_POST)
{
mesa_runtime_log(RLOG_LV_DEBUG, MODULE_NAME, "FAILED (post type)"); mesa_runtime_log(RLOG_LV_DEBUG, MODULE_NAME, "FAILED (post type)");
goto error; goto error;
} }
evhttp_connection_set_closecb(evhttp_request_get_connection(evh_req), evhttp_socket_close_cb, NULL);
xret = http_get_heal_check(evh_req);
if(xret != 0)
{
evhttp_send_reply(evh_req, 200, "OK", NULL);
return;
}
request = (struct http_request *) kmalloc (sizeof(struct http_request), MPF_CLR, -1); request = (struct http_request *) kmalloc (sizeof(struct http_request), MPF_CLR, -1);
request->keyring_id = 0; request->keyring_id = 0;
request->thread_id = info->id; request->thread_id = info->id;
request->evh_req = evh_req; request->evh_req = evh_req;
clock_gettime(CLOCK_MONOTONIC,&request->create_time); clock_gettime(CLOCK_MONOTONIC,&request->create_time);
xret = http_decode_uri(evh_req, request); xret = http_get_request_uri(evh_req, request);
if (xret != 0) if(xret != 0)
{
if (xret == -2)
{
request_destroy(request);
evhttp_send_reply(evh_req, 200, "OK", NULL);
goto finish;
}
else
{ {
goto error; goto error;
} }
}
evhttp_connection_set_closecb(evhttp_request_get_connection(evh_req), evhttp_socket_close_cb, NULL);
evbuf_body = evhttp_request_get_input_buffer(evh_req); evbuf_body = evhttp_request_get_input_buffer(evh_req);
if (!evbuf_body || 0==(inputlen = evbuffer_get_length(evbuf_body)) if (!evbuf_body || 0==(inputlen = evbuffer_get_length(evbuf_body)) || !(input = (char *)evbuffer_pullup(evbuf_body,inputlen)))
||!(input = (char *)evbuffer_pullup(evbuf_body,inputlen)))
{ {
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Failed to get certificate information."); mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Failed to get certificate information.");
goto error; goto error;
} }
xret = get_x509_msg(request, input, inputlen); xret = get_x509_msg(request, input, inputlen);
if (xret != 0) if (xret != 0)
{ {
@@ -1737,6 +1756,7 @@ void http_get_cb(struct evhttp_request *evh_req, void *arg)
goto finish; goto finish;
} }
error: error:
request_destroy(request);
evhttp_socket_send_error(evh_req, HTTP_BADREQUEST); evhttp_socket_send_error(evh_req, HTTP_BADREQUEST);
finish: finish:
return; return;

2
vendor/CMakeLists.txt vendored
View File

@@ -144,7 +144,7 @@ set_property(TARGET wiredLB PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}
set_property(TARGET wiredLB PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) set_property(TARGET wiredLB PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})
add_library(maatframe SHARED IMPORTED GLOBAL) add_library(maatframe SHARED IMPORTED GLOBAL)
set_property(TARGET maatframe PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libmaat4.so) set_property(TARGET maatframe PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libmaatframe.so)
set_property(TARGET maatframe PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) set_property(TARGET maatframe PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})
add_library(MESA_field_stat SHARED IMPORTED GLOBAL) add_library(MESA_field_stat SHARED IMPORTED GLOBAL)