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

初步调通HTTP重定向业务

Browse Source 
* 增加HTTP Status标准化定义及辅助函数；
* 增加HTTP解析层发送应答的功能
* 修正了Pangu HTTP实现导致段错误的一系列问题。
This commit is contained in:
Lu Qiuwen
2018-09-25 10:17:50 +08:00
parent 0776cb3ec8
commit c2f0bde211
9 changed files with 350 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
common/include/tfe_http.h
View File

@@ -10,7 +10,7 @@
#include <tfe_stream.h> #include <tfe_stream.h>
/* Copy from http_parser.h */ /* Copy from http_parser.h */
#define HTTP_METHOD_MAP(XX) \ #define __HTTP_METHOD_MAP(XX) \
XX(0, DELETE, DELETE) \ XX(0, DELETE, DELETE) \
XX(1, GET, GET) \ XX(1, GET, GET) \
XX(2, HEAD, HEAD) \ XX(2, HEAD, HEAD) \
@@ -54,10 +54,79 @@
/* icecast */ \ /* icecast */ \
XX(33, SOURCE, SOURCE) \ XX(33, SOURCE, SOURCE) \
/* Status Codes */
#define __HTTP_STATUS_MAP(XX) \
XX(100, CONTINUE, Continue) \
XX(101, SWITCHING_PROTOCOLS, Switching Protocols) \
XX(102, PROCESSING, Processing) \
XX(200, OK, OK) \
XX(201, CREATED, Created) \
XX(202, ACCEPTED, Accepted) \
XX(203, NON_AUTHORITATIVE_INFORMATION, Non-Authoritative Information) \
XX(204, NO_CONTENT, No Content) \
XX(205, RESET_CONTENT, Reset Content) \
XX(206, PARTIAL_CONTENT, Partial Content) \
XX(207, MULTI_STATUS, Multi-Status) \
XX(208, ALREADY_REPORTED, Already Reported) \
XX(226, IM_USED, IM Used) \
XX(300, MULTIPLE_CHOICES, Multiple Choices) \
XX(301, MOVED_PERMANENTLY, Moved Permanently) \
XX(302, FOUND, Found) \
XX(303, SEE_OTHER, See Other) \
XX(304, NOT_MODIFIED, Not Modified) \
XX(305, USE_PROXY, Use Proxy) \
XX(307, TEMPORARY_REDIRECT, Temporary Redirect) \
XX(308, PERMANENT_REDIRECT, Permanent Redirect) \
XX(400, BAD_REQUEST, Bad Request) \
XX(401, UNAUTHORIZED, Unauthorized) \
XX(402, PAYMENT_REQUIRED, Payment Required) \
XX(403, FORBIDDEN, Forbidden) \
XX(404, NOT_FOUND, Not Found) \
XX(405, METHOD_NOT_ALLOWED, Method Not Allowed) \
XX(406, NOT_ACCEPTABLE, Not Acceptable) \
XX(407, PROXY_AUTHENTICATION_REQUIRED, Proxy Authentication Required) \
XX(408, REQUEST_TIMEOUT, Request Timeout) \
XX(409, CONFLICT, Conflict) \
XX(410, GONE, Gone) \
XX(411, LENGTH_REQUIRED, Length Required) \
XX(412, PRECONDITION_FAILED, Precondition Failed) \
XX(413, PAYLOAD_TOO_LARGE, Payload Too Large) \
XX(414, URI_TOO_LONG, URI Too Long) \
XX(415, UNSUPPORTED_MEDIA_TYPE, Unsupported Media Type) \
XX(416, RANGE_NOT_SATISFIABLE, Range Not Satisfiable) \
XX(417, EXPECTATION_FAILED, Expectation Failed) \
XX(421, MISDIRECTED_REQUEST, Misdirected Request) \
XX(422, UNPROCESSABLE_ENTITY, Unprocessable Entity) \
XX(423, LOCKED, Locked) \
XX(424, FAILED_DEPENDENCY, Failed Dependency) \
XX(426, UPGRADE_REQUIRED, Upgrade Required) \
XX(428, PRECONDITION_REQUIRED, Precondition Required) \
XX(429, TOO_MANY_REQUESTS, Too Many Requests) \
XX(431, REQUEST_HEADER_FIELDS_TOO_LARGE, Request Header Fields Too Large) \
XX(451, UNAVAILABLE_FOR_LEGAL_REASONS, Unavailable For Legal Reasons) \
XX(500, INTERNAL_SERVER_ERROR, Internal Server Error) \
XX(501, NOT_IMPLEMENTED, Not Implemented) \
XX(502, BAD_GATEWAY, Bad Gateway) \
XX(503, SERVICE_UNAVAILABLE, Service Unavailable) \
XX(504, GATEWAY_TIMEOUT, Gateway Timeout) \
XX(505, HTTP_VERSION_NOT_SUPPORTED, HTTP Version Not Supported) \
XX(506, VARIANT_ALSO_NEGOTIATES, Variant Also Negotiates) \
XX(507, INSUFFICIENT_STORAGE, Insufficient Storage) \
XX(508, LOOP_DETECTED, Loop Detected) \
XX(510, NOT_EXTENDED, Not Extended) \
XX(511, NETWORK_AUTHENTICATION_REQUIRED, Network Authentication Required) \
enum tfe_http_std_method enum tfe_http_std_method
{ {
#define XX(num, name, string) TFE_HTTP_##name = num, #define XX(num, name, string) TFE_HTTP_METHOD_##name = num,
HTTP_METHOD_MAP(XX) __HTTP_METHOD_MAP(XX)
#undef XX
};
enum tfe_http_std_status
{
#define XX(num, name, string) TFE_HTTP_STATUS_##name = num,
__HTTP_STATUS_MAP(XX)
#undef XX #undef XX
}; };
@@ -181,6 +250,9 @@ struct tfe_http_half
struct tfe_http_session struct tfe_http_session
{ {
unsigned int session_id; unsigned int session_id;
short major_version;
short minor_version;
struct tfe_http_session_ops * ops; struct tfe_http_session_ops * ops;
struct tfe_http_half * req; struct tfe_http_half * req;
struct tfe_http_half * resp; struct tfe_http_half * resp;
@@ -214,6 +286,10 @@ void http_field_destory(struct http_field_name *);
const char * http_std_method_to_string(enum tfe_http_std_method method); const char * http_std_method_to_string(enum tfe_http_std_method method);
enum tfe_http_std_method http_std_method_construct(const char * str_method); enum tfe_http_std_method http_std_method_construct(const char * str_method);
/* Tools functions for standard HTTP status */
const char * http_std_status_to_string(enum tfe_http_std_status status);
enum tfe_http_std_status http_std_status_construct(const char * str_status);
static inline const char * tfe_http_field_read(const struct tfe_http_half * half, static inline const char * tfe_http_field_read(const struct tfe_http_half * half,
const struct http_field_name * name) const struct http_field_name * name)
{ {

34
common/src/tfe_http.cpp
View File

@@ -43,18 +43,34 @@ static const char * __str_std_header_field_map[] =
[TFE_HTTP_ACCEPT_ENCODING] = "Accept-Encoding" [TFE_HTTP_ACCEPT_ENCODING] = "Accept-Encoding"
}; };
static const char * __str_std_method_map[] = static const char * __str_std_method_map[1024] = {};
void __str_std_method_map_init() __attribute__((constructor, used));
void __str_std_method_map_init()
{ {
#define XX(num, name, string) [TFE_HTTP_##name] = #string, #define XX(num, name, string) __str_std_method_map[TFE_HTTP_METHOD_##name] = #string;
HTTP_METHOD_MAP(XX) __HTTP_METHOD_MAP(XX)
#undef XX #undef XX
}; }
static const char * __str_std_status_map[1024] = {};
void __str_std_status_map_init() __attribute__((constructor, used));
void __str_std_status_map_init()
{
#define XX(num, name, string) __str_std_status_map[TFE_HTTP_STATUS_##name] = #string;
__HTTP_STATUS_MAP(XX)
#undef XX
}
const char * http_std_method_to_string(enum tfe_http_std_method method) const char * http_std_method_to_string(enum tfe_http_std_method method)
{ {
return __str_std_method_map[method]; return __str_std_method_map[method];
} }
const char * http_std_status_to_string(enum tfe_http_std_status status)
{
return __str_std_status_map[status];
}
struct http_field_name * http_field_name_duplicate(const struct http_field_name * orig) struct http_field_name * http_field_name_duplicate(const struct http_field_name * orig)
{ {
struct http_field_name * __duplicated = ALLOC(struct http_field_name, 1); struct http_field_name * __duplicated = ALLOC(struct http_field_name, 1);
@@ -188,12 +204,20 @@ void http_frame_raise_event(struct http_frame_session_ctx * ht_frame,
struct tfe_plugin * plugin_info_iter; struct tfe_plugin * plugin_info_iter;
TFE_PLUGIN_FOREACH(plugin_info_iter, &__for_each_iterator) TFE_PLUGIN_FOREACH(plugin_info_iter, &__for_each_iterator)
{ {
if (plugin_info_iter->on_session_data == NULL) continue; if (plugin_info_iter->on_session_data == NULL)
{
continue;
}
/* Calling ctx, in callback can fetch by calling frame_plugin_status_get_XXX */ /* Calling ctx, in callback can fetch by calling frame_plugin_status_get_XXX */
ht_frame->calling_plugin = plugin_info_iter; ht_frame->calling_plugin = plugin_info_iter;
ht_frame->calling_plugin_status = &ht_frame->plugin_status[__plugin_id]; ht_frame->calling_plugin_status = &ht_frame->plugin_status[__plugin_id];
if (ht_frame->calling_plugin_status->detached)
{
continue;
}
void ** calling_pme = &ht_frame->calling_plugin_status->pme; void ** calling_pme = &ht_frame->calling_plugin_status->pme;
plugin_info_iter->on_session_data(stream, ht_session, event, data, datalen, thread_id, calling_pme); plugin_info_iter->on_session_data(stream, ht_session, event, data, datalen, thread_id, calling_pme);
} }

32
plugin/business/pangu-http/pangu_http.cpp
View File

@@ -768,10 +768,13 @@ static void http_redirect(const struct tfe_http_session * session, enum tfe_http
{ {
int resp_code = 0, ret = 0; int resp_code = 0, ret = 0;
char * url = NULL; char * url = NULL;
struct tfe_http_half * response = NULL; struct tfe_http_half * response = NULL;
struct tfe_http_session * to_write = NULL; struct tfe_http_session * to_write = NULL;
url = ALLOC(char, ctx->enforce_rules[0].serv_def_len); url = ALLOC(char, ctx->enforce_rules[0].serv_def_len);
ret = sscanf(ctx->enforce_para, "code=%d%[^;];url=%*[^;];", &resp_code, url); ret = sscanf(ctx->enforce_para, "code=%d;url=%[^;]", &resp_code, url);
if (ret != 2) if (ret != 2)
{ {
TFE_LOG_ERROR(g_pangu_rt->local_logger, "Invalid redirect rule %d paramter %s", TFE_LOG_ERROR(g_pangu_rt->local_logger, "Invalid redirect rule %d paramter %s",
@@ -780,10 +783,16 @@ static void http_redirect(const struct tfe_http_session * session, enum tfe_http
} }
to_write = tfe_http_session_allow_write(session); to_write = tfe_http_session_allow_write(session);
if (to_write == NULL)
{
assert(0);
}
response = tfe_http_session_response_create(to_write, resp_code); response = tfe_http_session_response_create(to_write, resp_code);
_wrap_std_field_write(response, TFE_HTTP_LOCATION, url); _wrap_std_field_write(response, TFE_HTTP_LOCATION, url);
tfe_http_session_response_set(to_write, response); tfe_http_session_response_set(to_write, response);
response = NULL; tfe_http_session_detach(session);
error_out: error_out:
free(url); free(url);
@@ -862,16 +871,24 @@ enum pangu_action http_scan(const struct tfe_http_session * session, enum tfe_ht
Maat_stream_scan_string_end(&(ctx->sp)); Maat_stream_scan_string_end(&(ctx->sp));
ctx->sp = NULL; ctx->sp = NULL;
} }
if (hit_cnt > 0) if (hit_cnt > 0)
{ {
ctx->action = decide_ctrl_action(result, hit_cnt, &ctx->enforce_rules, &ctx->n_enforce); ctx->action = decide_ctrl_action(result, hit_cnt, &ctx->enforce_rules, &ctx->n_enforce);
if (ctx->enforce_rules[0].serv_def_len > MAX_SERVICE_DEFINE_LEN) size_t __serv_def_len = (size_t)ctx->enforce_rules[0].serv_def_len;
ctx->enforce_para = ALLOC(char, __serv_def_len);
if (__serv_def_len > MAX_SERVICE_DEFINE_LEN)
{ {
ctx->enforce_para = ALLOC(char, ctx->enforce_rules->serv_def_len); read_rule_ret = Maat_read_rule(g_pangu_rt->maat, &ctx->enforce_rules[0], MAAT_RULE_SERV_DEFINE,
read_rule_ret = Maat_read_rule(g_pangu_rt->maat, ctx->enforce_rules + 0, ctx->enforce_para, ctx->enforce_rules[0].serv_def_len);
MAAT_RULE_SERV_DEFINE, ctx->enforce_para, ctx->enforce_rules[0].serv_def_len);
assert(read_rule_ret == ctx->enforce_rules[0].serv_def_len); assert(read_rule_ret == ctx->enforce_rules[0].serv_def_len);
} }
else
{
strcpy(ctx->enforce_para, ctx->enforce_rules[0].service_defined);
}
if (hit_cnt > 1) if (hit_cnt > 1)
{ {
p = buff; p = buff;
@@ -879,11 +896,13 @@ enum pangu_action http_scan(const struct tfe_http_session * session, enum tfe_ht
{ {
p += snprintf(p, sizeof(buff) - (p - buff), "%d:", result[i].config_id); p += snprintf(p, sizeof(buff) - (p - buff), "%d:", result[i].config_id);
} }
*p = '\0'; *p = '\0';
TFE_LOG_INFO(g_pangu_rt->local_logger, "Multiple rules matched: url=%s num=%lu ids=%s execute=%d.", TFE_LOG_INFO(g_pangu_rt->local_logger, "Multiple rules matched: url=%s num=%lu ids=%s execute=%d.",
session->req->req_spec.url, hit_cnt, buff, ctx->enforce_rules[0].config_id); session->req->req_spec.url, hit_cnt, buff, ctx->enforce_rules[0].config_id);
} }
} }
return ctx->action; return ctx->action;
} }
@@ -949,6 +968,7 @@ Re_Enter:
case PG_ACTION_REJECT: http_reject(session, events, ctx); case PG_ACTION_REJECT: http_reject(session, events, ctx);
break; break;
case PG_ACTION_REDIRECT: http_redirect(session, events, ctx); case PG_ACTION_REDIRECT: http_redirect(session, events, ctx);
break;
case PG_ACTION_REPLACE: http_replace(stream, session, events, body_frag, frag_size, ctx); case PG_ACTION_REPLACE: http_replace(stream, session, events, body_frag, frag_size, ctx);
break; break;
case PG_ACTION_WHITELIST: tfe_http_session_detach(session); case PG_ACTION_WHITELIST: tfe_http_session_detach(session);

10
plugin/protocol/http/include/internal/http_common.h
View File

@@ -30,6 +30,10 @@ struct http_session_private
struct http_connection_private * hc_private; struct http_connection_private * hc_private;
/* HTTP FRAME CTX */ /* HTTP FRAME CTX */
struct http_frame_session_ctx * ht_frame; struct http_frame_session_ctx * ht_frame;
/* USER SETUP REQUEST HALF */
struct http_half_private * hf_private_req_user;
/* USER SETUP RESPONSE HALF */
struct http_half_private * hf_private_resp_user;
}; };
struct http_connection_private struct http_connection_private
@@ -82,6 +86,12 @@ static inline const struct tfe_http_session * to_hs_public(const struct http_ses
return &hs_private->hs_public; return &hs_private->hs_public;
} }
static inline struct tfe_http_session * to_hs_public(struct http_session_private * hs_private)
{
if (hs_private == NULL) return NULL;
return &hs_private->hs_public;
}
static inline struct http_session_private * to_hs_private(struct tfe_http_session * hs_public) static inline struct http_session_private * to_hs_private(struct tfe_http_session * hs_public)
{ {
if (hs_public == NULL) return NULL; if (hs_public == NULL) return NULL;

13
plugin/protocol/http/include/internal/http_half.h
View File

@@ -50,22 +50,28 @@ struct http_half_private
short major; short major;
short minor; short minor;
/* URI */
struct evbuffer * evbuf_uri; struct evbuffer * evbuf_uri;
char * url_storage; char * url_storage;
/* Header Parser */
struct evbuffer * evbuf_header_field; struct evbuffer * evbuf_header_field;
struct evbuffer * evbuf_header_value; struct evbuffer * evbuf_header_value;
bool is_evbuf_header_field_set; bool is_evbuf_header_field_set;
bool is_evbuf_header_value_set; bool is_evbuf_header_value_set;
struct evbuffer * evbuf_body; /* Status */
enum hf_private_status body_status; enum hf_private_status body_status;
enum hf_private_status message_status; enum hf_private_status message_status;
/* default stream action */ /* default stream action */
enum tfe_stream_action stream_action; enum tfe_stream_action stream_action;
enum tfe_stream_action user_stream_action; enum tfe_stream_action user_stream_action;
/* Setup by User */
bool is_setup_by_user;
struct evbuffer * evbuf_body;
struct evbuffer * evbuf_raw;
}; };
struct http_half_private * hf_private_create(tfe_http_direction ht_dir, short major, short minor); struct http_half_private * hf_private_create(tfe_http_direction ht_dir, short major, short minor);
@@ -85,6 +91,7 @@ void hf_private_destory(struct http_half_private * hf_private);
* -1 for error. * -1 for error.
*/ */
int hf_private_parse(struct http_half_private * hf_private, const unsigned char * data, size_t len); int hf_private_parse(struct http_half_private * hf_private, const unsigned char * data, size_t len);
void hf_private_construct(struct http_half_private * hf_private);
void hf_private_set_callback(struct http_half_private * hf_private, hf_private_cb * cb, void hf_private_set_callback(struct http_half_private * hf_private, hf_private_cb * cb,
void * user, void (* fn_user_deleter)(void *)); void * user, void (* fn_user_deleter)(void *));
@@ -96,6 +103,8 @@ struct http_session_private * hs_private_create(struct http_connection_private *
void hs_private_destory(struct http_session_private * hs_private); void hs_private_destory(struct http_session_private * hs_private);
void hs_private_hf_private_set(struct http_session_private * hs_private, void hs_private_hf_private_set(struct http_session_private * hs_private,
struct http_half_private * hf, enum tfe_http_direction); struct http_half_private * hf, enum tfe_http_direction);

88
plugin/protocol/http/src/http_entry.cpp
View File

@@ -9,6 +9,7 @@
#include <http_common.h> #include <http_common.h>
#include <http_half.h> #include <http_half.h>
#include <assert.h> #include <assert.h>
#include <event.h>
struct http_plugin __g_http_plugin; struct http_plugin __g_http_plugin;
struct http_plugin * g_http_plugin = &__g_http_plugin; struct http_plugin * g_http_plugin = &__g_http_plugin;
@@ -143,8 +144,11 @@ enum tfe_stream_action __http_connection_entry_on_response(const struct tfe_stre
struct http_connection_private * hc_private, unsigned int thread_id, const unsigned char * data, size_t len) struct http_connection_private * hc_private, unsigned int thread_id, const unsigned char * data, size_t len)
{ {
struct http_session_private * hs_private = TAILQ_FIRST(&hc_private->hs_private_list); struct http_session_private * hs_private = TAILQ_FIRST(&hc_private->hs_private_list);
struct http_half_private * hf_private_response = to_hf_response_private(hs_private); struct http_half_private * hf_private_resp_in;
struct http_half_private * hf_private_resp_user;
int ret = 0; int ret = 0;
size_t __action_byptes;
/* Standalone response, it means missing something or malformed http protocol */ /* Standalone response, it means missing something or malformed http protocol */
if (hs_private == NULL) if (hs_private == NULL)
@@ -153,44 +157,71 @@ enum tfe_stream_action __http_connection_entry_on_response(const struct tfe_stre
goto __errout; goto __errout;
} }
hf_private_resp_in = to_hf_response_private(hs_private);
hf_private_resp_user = hs_private->hf_private_resp_user;
/* First time parse http response */ /* First time parse http response */
if (hf_private_response == NULL) if (hf_private_resp_in == NULL)
{ {
/* HTTP Version */ /* HTTP Version */
short resp_major = to_hf_request_private(hs_private)->major; short resp_major = to_hf_request_private(hs_private)->major;
short resp_minor = to_hf_request_private(hs_private)->minor; short resp_minor = to_hf_request_private(hs_private)->minor;
/* Response */ /* Response */
hf_private_response = hf_private_create(TFE_HTTP_RESPONSE, resp_major, resp_minor); hf_private_resp_in = hf_private_create(TFE_HTTP_RESPONSE, resp_major, resp_minor);
hs_private_hf_private_set(hs_private, hf_private_response, TFE_HTTP_RESPONSE); hs_private_hf_private_set(hs_private, hf_private_resp_in, TFE_HTTP_RESPONSE);
hf_private_set_session(hf_private_response, hs_private); hf_private_set_session(hf_private_resp_in, hs_private);
/* Closure, catch stream, session and thread_id */ if (hf_private_resp_user != NULL)
struct user_event_dispatch_closure * __closure = ALLOC(struct user_event_dispatch_closure, 1); {
__closure->thread_id = thread_id; /* Set nothing callback, dont call user callback because the data need to be droped */
__closure->stream = stream; hf_private_set_callback(hf_private_resp_in, NULL, NULL, NULL);
__closure->session = to_hs_public(hs_private); /* Drop all data, because the user's response need to be send */
hf_private_resp_in->stream_action = ACTION_DROP_DATA;
}
else
{
/* Closure, catch stream, session and thread_id */
struct user_event_dispatch_closure * __closure = ALLOC(struct user_event_dispatch_closure, 1);
__closure->thread_id = thread_id;
__closure->stream = stream;
__closure->session = to_hs_public(hs_private);
/* Set callback, this callback used to raise business event */ /* Set callback, this callback used to raise business event */
hf_private_set_callback(hf_private_response, __user_event_dispatch, __closure, free); hf_private_set_callback(hf_private_resp_in, __user_event_dispatch, __closure, free);
/* Inherit user stream action, this action can affact session's behavior */
hf_private_resp_in->user_stream_action = to_hf_request_private(hs_private)->user_stream_action;
}
}
/* Inherit user stream action, this action can affact session's behavior */ if (hf_private_resp_user != NULL)
hf_private_response->user_stream_action = to_hf_request_private(hs_private)->user_stream_action; {
/* Construct, and write response immediately */
hf_private_construct(hf_private_resp_user);
size_t __to_write_len = evbuffer_get_length(hf_private_resp_user->evbuf_raw);
unsigned char * __to_write = evbuffer_pullup(hf_private_resp_user->evbuf_raw, __to_write_len);
/* Write the data to stream, UPSTREAM is the incoming direction for response */
ret = tfe_stream_write(stream, CONN_DIR_DOWNSTREAM, __to_write, __to_write_len);
if (unlikely(ret < 0)) { assert(0); }
hf_private_destory(hf_private_resp_user);
hs_private->hf_private_resp_user = NULL;
} }
/* Parse the content, the data which in defered state has been ignored. */ /* Parse the content, the data which in defered state has been ignored. */
ret = hf_private_parse(hf_private_response, data, len); ret = hf_private_parse(hf_private_resp_in, data, len);
/* Need more data, no boundary touched */ /* Need more data, no boundary touched */
if (ret == 0) if (ret == 0)
{ {
if (hf_private_response->stream_action == ACTION_DROP_DATA || if (hf_private_resp_in->stream_action == ACTION_DROP_DATA ||
hf_private_response->stream_action == ACTION_FORWARD_DATA) hf_private_resp_in->stream_action == ACTION_FORWARD_DATA)
{ {
hf_private_response->parse_cursor = 0; hf_private_resp_in->parse_cursor = 0;
} }
return hf_private_response->stream_action; return hf_private_resp_in->stream_action;
} }
/* Some kind of error happened, write log and detach the stream */ /* Some kind of error happened, write log and detach the stream */
@@ -203,13 +234,30 @@ enum tfe_stream_action __http_connection_entry_on_response(const struct tfe_stre
goto __errout; goto __errout;
} }
if (hf_private_response->message_status == STATUS_COMPLETE) if (hf_private_resp_in->message_status == STATUS_COMPLETE)
{ {
http_frame_raise_session_end(hs_private->ht_frame, stream, &hs_private->hs_public, thread_id); http_frame_raise_session_end(hs_private->ht_frame, stream, &hs_private->hs_public, thread_id);
TAILQ_REMOVE(&hc_private->hs_private_list, hs_private, next); TAILQ_REMOVE(&hc_private->hs_private_list, hs_private, next);
hs_private_destory(hs_private); hs_private_destory(hs_private);
} }
__action_byptes = hf_private_resp_in->parse_cursor;
hf_private_resp_in->parse_cursor = 0;
if (hf_private_resp_in->stream_action == ACTION_FORWARD_DATA)
{
tfe_stream_action_set_opt(stream, ACTION_OPT_FOWARD_BYTES, &__action_byptes, sizeof(__action_byptes));
return ACTION_FORWARD_DATA;
}
if (hf_private_resp_in->stream_action == ACTION_DROP_DATA)
{
tfe_stream_action_set_opt(stream, ACTION_OPT_DROP_BYTES, &__action_byptes, sizeof(__action_byptes));
return ACTION_DROP_DATA;
}
goto __errout;
__errout: __errout:
tfe_stream_detach(stream); tfe_stream_detach(stream);
return ACTION_FORWARD_DATA; return ACTION_FORWARD_DATA;

166
plugin/protocol/http/src/http_half.cpp
View File

@@ -121,10 +121,10 @@ void __hf_public_req_fill_from_private(struct http_half_private * hf_private, st
/* accept-encoding, host is located in header's K-V structure */ /* accept-encoding, host is located in header's K-V structure */
hf_req_spec->method = (enum tfe_http_std_method) parser->method; hf_req_spec->method = (enum tfe_http_std_method) parser->method;
const static struct http_field_name __host_field_name = const static struct http_field_name __host_field_name =
{ {
.field_id = TFE_HTTP_HOST, .field_id = TFE_HTTP_HOST,
.field_name = NULL .field_name = NULL
}; };
hf_req_spec->host = (char *) tfe_http_field_read(hf_public, &__host_field_name); hf_req_spec->host = (char *) tfe_http_field_read(hf_public, &__host_field_name);
@@ -158,28 +158,28 @@ void __hf_public_resp_fill_from_private(struct http_half_private * hf_private, s
/* Content Type */ /* Content Type */
const static struct http_field_name __cont_encoding_type_name = const static struct http_field_name __cont_encoding_type_name =
{ {
.field_id = TFE_HTTP_CONT_TYPE, .field_id = TFE_HTTP_CONT_TYPE,
.field_name = NULL .field_name = NULL
}; };
hf_resp_spec->content_type = (char *) tfe_http_field_read(hf_public, &__cont_encoding_type_name); hf_resp_spec->content_type = (char *) tfe_http_field_read(hf_public, &__cont_encoding_type_name);
/* Content Length */ /* Content Length */
const static struct http_field_name __cont_encoding_length_name = const static struct http_field_name __cont_encoding_length_name =
{ {
.field_id = TFE_HTTP_CONT_LENGTH, .field_id = TFE_HTTP_CONT_LENGTH,
.field_name = NULL .field_name = NULL
}; };
hf_resp_spec->content_length = (char *) tfe_http_field_read(hf_public, &__cont_encoding_length_name); hf_resp_spec->content_length = (char *) tfe_http_field_read(hf_public, &__cont_encoding_length_name);
/* Content Encoding */ /* Content Encoding */
const static struct http_field_name __cont_encoding_field_name = const static struct http_field_name __cont_encoding_field_name =
{ {
.field_id = TFE_HTTP_CONT_ENCODING, .field_id = TFE_HTTP_CONT_ENCODING,
.field_name = NULL .field_name = NULL
}; };
hf_resp_spec->content_encoding = (char *) tfe_http_field_read(hf_public, &__cont_encoding_field_name); hf_resp_spec->content_encoding = (char *) tfe_http_field_read(hf_public, &__cont_encoding_field_name);
} }
@@ -251,6 +251,13 @@ static int __parser_callback_on_headers_complete(http_parser * parser)
hf_public->major_version = parser->http_major; hf_public->major_version = parser->http_major;
hf_public->minor_version = parser->http_minor; hf_public->minor_version = parser->http_minor;
/* Copy version to session */
if(hf_private->session != NULL)
{
to_hs_public(hf_private->session)->major_version = hf_public->major_version;
to_hs_public(hf_private->session)->minor_version = hf_public->minor_version;
}
if (hf_direction == TFE_HTTP_REQUEST) if (hf_direction == TFE_HTTP_REQUEST)
{ {
__hf_public_req_fill_from_private(hf_private, parser); __hf_public_req_fill_from_private(hf_private, parser);
@@ -439,14 +446,14 @@ void hf_ops_free(struct tfe_http_half * half)
} }
struct tfe_http_half_ops __http_half_ops = struct tfe_http_half_ops __http_half_ops =
{ {
.ops_http_field_read = hf_ops_field_read, .ops_http_field_read = hf_ops_field_read,
.ops_http_field_write = hf_ops_field_write, .ops_http_field_write = hf_ops_field_write,
.ops_http_allow_write = hf_ops_allow_write, .ops_http_allow_write = hf_ops_allow_write,
.ops_http_field_iterate = hf_ops_field_iterate, .ops_http_field_iterate = hf_ops_field_iterate,
.ops_append_body = hf_ops_append_body, .ops_append_body = hf_ops_append_body,
.ops_free = hf_ops_free .ops_free = hf_ops_free
}; };
struct http_half_private * hf_private_create(tfe_http_direction ht_dir, short major, short minor) struct http_half_private * hf_private_create(tfe_http_direction ht_dir, short major, short minor)
{ {
@@ -526,13 +533,13 @@ int hf_private_parse(struct http_half_private * hf_private, const unsigned char
static struct tfe_http_session * hs_ops_allow_write(const struct tfe_http_session * session) static struct tfe_http_session * hs_ops_allow_write(const struct tfe_http_session * session)
{ {
struct http_session_private * hs_private = to_hs_private((struct tfe_http_session *)session); struct http_session_private * hs_private = to_hs_private((struct tfe_http_session *) session);
return http_frame_currect_plugin_preempt(hs_private->ht_frame) ? (struct tfe_http_session *)session : NULL; return http_frame_currect_plugin_preempt(hs_private->ht_frame) == 0 ? (struct tfe_http_session *) session : NULL;
} }
void hs_ops_detach(const struct tfe_http_session * session) void hs_ops_detach(const struct tfe_http_session * session)
{ {
struct http_session_private * hs_private = to_hs_private((struct tfe_http_session *)session); struct http_session_private * hs_private = to_hs_private((struct tfe_http_session *) session);
return http_frame_currect_plugin_detach(hs_private->ht_frame); return http_frame_currect_plugin_detach(hs_private->ht_frame);
} }
@@ -543,35 +550,108 @@ void hs_ops_drop(struct tfe_http_session * session)
void hs_ops_request_set(struct tfe_http_session * session, struct tfe_http_half * req) void hs_ops_request_set(struct tfe_http_session * session, struct tfe_http_half * req)
{ {
return; struct http_half_private * hf_private = to_hf_private(req);
struct http_session_private * hs_private = to_hs_private(session);
assert(hs_private->hf_private_req_user != NULL);
hs_private->hf_private_req_user = hf_private;
} }
void hs_ops_response_set(struct tfe_http_session * session, struct tfe_http_half * resp) void hs_ops_response_set(struct tfe_http_session * session, struct tfe_http_half * resp)
{ {
return; struct http_half_private * hf_private = to_hf_private(resp);
struct http_session_private * hs_private = to_hs_private(session);
assert(hs_private->hf_private_resp_user == NULL);
hs_private->hf_private_resp_user = hf_private;
} }
struct tfe_http_half * hs_ops_request_create(struct tfe_http_session * session, struct tfe_http_half * hs_ops_request_create(struct tfe_http_session * session,
enum tfe_http_std_method method, const char * uri) enum tfe_http_std_method method, const char * uri)
{ {
return NULL; struct http_half_private * hf_req_private = hf_private_create(TFE_HTTP_REQUEST,
session->major_version, session->minor_version);
hf_req_private->method_or_status = method;
hf_req_private->url_storage = tfe_strdup(uri);
hf_req_private->is_setup_by_user = true;
return to_hf_public(hf_req_private);
} }
struct tfe_http_half * hs_ops_response_create(struct tfe_http_session * session, int resp_code) struct tfe_http_half * hs_ops_response_create(struct tfe_http_session * session, int resp_code)
{ {
return NULL; struct http_half_private * hf_resp_private = hf_private_create(TFE_HTTP_RESPONSE,
session->major_version, session->minor_version);
hf_resp_private->method_or_status = resp_code;
hf_resp_private->is_setup_by_user = true;
return to_hf_public(hf_resp_private);
} }
struct tfe_http_session_ops __http_session_ops = struct tfe_http_session_ops __http_session_ops =
{
.ops_allow_write = hs_ops_allow_write,
.ops_detach = hs_ops_detach,
.ops_drop = hs_ops_drop,
.ops_request_set = hs_ops_request_set,
.ops_response_set = hs_ops_response_set,
.ops_request_create = hs_ops_request_create,
.ops_response_create = hs_ops_response_create
};
void __construct_request_line(struct http_half_private * hf_private)
{ {
.ops_allow_write = hs_ops_allow_write,
.ops_detach = hs_ops_detach, }
.ops_drop = hs_ops_drop,
.ops_request_set = hs_ops_request_set, void __construct_response_line(struct http_half_private * hf_private)
.ops_response_set = hs_ops_response_set, {
.ops_request_create = hs_ops_request_create, enum tfe_http_std_status __resp_code = (enum tfe_http_std_status) hf_private->method_or_status;
.ops_response_create = hs_ops_response_create const char * __str_resp_code = http_std_status_to_string(__resp_code);
}; if (__str_resp_code == NULL)
{
__str_resp_code = "";
}
evbuffer_add_printf(hf_private->evbuf_raw, "HTTP/%d.%d %d %s\r\n",
hf_private->major, hf_private->minor, __resp_code, __str_resp_code);
}
void hf_private_construct(struct http_half_private * hf_private)
{
assert(hf_private->is_setup_by_user);
struct tfe_http_half * hf_public = to_hf_public(hf_private);
/* Clear the output buffer */
if (hf_private->evbuf_raw == NULL)
{
hf_private->evbuf_raw = evbuffer_new();
assert(hf_private->evbuf_raw != NULL);
}
else
{
size_t __buf_length = evbuffer_get_length(hf_private->evbuf_raw);
evbuffer_drain(hf_private->evbuf_raw, __buf_length);
}
/* HTTP Request/Response first line */
if (hf_public->direction == TFE_HTTP_REQUEST) __construct_request_line(hf_private);
else __construct_response_line(hf_private);
/* Headers */
void * iterator = NULL;
struct http_field_name field_name{};
for (const char * str_value = tfe_http_field_iterate(hf_public, &iterator, &field_name);
str_value != NULL; str_value = tfe_http_field_iterate(hf_public, &iterator, &field_name))
{
const char * str_field = http_field_to_string(&field_name);
evbuffer_add_printf(hf_private->evbuf_raw, "%s: %s\r\n", str_field, str_value);
}
/* delimitor between header and body */
evbuffer_add_printf(hf_private->evbuf_raw, "\r\n");
}
struct http_session_private * hs_private_create(struct http_connection_private * hc_private, struct http_session_private * hs_private_create(struct http_connection_private * hc_private,
struct http_half_private * hf_private_req, struct http_half_private * hf_private_resp) struct http_half_private * hf_private_req, struct http_half_private * hf_private_resp)
@@ -611,11 +691,11 @@ void __write_access_log(struct http_session_private * hs_private)
char __str_resp_code[TFE_STRING_MAX]; char __str_resp_code[TFE_STRING_MAX];
if (resp_spec) if (resp_spec)
{ {
snprintf(__str_resp_code, sizeof(__str_resp_code) - 1, "%d", resp_spec->resp_code); snprintf(__str_resp_code, sizeof(__str_resp_code) - 1, "%d", resp_spec->resp_code);
} }
else else
{ {
snprintf(__str_resp_code, sizeof(__str_resp_code) - 1, "%s", "-"); snprintf(__str_resp_code, sizeof(__str_resp_code) - 1, "%s", "-");
} }
/* Content Type */ /* Content Type */
@@ -640,8 +720,8 @@ void hs_private_destory(struct http_session_private * hs_private)
free(hs_private); free(hs_private);
} }
void hs_private_hf_private_set(struct http_session_private * hs_private, struct http_half_private * hf, void hs_private_hf_private_set(struct http_session_private * hs_private,
enum tfe_http_direction direction) struct http_half_private * hf, enum tfe_http_direction direction)
{ {
struct tfe_http_half ** ref_old_half_public; struct tfe_http_half ** ref_old_half_public;
struct http_half_private * old_half_private; struct http_half_private * old_half_private;

4
plugin/protocol/http/test/test_http_half.cpp
View File

@@ -60,7 +60,7 @@ void __get_http_request_header_verify_helper(struct http_half_private * hf_priva
auto * hf_public_request = &hf_public->req_spec; auto * hf_public_request = &hf_public->req_spec;
/* PUBLIC FIELD */ /* PUBLIC FIELD */
EXPECT_EQ(hf_public_request->method, TFE_HTTP_GET); EXPECT_EQ(hf_public_request->method, TFE_HTTP_METHOD_GET);
EXPECT_STREQ(hf_public_request->uri, "/gfwlist/gfwlist/master/gfwlist.txt"); EXPECT_STREQ(hf_public_request->uri, "/gfwlist/gfwlist/master/gfwlist.txt");
EXPECT_STREQ(hf_public_request->url, "raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt"); EXPECT_STREQ(hf_public_request->url, "raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt");
EXPECT_STREQ(hf_public_request->host, "raw.githubusercontent.com"); EXPECT_STREQ(hf_public_request->host, "raw.githubusercontent.com");
@@ -317,7 +317,7 @@ void __http_post_header_verify_helper(struct http_half_private * hf_private)
auto * hf_public_request = &hf_public->req_spec; auto * hf_public_request = &hf_public->req_spec;
/* PUBLIC FIELD */ /* PUBLIC FIELD */
EXPECT_EQ(hf_public_request->method, TFE_HTTP_POST); EXPECT_EQ(hf_public_request->method, TFE_HTTP_METHOD_POST);
EXPECT_STREQ(hf_public_request->uri, "/"); EXPECT_STREQ(hf_public_request->uri, "/");
EXPECT_STREQ(hf_public_request->url, "qbwup.imtt.qq.com/"); EXPECT_STREQ(hf_public_request->url, "qbwup.imtt.qq.com/");
EXPECT_STREQ(hf_public_request->host, "qbwup.imtt.qq.com"); EXPECT_STREQ(hf_public_request->host, "qbwup.imtt.qq.com");

3
vendor/CMakeLists.txt vendored
View File

@@ -33,7 +33,8 @@ ExternalProject_Add(libevent PREFIX libevent
CONFIGURE_COMMAND PKG_CONFIG_PATH=${OPENSSL_PKGCONFIG_PATH} CONFIGURE_COMMAND PKG_CONFIG_PATH=${OPENSSL_PKGCONFIG_PATH}
./configure --prefix=<INSTALL_DIR> --disable-shared --disable-samples ./configure --prefix=<INSTALL_DIR> --disable-shared --disable-samples
BUILD_COMMAND make LDFLAGS="-ldl" BUILD_COMMAND make LDFLAGS="-ldl"
BUILD_IN_SOURCE 1) BUILD_IN_SOURCE 1
DEPENDS OpenSSL)
ExternalProject_Get_Property(libevent INSTALL_DIR) ExternalProject_Get_Property(libevent INSTALL_DIR)
file(MAKE_DIRECTORY ${INSTALL_DIR}/include) file(MAKE_DIRECTORY ${INSTALL_DIR}/include)