Skip to content
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

chore(ci) bump OpenResty to 1.21.4.2 #408

Merged
merged 3 commits into from
Sep 8, 2023
Merged

chore(ci) bump OpenResty to 1.21.4.2 #408

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
e5e5265
chore(ci) bump OpenResty to 1.21.4.2
thibaultcha Sep 6, 2023
893ad78
fix(http_wasm) avoid a use-after-free in latest ngx_http_lua_module
thibaultcha Sep 7, 2023
cb23d60
tests(openresty) update suites for latest ngx_http_lua_module
thibaultcha Sep 7, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/ci-large.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- label: dynamic_module
os: ubuntu-latest
cc: gcc-9
openresty: 1.21.4.1
openresty: 1.21.4.2
runtime: wasmtime
wasmtime: 12.0.1
debug: debug
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
- label: openresty
os: ubuntu-22.04
cc: gcc-10
openresty: 1.21.4.1
openresty: 1.21.4.2
runtime: wasmer
wasmer: 3.1.1
debug: debug
Expand All @@ -104,7 +104,7 @@ jobs:
matrix:
os: [ubuntu-latest]
cc: [clang-11]
openresty: [1.21.4.1]
openresty: [1.21.4.2]
runtime: [wasmtime, wasmer, v8]
wasmtime: [12.0.1]
wasmer: [3.1.1]
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
- label: openresty
os: ubuntu-latest
cc: gcc-9
openresty: 1.21.4.1
openresty: 1.21.4.2
runtime: wasmtime
wasmtime: 12.0.1
ssl: ssl
Expand All @@ -102,7 +102,7 @@ jobs:
- label: dynamic_openresty
os: ubuntu-latest
cc: gcc-9
openresty: 1.21.4.1
openresty: 1.21.4.2
runtime: wasmtime
wasmtime: 12.0.1
ssl: ssl
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel-finished: true
carryforward: 'unit-ngx_1.25.2-wasmer-ssl-debug-no_hup-static,unit-ngx_1.25.2-wasmer-ssl-no_debug-no_hup-static,unit-ngx_1.25.2-wasmtime-ssl-debug-hup-static,unit-ngx_1.25.2-wasmtime-ssl-debug-hup-dynamic,unit-ngx_1.25.2-v8-ssl-debug-no_hup-static,unit-ngx_1.21.6-wasmer-ssl-debug-no_hup-static,unit-ngx_1.25.2-wasmer-no_ssl-no_debug-no_hup-static,unit-openresty_1.21.4.1-wasmtime-ssl-debug-no_hup-static,unit-openresty_1.21.4.1-wasmtime-ssl-debug-no_hup-dynamic'
carryforward: 'unit-ngx_1.25.2-wasmer-ssl-debug-no_hup-static,unit-ngx_1.25.2-wasmer-ssl-no_debug-no_hup-static,unit-ngx_1.25.2-wasmtime-ssl-debug-hup-static,unit-ngx_1.25.2-wasmtime-ssl-debug-hup-dynamic,unit-ngx_1.25.2-v8-ssl-debug-no_hup-static,unit-ngx_1.21.6-wasmer-ssl-debug-no_hup-static,unit-ngx_1.25.2-wasmer-no_ssl-no_debug-no_hup-static,unit-openresty_1.21.4.2-wasmtime-ssl-debug-no_hup-static,unit-openresty_1.21.4.2-wasmtime-ssl-debug-no_hup-dynamic'

valgrind:
name: 'Valgrind'
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
- label: openresty
os: ubuntu-22.04
cc: gcc-10
openresty: 1.21.4.1
openresty: 1.21.4.2
ngx:
runtime: wasmer
wasmer: 3.1.1
Expand Down Expand Up @@ -241,7 +241,7 @@ jobs:
fail-fast: false
matrix:
cc: [clang-11]
openresty: [1.21.4.1]
openresty: [1.21.4.2]
runtime: [wasmtime, wasmer, v8]
wasmtime: [12.0.1]
wasmer: [3.1.1]
Expand Down
30 changes: 11 additions & 19 deletions src/http/ngx_http_wasm_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,9 +846,8 @@ ngx_http_wasm_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc)
static void
ngx_http_wasm_close_fake_connection(ngx_connection_t *c)
{
ngx_pool_t *pool;
ngx_connection_t *saved_c = NULL;
ngx_http_connection_t *hc = c->data;
ngx_pool_t *pool;
ngx_connection_t *saved_c = NULL;

ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"wasm closing fake connection: %p", c);
Expand Down Expand Up @@ -886,11 +885,7 @@ ngx_http_wasm_close_fake_connection(ngx_connection_t *c)
ngx_cycle->files[0] = saved_c;
}

if (pool) {
ngx_pfree(pool, hc);

ngx_destroy_pool(pool);
}
ngx_destroy_pool(pool);
}


Expand Down Expand Up @@ -925,19 +920,10 @@ ngx_http_wasm_close_fake_request(ngx_http_request_t *r)
static void
ngx_http_wasm_free_fake_request(ngx_http_request_t *r)
{
#if (NGX_DEBUG)
ngx_log_t *log;
#endif
ngx_http_cleanup_t *cln;

#if (NGX_DEBUG)
log = r->connection->log;

ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"wasm freeing fake request (r: %p)", r);
#endif

ngx_wasm_assert(r->pool); /* already freed */

cln = r->cleanup;
r->cleanup = NULL;
Expand All @@ -951,5 +937,11 @@ ngx_http_wasm_free_fake_request(ngx_http_request_t *r)
}

r->request_line.len = 0;
r->connection->destroyed = 1;

#if 0
/* r may be used in c->pool cleanup handlers, will be
* freed on c->pool destroy */
ngx_pfree(r->pool, r->ctx);
ngx_pfree(r->pool, r);
#endif
}
2 changes: 1 addition & 1 deletion t/04-openresty/ffi/300-proxy_wasm_get_property_host.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ok
--- error_log eval
[
qr/\[error\] .*? cannot get host properties outside of a request/,
qr/\[error\] .*? init_worker_by_lua:\d+: unknown error/,
qr/\[error\] .*? init_worker_by_lua(\(nginx\.conf:\d+\))?:\d+: unknown error/,
]


Expand Down
2 changes: 1 addition & 1 deletion t/04-openresty/ffi/301-proxy_wasm_get_property_ngx.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ok
--- error_log eval
[
qr/\[error\] .*? cannot get ngx properties outside of a request/,
qr/\[error\] .*? init_worker_by_lua:\d+: unknown error/,
qr/\[error\] .*? init_worker_by_lua(\(nginx\.conf:\d+\))?:\d+: unknown error/,
]
--- no_error_log
[crit]
Expand Down
2 changes: 1 addition & 1 deletion t/04-openresty/ffi/302-proxy_wasm_set_property_host.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ok
--- error_log eval
[
qr/\[error\] .*? cannot set host properties outside of a request/,
qr/\[error\] .*? init_worker_by_lua:\d+: unknown error/,
qr/\[error\] .*? init_worker_by_lua(\(nginx\.conf:\d+\))?:\d+: unknown error/,
]
--- no_error_log
[crit]
Expand Down
2 changes: 1 addition & 1 deletion t/04-openresty/ffi/303-proxy_wasm_set_property_ngx.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ok
--- error_log eval
[
qr/\[error\] .*? cannot set ngx properties outside of a request/,
qr/\[error\] .*? init_worker_by_lua:\d+: unknown error/,
qr/\[error\] .*? init_worker_by_lua(\(nginx\.conf:\d+\))?:\d+: unknown error/,
]
--- no_error_log
[crit]
Expand Down
1 change: 0 additions & 1 deletion t/04-openresty/lua-bridge/003-proxy_wasm_lua_resolver_timeouts.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ Using a non-local resolver
lua-resty-dns-resolver client timeout
Behaves strangely on GHA Valgrind. Seems fine locally.
Will run with TEST_NGINX_USE_VALGRIND_ALL.
--- skip_valgrind: 5
--- load_nginx_modules: ngx_http_echo_module
--- main_config eval
qq{
Expand Down
Loading