Skip to content

feature: proxy_ssl_verify_by_lua directives #379

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

feature: proxy_ssl_verify_by_lua directives #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f01f6de
feature: proxy_ssl_verify_by_lua* directives
willmafh Jul 21, 2025
6e83275
doc: add lua_upstream_skip_openssl_default_verify description
willmafh Jul 21, 2025
020f2da
chore: typo fixes.
willmafh Jul 21, 2025
825bc31
feature: ngx_stream_lua_ffi_req_shared_ssl_ciphers().
chensunny Jul 21, 2025
c4c4328
style: fixed coding style.
willmafh Jul 21, 2025
3cedd2d
optimize: checked r before using it.
Fahnenfluchtige Jul 21, 2025
d3d3d86
feature: add lua_ssl_key_log directive to log client connection SSL k…
willmafh Jul 1, 2025
3ea476a
Merge branch 'openresty:master' into proxy_ssl_verify_by_lua
willmafh Jul 21, 2025
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
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ behavior.
* [ssl_client_hello_by_lua_file](https://github.com/openresty/lua-nginx-module#ssl_client_hello_by_lua_file)
* [ssl_certificate_by_lua_block](https://github.com/openresty/lua-nginx-module#ssl_certificate_by_lua_block)
* [ssl_certificate_by_lua_file](https://github.com/openresty/lua-nginx-module#ssl_certificate_by_lua_file)
* [proxy_ssl_verify_by_lua_block](https://github.com/openresty/lua-nginx-module#proxy_ssl_verify_by_lua_block)
* [proxy_ssl_verify_by_lua_file](https://github.com/openresty/lua-nginx-module#proxy_ssl_verify_by_lua_file)
* [lua_shared_dict](https://github.com/openresty/lua-nginx-module#lua_shared_dict)
* [lua_socket_connect_timeout](https://github.com/openresty/lua-nginx-module#lua_socket_connect_timeout)
* [lua_socket_buffer_size](https://github.com/openresty/lua-nginx-module#lua_socket_buffer_size)
Expand All @@ -166,6 +168,7 @@ behavior.
* [lua_ssl_verify_depth](https://github.com/openresty/lua-nginx-module#lua_ssl_verify_depth)
* [lua_ssl_key_log](https://github.com/openresty/lua-nginx-module#lua_ssl_key_log)
* [lua_ssl_conf_command](https://github.com/openresty/lua-nginx-module#lua_ssl_conf_command)
* [lua_upstream_skip_openssl_default_verify](https://github.com/openresty/lua-nginx-module#lua_upstream_skip_openssl_default_verify)
* [lua_check_client_abort](https://github.com/openresty/lua-nginx-module#lua_check_client_abort)
* [lua_max_pending_timers](https://github.com/openresty/lua-nginx-module#lua_max_pending_timers)
* [lua_max_running_timers](https://github.com/openresty/lua-nginx-module#lua_max_running_timers)
Expand Down
2 changes: 2 additions & 0 deletions config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ STREAM_LUA_SRCS=" \
$ngx_addon_dir/src/ngx_stream_lua_semaphore.c \
$ngx_addon_dir/src/ngx_stream_lua_ssl_client_helloby.c \
$ngx_addon_dir/src/ngx_stream_lua_ssl_certby.c \
$ngx_addon_dir/src/ngx_stream_lua_proxy_ssl_verifyby.c \
$ngx_addon_dir/src/ngx_stream_lua_log_ringbuf.c \
$ngx_addon_dir/src/ngx_stream_lua_input_filters.c \
"
Expand Down Expand Up @@ -322,6 +323,7 @@ STREAM_LUA_DEPS=" \
$ngx_addon_dir/src/ngx_stream_lua_semaphore.h \
$ngx_addon_dir/src/ngx_stream_lua_ssl_client_helloby.h \
$ngx_addon_dir/src/ngx_stream_lua_ssl_certby.h \
$ngx_addon_dir/src/ngx_stream_lua_proxy_ssl_verifyby.h \
$ngx_addon_dir/src/ngx_stream_lua_log_ringbuf.h \
$ngx_addon_dir/src/ngx_stream_lua_input_filters.h \
"
Expand Down
9 changes: 9 additions & 0 deletions src/ngx_stream_lua_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
#define NGX_STREAM_LUA_CONTEXT_PREREAD 0x0020
#define NGX_STREAM_LUA_CONTEXT_SSL_CERT 0x0040
#define NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO 0x0080
#define NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY 0x0100


#define NGX_STREAM_LUA_FFI_NO_REQ_CTX -100
Expand Down Expand Up @@ -270,6 +271,14 @@ struct ngx_stream_lua_srv_conf_s {
ngx_str_t ssl_client_hello_src;
u_char *ssl_client_hello_src_key;
} srv;

struct {
ngx_stream_lua_srv_conf_handler_pt proxy_ssl_verify_handler;
ngx_str_t proxy_ssl_verify_src;
u_char *proxy_ssl_verify_src_key;

ngx_flag_t upstream_skip_openssl_default_verify;
} ups;
#endif

ngx_flag_t enable_code_cache; /* whether to enable
Expand Down
6 changes: 4 additions & 2 deletions src/ngx_stream_lua_control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,16 @@ ngx_stream_lua_ffi_exit(ngx_stream_lua_request_t *r, int status, u_char *err,
| NGX_STREAM_LUA_CONTEXT_BALANCER
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO
| NGX_STREAM_LUA_CONTEXT_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_PREREAD,
| NGX_STREAM_LUA_CONTEXT_PREREAD
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY,
err, errlen) != NGX_OK)
{
return NGX_ERROR;
}

if (ctx->context & (NGX_STREAM_LUA_CONTEXT_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO ))
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY ))
{

#if (NGX_STREAM_SSL)
Expand Down
3 changes: 3 additions & 0 deletions src/ngx_stream_lua_coroutine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ ngx_stream_lua_coroutine_resume(lua_State *L)
| NGX_STREAM_LUA_CONTEXT_TIMER
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO
| NGX_STREAM_LUA_CONTEXT_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY
| NGX_STREAM_LUA_CONTEXT_PREREAD
);

Expand Down Expand Up @@ -266,6 +267,7 @@ ngx_stream_lua_coroutine_yield(lua_State *L)
| NGX_STREAM_LUA_CONTEXT_TIMER
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO
| NGX_STREAM_LUA_CONTEXT_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY
| NGX_STREAM_LUA_CONTEXT_PREREAD
);

Expand Down Expand Up @@ -426,6 +428,7 @@ ngx_stream_lua_coroutine_status(lua_State *L)
| NGX_STREAM_LUA_CONTEXT_TIMER
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO
| NGX_STREAM_LUA_CONTEXT_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY
| NGX_STREAM_LUA_CONTEXT_PREREAD
);

Expand Down
6 changes: 4 additions & 2 deletions src/ngx_stream_lua_ctx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ ngx_stream_lua_ffi_get_ctx_ref(ngx_stream_lua_request_t *r, int *in_ssl_phase,
}

*in_ssl_phase = ctx->context & (NGX_STREAM_LUA_CONTEXT_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO);
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY);
*ssl_ctx_ref = LUA_NOREF;

#if (NGX_STREAM_SSL)
Expand Down Expand Up @@ -131,7 +132,8 @@ ngx_stream_lua_ffi_set_ctx_ref(ngx_stream_lua_request_t *r, int ref)

#if (NGX_STREAM_SSL)
if (ctx->context & (NGX_STREAM_LUA_CONTEXT_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO))
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY))
{
ssl_ctx = ngx_stream_lua_ssl_get_ctx(r->connection->ssl->connection);
if (ssl_ctx == NULL) {
Expand Down
43 changes: 43 additions & 0 deletions src/ngx_stream_lua_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "ngx_stream_lua_semaphore.h"
#include "ngx_stream_lua_ssl_client_helloby.h"
#include "ngx_stream_lua_ssl_certby.h"
#include "ngx_stream_lua_proxy_ssl_verifyby.h"


#include "ngx_stream_lua_prereadby.h"
Expand Down Expand Up @@ -422,6 +423,28 @@ static ngx_command_t ngx_stream_lua_cmds[] = {
0,
(void *) ngx_stream_lua_ssl_cert_handler_file },

/* same context as proxy_pass directive */
{ ngx_string("proxy_ssl_verify_by_lua_block"),
NGX_STREAM_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
ngx_stream_lua_proxy_ssl_verify_by_lua_block,
NGX_STREAM_SRV_CONF_OFFSET,
0,
(void *) ngx_stream_lua_proxy_ssl_verify_handler_inline },

{ ngx_string("proxy_ssl_verify_by_lua_file"),
NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
ngx_stream_lua_proxy_ssl_verify_by_lua,
NGX_STREAM_SRV_CONF_OFFSET,
0,
(void *) ngx_stream_lua_proxy_ssl_verify_handler_file },

{ ngx_string("lua_upstream_skip_openssl_default_verify"),
NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_STREAM_SRV_CONF_OFFSET,
offsetof(ngx_stream_lua_srv_conf_t,
ups.upstream_skip_openssl_default_verify),
NULL },

{ ngx_string("lua_ssl_verify_depth"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
Expand Down Expand Up @@ -827,6 +850,10 @@ ngx_stream_lua_create_srv_conf(ngx_conf_t *cf)
* lscf->srv.ssl_client_hello_src = { 0, NULL };
* lscf->srv.ssl_client_hello_src_key = NULL;
*
* lscf->ups.proxy_ssl_verify_handler = NULL;
* lscf->ups.proxy_ssl_verify_src = { 0, NULL };
* lscf->ups.proxy_ssl_verify_src_key = NULL;
*
* lscf->srv.ssl_cert_handler = NULL;
* lscf->srv.ssl_cert_src = { 0, NULL };
* lscf->srv.ssl_cert_src_key = NULL;
Expand Down Expand Up @@ -868,6 +895,7 @@ ngx_stream_lua_create_srv_conf(ngx_conf_t *cf)
conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
conf->ssl_certificates = NGX_CONF_UNSET_PTR;
conf->ssl_certificate_keys = NGX_CONF_UNSET_PTR;
conf->ups.upstream_skip_openssl_default_verify = NGX_CONF_UNSET;
#endif

return conf;
Expand Down Expand Up @@ -1002,6 +1030,21 @@ ngx_stream_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
NULL);
#endif

if (conf->ups.proxy_ssl_verify_src.len == 0) {
conf->ups.proxy_ssl_verify_src = prev->ups.proxy_ssl_verify_src;
conf->ups.proxy_ssl_verify_handler = prev->ups.proxy_ssl_verify_handler;
conf->ups.proxy_ssl_verify_src_key = prev->ups.proxy_ssl_verify_src_key;
}

if (conf->ups.proxy_ssl_verify_src.len) {
if (ngx_stream_lua_proxy_ssl_verify_set_callback(cf) != NGX_OK) {
return NGX_CONF_ERROR;
}
}

ngx_conf_merge_value(conf->ups.upstream_skip_openssl_default_verify,
prev->ups.upstream_skip_openssl_default_verify, 0);

if (ngx_stream_lua_set_ssl(cf, conf) != NGX_OK) {
return NGX_CONF_ERROR;
}
Expand Down
4 changes: 4 additions & 0 deletions src/ngx_stream_lua_phase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ ngx_stream_lua_ngx_get_phase(lua_State *L)
lua_pushliteral(L, "content");
break;

case NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY:
lua_pushliteral(L, "proxy_ssl_verify");
break;

case NGX_STREAM_LUA_CONTEXT_LOG:
lua_pushliteral(L, "log");
break;
Expand Down
Loading