|
| 1 | +diff --git lib/ngx/ssl.lua lib/ngx/ssl.lua |
| 2 | +index b696bea..ff1f251 100644 |
| 3 | +--- lib/ngx/ssl.lua |
| 4 | ++++ lib/ngx/ssl.lua |
| 5 | +@@ -26,6 +26,7 @@ local ngx_lua_ffi_ssl_set_der_private_key |
| 6 | + local ngx_lua_ffi_ssl_raw_server_addr |
| 7 | + local ngx_lua_ffi_ssl_server_port |
| 8 | + local ngx_lua_ffi_ssl_server_name |
| 9 | ++local ngx_lua_ffi_ssl_session_hostname |
| 10 | + local ngx_lua_ffi_ssl_raw_client_addr |
| 11 | + local ngx_lua_ffi_cert_pem_to_der |
| 12 | + local ngx_lua_ffi_priv_key_pem_to_der |
| 13 | +@@ -64,6 +65,9 @@ if subsystem == 'http' then |
| 14 | + int ngx_http_lua_ffi_ssl_server_name(ngx_http_request_t *r, char **name, |
| 15 | + size_t *namelen, char **err); |
| 16 | + |
| 17 | ++ int ngx_http_lua_ffi_ssl_session_hostname(ngx_http_request_t *r, char **name, |
| 18 | ++ size_t *namelen, char **err); |
| 19 | ++ |
| 20 | + int ngx_http_lua_ffi_ssl_raw_client_addr(ngx_http_request_t *r, char **addr, |
| 21 | + size_t *addrlen, int *addrtype, char **err); |
| 22 | + |
| 23 | +@@ -124,6 +128,7 @@ if subsystem == 'http' then |
| 24 | + ngx_lua_ffi_ssl_raw_server_addr = C.ngx_http_lua_ffi_ssl_raw_server_addr |
| 25 | + ngx_lua_ffi_ssl_server_port = C.ngx_http_lua_ffi_ssl_server_port |
| 26 | + ngx_lua_ffi_ssl_server_name = C.ngx_http_lua_ffi_ssl_server_name |
| 27 | ++ ngx_lua_ffi_ssl_session_hostname = C.ngx_http_lua_ffi_ssl_session_hostname |
| 28 | + ngx_lua_ffi_ssl_raw_client_addr = C.ngx_http_lua_ffi_ssl_raw_client_addr |
| 29 | + ngx_lua_ffi_cert_pem_to_der = C.ngx_http_lua_ffi_cert_pem_to_der |
| 30 | + ngx_lua_ffi_priv_key_pem_to_der = C.ngx_http_lua_ffi_priv_key_pem_to_der |
| 31 | +@@ -164,6 +169,9 @@ elseif subsystem == 'stream' then |
| 32 | + int ngx_stream_lua_ffi_ssl_server_name(ngx_stream_lua_request_t *r, |
| 33 | + char **name, size_t *namelen, char **err); |
| 34 | + |
| 35 | ++ int ngx_stream_lua_ffi_ssl_session_hostname(ngx_stream_lua_request_t *r, |
| 36 | ++ char **name, size_t *namelen, char **err); |
| 37 | ++ |
| 38 | + int ngx_stream_lua_ffi_ssl_raw_client_addr(ngx_stream_lua_request_t *r, |
| 39 | + char **addr, size_t *addrlen, int *addrtype, char **err); |
| 40 | + |
| 41 | +@@ -212,6 +220,7 @@ elseif subsystem == 'stream' then |
| 42 | + ngx_lua_ffi_ssl_raw_server_addr = C.ngx_stream_lua_ffi_ssl_raw_server_addr |
| 43 | + ngx_lua_ffi_ssl_server_port = C.ngx_stream_lua_ffi_ssl_server_port |
| 44 | + ngx_lua_ffi_ssl_server_name = C.ngx_stream_lua_ffi_ssl_server_name |
| 45 | ++ ngx_lua_ffi_ssl_session_hostname = C.ngx_stream_lua_ffi_ssl_session_hostname |
| 46 | + ngx_lua_ffi_ssl_raw_client_addr = C.ngx_stream_lua_ffi_ssl_raw_client_addr |
| 47 | + ngx_lua_ffi_cert_pem_to_der = C.ngx_stream_lua_ffi_cert_pem_to_der |
| 48 | + ngx_lua_ffi_priv_key_pem_to_der = C.ngx_stream_lua_ffi_priv_key_pem_to_der |
| 49 | +@@ -346,6 +355,27 @@ function _M.server_name() |
| 50 | + end |
| 51 | + |
| 52 | + |
| 53 | ++function _M.session_hostname() |
| 54 | ++ local r = get_request() |
| 55 | ++ if not r then |
| 56 | ++ error("no request found") |
| 57 | ++ end |
| 58 | ++ |
| 59 | ++ local sizep = get_size_ptr() |
| 60 | ++ |
| 61 | ++ local rc = ngx_lua_ffi_ssl_session_hostname(r, charpp, sizep, errmsg) |
| 62 | ++ if rc ~= FFI_OK then |
| 63 | ++ return nil, ffi_str(errmsg[0]) |
| 64 | ++ end |
| 65 | ++ |
| 66 | ++ if sizep[0] == 0 then |
| 67 | ++ return nil |
| 68 | ++ end |
| 69 | ++ |
| 70 | ++ return ffi_str(charpp[0], sizep[0]) |
| 71 | ++end |
| 72 | ++ |
| 73 | ++ |
| 74 | + function _M.raw_client_addr() |
| 75 | + local r = get_request() |
| 76 | + if not r then |
0 commit comments