Skip to content
Open
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
32 changes: 26 additions & 6 deletions lib/resty/core/socket.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ local type = type
local select = select
local registry = debug.getregistry()

local C = ffi.C
local ffi_new = ffi.new
local ffi_str = ffi.string
local ffi_gc = ffi.gc
local str_byte = string.byte
local C = ffi.C
local ffi_new = ffi.new
local ffi_str = ffi.string
local ffi_gc = ffi.gc

local get_string_buf = base.get_string_buf
local get_size_ptr = base.get_size_ptr
Expand Down Expand Up @@ -54,7 +55,8 @@ int
ngx_http_lua_ffi_socket_tcp_sslhandshake(ngx_http_request_t *r,
ngx_http_lua_socket_tcp_upstream_t *u, void *sess,
int enable_session_reuse, ngx_str_t *server_name, int verify,
int ocsp_status_req, void *chain, void *pkey, char **errmsg);
int ocsp_status_req, void *chain, void *pkey, ngx_str_t *alpn,
char **errmsg);

int
ngx_http_lua_ffi_socket_tcp_get_sslhandshake_result(ngx_http_request_t *r,
Expand Down Expand Up @@ -185,6 +187,7 @@ if subsystem == 'http' then
local errmsg = base.get_errmsg_ptr()
local session_ptr = ffi_new("void *[1]")
local server_name_str = ffi_new("ngx_str_t[1]")
local alpn_str = ffi_new("ngx_str_t[1]")
local openssl_error_code = ffi_new("int[1]")


Expand Down Expand Up @@ -217,7 +220,7 @@ end


local function sslhandshake(cosocket, reused_session, server_name, ssl_verify,
send_status_req, ...)
send_status_req, alpn, ...)

local n = select("#", ...)
if not cosocket or n > 0 then
Expand All @@ -241,6 +244,22 @@ local function sslhandshake(cosocket, reused_session, server_name, ssl_verify,
server_name_str[0].len = 0
end

if alpn then
local _bytes = {}
for _, proto_str in ipairs(alpn) do
_bytes[#_bytes + 1] = #proto_str
for _, proto_byte in ipairs(
{ str_byte(proto_str, 1, #proto_str) }) do
_bytes[#_bytes + 1] = proto_byte
end
end
alpn_str[0].data = ffi.new("unsigned char[?]", #_bytes, _bytes)
alpn_str[0].len = #_bytes
else
alpn_str[0].data = nil
alpn_str[0].len = 0
end

local u = get_tcp_socket(cosocket)

local rc = C.ngx_http_lua_ffi_socket_tcp_sslhandshake(r, u,
Expand All @@ -251,6 +270,7 @@ local function sslhandshake(cosocket, reused_session, server_name, ssl_verify,
send_status_req and 1 or 0,
cosocket[SOCKET_CLIENT_CERT_INDEX],
cosocket[SOCKET_CLIENT_PKEY_INDEX],
alpn_str,
errmsg)

if rc == FFI_NO_REQ_CTX then
Expand Down