Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,14 @@ 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)
* [ssl_verify_by_lua_block](https://github.com/openresty/lua-nginx-module#ssl_verify_by_lua_block)
* [ssl_verify_by_lua_file](https://github.com/openresty/lua-nginx-module#ssl_verify_by_lua_file)
* [proxy_ssl_certificate_by_lua_block](https://github.com/openresty/lua-nginx-module#proxy_ssl_certificate_by_lua_block)
* [proxy_ssl_certificate_by_lua_file](https://github.com/openresty/lua-nginx-module#proxy_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_skip_openssl_default_verify](https://github.com/openresty/lua-nginx-module#lua_skip_openssl_default_verify)
* [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)
* [lua_socket_pool_size](https://github.com/openresty/lua-nginx-module#lua_socket_pool_size)
Expand Down
2 changes: 2 additions & 0 deletions config
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_ssl_verifyby.c \
$ngx_addon_dir/src/ngx_stream_lua_proxy_ssl_certby.c \
$ngx_addon_dir/src/ngx_stream_lua_proxy_ssl_verifyby.c \
$ngx_addon_dir/src/ngx_stream_lua_log_ringbuf.c \
Expand Down Expand Up @@ -324,6 +325,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_ssl_verifyby.h \
$ngx_addon_dir/src/ngx_stream_lua_proxy_ssl_certby.h \
$ngx_addon_dir/src/ngx_stream_lua_proxy_ssl_verifyby.h \
$ngx_addon_dir/src/ngx_stream_lua_log_ringbuf.h \
Expand Down
7 changes: 7 additions & 0 deletions src/ngx_stream_lua_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@
#define NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO 0x0080
#define NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY 0x0100
#define NGX_STREAM_LUA_CONTEXT_PROXY_SSL_CERT 0x0200
#define NGX_STREAM_LUA_CONTEXT_SSL_VERIFY 0x0400


#define NGX_STREAM_LUA_FFI_NO_REQ_CTX -100
Expand Down Expand Up @@ -288,6 +289,12 @@ struct ngx_stream_lua_srv_conf_s {
ngx_stream_lua_srv_conf_handler_pt ssl_client_hello_handler;
ngx_str_t ssl_client_hello_src;
u_char *ssl_client_hello_src_key;

ngx_stream_lua_srv_conf_handler_pt ssl_verify_handler;
ngx_str_t ssl_verify_src;
u_char *ssl_verify_src_key;

ngx_flag_t skip_openssl_default_verify;
} srv;

#ifdef HAVE_PROXY_SSL_PATCH
Expand Down
4 changes: 3 additions & 1 deletion src/ngx_stream_lua_control.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ 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_SSL_VERIFY
#ifdef HAVE_LUA_PROXY_SSL
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY
Expand All @@ -131,7 +132,8 @@ ngx_stream_lua_ffi_exit(ngx_stream_lua_request_t *r, int status, u_char *err,
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY
#endif
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO ))
| NGX_STREAM_LUA_CONTEXT_SSL_CLIENT_HELLO
| NGX_STREAM_LUA_CONTEXT_SSL_VERIFY))
{

#if (NGX_STREAM_SSL)
Expand Down
3 changes: 3 additions & 0 deletions src/ngx_stream_lua_coroutine.c
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_SSL_VERIFY
#ifdef HAVE_LUA_PROXY_SSL
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY
Expand Down Expand Up @@ -270,6 +271,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_SSL_VERIFY
#ifdef HAVE_LUA_PROXY_SSL
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY
Expand Down Expand Up @@ -434,6 +436,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_SSL_VERIFY
#ifdef HAVE_LUA_PROXY_SSL
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_CERT
| NGX_STREAM_LUA_CONTEXT_PROXY_SSL_VERIFY
Expand Down
6 changes: 4 additions & 2 deletions src/ngx_stream_lua_ctx.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,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_SSL_VERIFY);
*ssl_ctx_ref = LUA_NOREF;

#if (NGX_STREAM_SSL)
Expand Down Expand Up @@ -138,7 +139,8 @@ ngx_stream_lua_ffi_set_ctx_ref(ngx_stream_lua_request_t *r, int ref)
ssl_ctx = NULL;

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_SSL_VERIFY))
{
ssl_ctx = ngx_stream_lua_ssl_get_ctx(r->connection->ssl->connection);
if (ssl_ctx == NULL) {
Expand Down
83 changes: 82 additions & 1 deletion src/ngx_stream_lua_module.c
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_ssl_verifyby.h"

#ifdef HAVE_LUA_PROXY_SSL
#include "ngx_stream_lua_proxy_ssl_certby.h"
Expand Down Expand Up @@ -433,6 +434,27 @@ static ngx_command_t ngx_stream_lua_cmds[] = {
0,
(void *) ngx_stream_lua_ssl_cert_handler_file },

{ ngx_string("ssl_verify_by_lua_block"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
ngx_stream_lua_ssl_verify_by_lua_block,
NGX_STREAM_SRV_CONF_OFFSET,
0,
(void *) ngx_stream_lua_ssl_verify_handler_inline },

{ ngx_string("ssl_verify_by_lua_file"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
ngx_stream_lua_ssl_verify_by_lua,
NGX_STREAM_SRV_CONF_OFFSET,
0,
(void *) ngx_stream_lua_ssl_verify_handler_file },

{ ngx_string("lua_skip_openssl_default_verify"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_STREAM_SRV_CONF_OFFSET,
offsetof(ngx_stream_lua_srv_conf_t, srv.skip_openssl_default_verify),
NULL },

#if HAVE_LUA_PROXY_SSL
/* same context as proxy_pass directive */
{ ngx_string("proxy_ssl_certificate_by_lua_block"),
Expand Down Expand Up @@ -876,6 +898,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->srv.ssl_verify_handler = NULL;
* lscf->srv.ssl_verify_src = { 0, NULL };
* lscf->srv.ssl_verify_src_key = NULL;
*
* lscf->ups.proxy_ssl_cert_handler = NULL;
* lscf->ups.proxy_ssl_cert_src = { 0, NULL };
* lscf->ups.proxy_ssl_cert_src_key = NULL;
Expand Down Expand Up @@ -921,11 +947,17 @@ ngx_stream_lua_create_srv_conf(ngx_conf_t *cf)

conf->log_socket_errors = NGX_CONF_UNSET;

#ifdef HAVE_LUA_PROXY_SSL
#if (NGX_STREAM_SSL)

conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
conf->ssl_certificates = NGX_CONF_UNSET_PTR;
conf->ssl_certificate_keys = NGX_CONF_UNSET_PTR;
conf->srv.skip_openssl_default_verify = NGX_CONF_UNSET;

#ifdef HAVE_LUA_PROXY_SSL
conf->ups.upstream_skip_openssl_default_verify = NGX_CONF_UNSET;
#endif

#endif

return conf;
Expand Down Expand Up @@ -1030,8 +1062,57 @@ ngx_stream_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)

#endif
}

}

if (conf->srv.ssl_verify_src.len == 0) {
conf->srv.ssl_verify_src = prev->srv.ssl_verify_src;
conf->srv.ssl_verify_src_key = prev->srv.ssl_verify_src_key;
conf->srv.ssl_verify_handler = prev->srv.ssl_verify_handler;
}

if (conf->srv.ssl_verify_src.len) {
if (sscf == NULL || sscf->ssl.ctx == NULL) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"no ssl configured for the server");

return NGX_CONF_ERROR;
}

if (sscf->verify == 0) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"ssl_verify_client can't be off "
"when using ssl_verify_by_lua*");

return NGX_CONF_ERROR;
}

#ifdef LIBRESSL_VERSION_NUMBER
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"LibreSSL does not support by ssl_verify_by_lua*");
return NGX_CONF_ERROR;

#else

#if defined(SSL_ERROR_WANT_RETRY_VERIFY) && \
OPENSSL_VERSION_NUMBER >= 0x40100000L

SSL_CTX_set_cert_verify_callback(sscf->ssl.ctx,
ngx_stream_lua_ssl_verify_handler,
NULL);

#else

ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"OpenSSL too old to support ssl_verify_by_lua*");
return NGX_CONF_ERROR;

#endif
#endif
}

ngx_conf_merge_value(conf->srv.skip_openssl_default_verify,
prev->srv.skip_openssl_default_verify, 0);

#endif /* NGX_STREAM_SSL */

Expand Down
4 changes: 4 additions & 0 deletions src/ngx_stream_lua_phase.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ ngx_stream_lua_ngx_get_phase(lua_State *L)
lua_pushliteral(L, "ssl_cert");
break;

case NGX_STREAM_LUA_CONTEXT_SSL_VERIFY:
lua_pushliteral(L, "ssl_verify");
break;

case NGX_STREAM_LUA_CONTEXT_PREREAD:
lua_pushliteral(L, "preread");
break;
Expand Down
1 change: 1 addition & 0 deletions src/ngx_stream_lua_ssl.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ typedef struct {
unsigned entered_client_hello_handler:1;
unsigned entered_cert_handler:1;
unsigned entered_sess_fetch_handler:1;
unsigned entered_ssl_verify_handler:1;
#ifdef HAVE_LUA_PROXY_SSL
unsigned entered_proxy_ssl_cert_handler:1;
unsigned entered_proxy_ssl_verify_handler:1;
Expand Down
Loading
Loading