Skip to content

Remove support of matrix parameters in Lua plugin #11580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shukitchan merged 3 commits into from
Jul 22, 2024
Merged

Remove support of matrix parameters in Lua plugin #11580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bc14b4
Update ts_lua_client_request.cc
shukitchan Jul 18, 2024
4d0593e
Update ts_lua_server_request.cc
shukitchan Jul 18, 2024
aeec179
Update lua.en.rst
shukitchan Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 0 additions & 83 deletions doc/admin-guide/plugins/lua.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,45 +878,6 @@ ts.client_request.set_uri_args
ts.client_request.set_uri_args('n=6&p=7')


:ref:`TOP <admin-plugins-ts-lua>`

ts.client_request.get_uri_params
--------------------------------
**syntax:** *ts.client_request.get_uri_params()*

**context:** do_remap/do_os_response or do_global_* or later

**description:** This function can be used to retrieve the client request's parameter string.

Here is an example:

::

function do_remap()
local query = ts.client_request.get_uri_params()
ts.debug(query)
end

Then ``GET /st;a=1`` will yield the output:

``a=1``


:ref:`TOP <admin-plugins-ts-lua>`

ts.client_request.set_uri_params
--------------------------------
**syntax:** *ts.client_request.set_uri_params(PARAMETER_STRING)*

**context:** do_remap or do_global_*

**description:** This function can be used to override the client request's parameter string.

::

ts.client_request.set_uri_params('n=6')


:ref:`TOP <admin-plugins-ts-lua>`

ts.client_request.get_url
Expand Down Expand Up @@ -1749,50 +1710,6 @@ ts.server_request.set_uri_args
ts.server_request.set_uri_args('n=6&p=7')


:ref:`TOP <admin-plugins-ts-lua>`

ts.server_request.get_uri_params
--------------------------------
**syntax:** *ts.server_request.get_uri_params()*

**context:** function @ TS_LUA_HOOK_SEND_REQUEST_HDR hook point or later

**description:** This function can be used to retrieve the server request's parameter string.

Here is an example:

::

function send_request()
local query = ts.server_request.get_uri_params()
ts.debug(query)
end

function do_remap()
ts.hook(TS_LUA_HOOK_SEND_REQUEST_HDR, send_request)
return 0
end

Then ``GET /st;a=1`` will yield the output:

``a=1``


:ref:`TOP <admin-plugins-ts-lua>`

ts.server_request.set_uri_params
--------------------------------
**syntax:** *ts.server_request.set_uri_params(PARAMETER_STRING)*

**context:** function @ TS_LUA_HOOK_SEND_REQUEST_HDR hook point

**description:** This function can be used to override the server request's parameter string.

::

ts.server_request.set_uri_params('n=6')


:ref:`TOP <admin-plugins-ts-lua>`

ts.server_request.header.HEADER
Expand Down
51 changes: 0 additions & 51 deletions plugins/lua/ts_lua_client_request.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ static int ts_lua_client_request_get_uri(lua_State *L);
static int ts_lua_client_request_set_uri(lua_State *L);
static int ts_lua_client_request_set_uri_args(lua_State *L);
static int ts_lua_client_request_get_uri_args(lua_State *L);
static int ts_lua_client_request_set_uri_params(lua_State *L);
static int ts_lua_client_request_get_uri_params(lua_State *L);
static int ts_lua_client_request_get_method(lua_State *L);
static int ts_lua_client_request_set_method(lua_State *L);
static int ts_lua_client_request_get_version(lua_State *L);
Expand All @@ -58,7 +56,6 @@ static void ts_lua_inject_client_request_headers_api(lua_State *L);
static void ts_lua_inject_client_request_url_api(lua_State *L);
static void ts_lua_inject_client_request_uri_api(lua_State *L);
static void ts_lua_inject_client_request_args_api(lua_State *L);
static void ts_lua_inject_client_request_params_api(lua_State *L);
static void ts_lua_inject_client_request_method_api(lua_State *L);
static void ts_lua_inject_client_request_version_api(lua_State *L);
static void ts_lua_inject_client_request_body_size_api(lua_State *L);
Expand Down Expand Up @@ -90,7 +87,6 @@ ts_lua_inject_client_request_api(lua_State *L)
ts_lua_inject_client_request_url_api(L);
ts_lua_inject_client_request_uri_api(L);
ts_lua_inject_client_request_args_api(L);
ts_lua_inject_client_request_params_api(L);
ts_lua_inject_client_request_method_api(L);
ts_lua_inject_client_request_version_api(L);
ts_lua_inject_client_request_body_size_api(L);
Expand Down Expand Up @@ -699,53 +695,6 @@ ts_lua_client_request_set_uri_args(lua_State *L)
return 0;
}

static void
ts_lua_inject_client_request_params_api(lua_State *L)
{
lua_pushcfunction(L, ts_lua_client_request_set_uri_params);
lua_setfield(L, -2, "set_uri_params");

lua_pushcfunction(L, ts_lua_client_request_get_uri_params);
lua_setfield(L, -2, "get_uri_params");
}

static int
ts_lua_client_request_get_uri_params(lua_State *L)
{
const char *param;
int param_len;

ts_lua_http_ctx *http_ctx;

GET_HTTP_CONTEXT(http_ctx, L);

param = TSUrlHttpParamsGet(http_ctx->client_request_bufp, http_ctx->client_request_url, &param_len);

if (param && param_len > 0) {
lua_pushlstring(L, param, param_len);
} else {
lua_pushnil(L);
}

return 1;
}

static int
ts_lua_client_request_set_uri_params(lua_State *L)
{
const char *param;
size_t param_len;

ts_lua_http_ctx *http_ctx;

GET_HTTP_CONTEXT(http_ctx, L);

param = luaL_checklstring(L, 1, &param_len);
TSUrlHttpParamsSet(http_ctx->client_request_bufp, http_ctx->client_request_url, param, param_len);

return 0;
}

static int
ts_lua_client_request_client_addr_get_ip(lua_State *L)
{
Expand Down
56 changes: 0 additions & 56 deletions plugins/lua/ts_lua_server_request.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ static void ts_lua_inject_server_request_get_header_size_api(lua_State *L);
static void ts_lua_inject_server_request_get_body_size_api(lua_State *L);
static void ts_lua_inject_server_request_uri_api(lua_State *L);
static void ts_lua_inject_server_request_uri_args_api(lua_State *L);
static void ts_lua_inject_server_request_uri_params_api(lua_State *L);
static void ts_lua_inject_server_request_url_api(lua_State *L);
static void ts_lua_inject_server_request_method_api(lua_State *L);

Expand All @@ -65,8 +64,6 @@ static int ts_lua_server_request_get_uri(lua_State *L);
static int ts_lua_server_request_set_uri(lua_State *L);
static int ts_lua_server_request_set_uri_args(lua_State *L);
static int ts_lua_server_request_get_uri_args(lua_State *L);
static int ts_lua_server_request_set_uri_params(lua_State *L);
static int ts_lua_server_request_get_uri_params(lua_State *L);
static int ts_lua_server_request_get_method(lua_State *L);
static int ts_lua_server_request_set_method(lua_State *L);
static int ts_lua_server_request_get_url_host(lua_State *L);
Expand Down Expand Up @@ -100,7 +97,6 @@ ts_lua_inject_server_request_api(lua_State *L)
ts_lua_inject_server_request_method_api(L);
ts_lua_inject_server_request_uri_api(L);
ts_lua_inject_server_request_uri_args_api(L);
ts_lua_inject_server_request_uri_params_api(L);

ts_lua_inject_server_request_url_api(L);

Expand Down Expand Up @@ -588,58 +584,6 @@ ts_lua_server_request_get_uri_args(lua_State *L)
return 1;
}

static void
ts_lua_inject_server_request_uri_params_api(lua_State *L)
{
lua_pushcfunction(L, ts_lua_server_request_set_uri_params);
lua_setfield(L, -2, "set_uri_params");

lua_pushcfunction(L, ts_lua_server_request_get_uri_params);
lua_setfield(L, -2, "get_uri_params");
}

static int
ts_lua_server_request_set_uri_params(lua_State *L)
{
const char *param;
size_t param_len;

ts_lua_http_ctx *http_ctx;

GET_HTTP_CONTEXT(http_ctx, L);

TS_LUA_CHECK_SERVER_REQUEST_URL(http_ctx);

param = luaL_checklstring(L, 1, &param_len);
TSUrlHttpParamsSet(http_ctx->server_request_bufp, http_ctx->server_request_url, param, param_len);

return 0;
}

static int
ts_lua_server_request_get_uri_params(lua_State *L)
{
const char *param;
int param_len;

ts_lua_http_ctx *http_ctx;

GET_HTTP_CONTEXT(http_ctx, L);

TS_LUA_CHECK_SERVER_REQUEST_URL(http_ctx);

param = TSUrlHttpParamsGet(http_ctx->server_request_bufp, http_ctx->server_request_url, &param_len);

if (param && param_len > 0) {
lua_pushlstring(L, param, param_len);

} else {
lua_pushnil(L);
}

return 1;
}

static void
ts_lua_inject_server_request_url_api(lua_State *L)
{
Expand Down