Software /
code /
prosody
File
util-src/hashes.c @ 13652:a08065207ef0
net.server_epoll: Call :shutdown() on TLS sockets when supported
Comment from Matthew:
This fixes a potential issue where the Prosody process gets blocked on sockets
waiting for them to close. Unlike non-TLS sockets, closing a TLS socket sends
layer 7 data, and this can cause problems for sockets which are in the process
of being cleaned up.
This depends on LuaSec changes which are not yet upstream.
From Martijn's original email:
So first my analysis of luasec. in ssl.c the socket is put into blocking
mode right before calling SSL_shutdown() inside meth_destroy(). My best
guess to why this is is because meth_destroy is linked to the __close
and __gc methods, which can't exactly be called multiple times and
luasec does want to make sure that a tls session is shutdown as clean
as possible.
I can't say I disagree with this reasoning and don't want to change this
behaviour. My solution to this without changing the current behaviour is
to introduce a shutdown() method. I am aware that this overlaps in a
conflicting way with tcp's shutdown method, but it stays close to the
OpenSSL name. This method calls SSL_shutdown() in the current
(non)blocking mode of the underlying socket and returns a boolean
whether or not the shutdown is completed (matching SSL_shutdown()'s 0
or 1 return values), and returns the familiar ssl_ioerror() strings on
error with a false for completion. This error can then be used to
determine if we have wantread/wantwrite to finalize things. Once
meth_shutdown() has been called once a shutdown flag will be set, which
indicates to meth_destroy() that the SSL_shutdown() has been handled
by the application and it shouldn't be needed to set the socket to
blocking mode. I've left the SSL_shutdown() call in the
LSEC_STATE_CONNECTED to prevent TOCTOU if the application reaches a
timeout for the shutdown code, which might allow SSL_shutdown() to
clean up anyway at the last possible moment.
Another thing I've changed to luasec is the call to socket_setblocking()
right before calling close(2) in socket_destroy() in usocket.c.
According to the latest POSIX[0]:
Note that the requirement for close() on a socket to block for up to
the current linger interval is not conditional on the O_NONBLOCK
setting.
Which I read to mean that removing O_NONBLOCK on the socket before close
doesn't impact the behaviour and only causes noise in system call
tracers. I didn't touch the windows bits of this, since I don't do
windows.
For the prosody side of things I've made the TLS shutdown bits resemble
interface:onwritable(), and put it under a combined guard of self._tls
and self.conn.shutdown. The self._tls bit is there to prevent getting
stuck on this condition, and self.conn.shutdown is there to prevent the
code being called by instances where the patched luasec isn't deployed.
The destroy() method can be called from various places and is read by
me as the "we give up" error path. To accommodate for these unexpected
entrypoints I've added a single call to self.conn:shutdown() to prevent
the socket being put into blocking mode. I have no expectations that
there is any other use here. Same as previous, the self.conn.shutdown
check is there to make sure it's not called on unpatched luasec
deployments and self._tls is there to make sure we don't call shutdown()
on tcp sockets.
I wouldn't recommend logging of the conn:shutdown() error inside
close(), since a lot of clients simply close the connection before
SSL_shutdown() is done.
author | Martijn van Duren <martijn@openbsd.org> |
---|---|
date | Thu, 06 Feb 2025 15:04:38 +0000 |
parent | 12976:a187600ec7d6 |
line wrap: on
line source
/* Prosody IM -- Copyright (C) 2009-2010 Matthew Wild -- Copyright (C) 2009-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- */ /* * hashes.c * Lua library for sha1, sha256 and md5 hashes */ #include <string.h> #include <stdlib.h> #ifdef _MSC_VER typedef unsigned __int32 uint32_t; #else #include <inttypes.h> #endif #include "lua.h" #include "lauxlib.h" #include <openssl/crypto.h> #include <openssl/sha.h> #include <openssl/md5.h> #include <openssl/hmac.h> #include <openssl/evp.h> #include <openssl/kdf.h> #include <openssl/err.h> /* Semi-arbitrary limit here. The actual theoretical limit * is (255*(hash output octets)), but allocating 16KB on the * stack when in practice we only ever request a few dozen * bytes seems excessive. */ #define MAX_HKDF_OUTPUT 256 static const char *hex_tab = "0123456789abcdef"; static void toHex(const unsigned char *in, int length, unsigned char *out) { int i; for(i = 0; i < length; i++) { out[i * 2] = hex_tab[(in[i] >> 4) & 0xF]; out[i * 2 + 1] = hex_tab[(in[i]) & 0xF]; } } static int Levp_hash(lua_State *L, const EVP_MD *evp) { size_t len; unsigned int size = EVP_MAX_MD_SIZE; const char *s = luaL_checklstring(L, 1, &len); int hex_out = lua_toboolean(L, 2); unsigned char hash[EVP_MAX_MD_SIZE], result[EVP_MAX_MD_SIZE * 2]; EVP_MD_CTX *ctx = EVP_MD_CTX_new(); if(ctx == NULL) { goto fail; } if(!EVP_DigestInit_ex(ctx, evp, NULL)) { goto fail; } if(!EVP_DigestUpdate(ctx, s, len)) { goto fail; } if(!EVP_DigestFinal_ex(ctx, hash, &size)) { goto fail; } EVP_MD_CTX_free(ctx); if(hex_out) { toHex(hash, size, result); lua_pushlstring(L, (char *)result, size * 2); } else { lua_pushlstring(L, (char *)hash, size); } return 1; fail: EVP_MD_CTX_free(ctx); return luaL_error(L, ERR_error_string(ERR_get_error(), NULL)); } static int Lsha1(lua_State *L) { return Levp_hash(L, EVP_sha1()); } static int Lsha224(lua_State *L) { return Levp_hash(L, EVP_sha224()); } static int Lsha256(lua_State *L) { return Levp_hash(L, EVP_sha256()); } static int Lsha384(lua_State *L) { return Levp_hash(L, EVP_sha384()); } static int Lsha512(lua_State *L) { return Levp_hash(L, EVP_sha512()); } static int Lmd5(lua_State *L) { return Levp_hash(L, EVP_md5()); } static int Lblake2s256(lua_State *L) { return Levp_hash(L, EVP_blake2s256()); } static int Lblake2b512(lua_State *L) { return Levp_hash(L, EVP_blake2b512()); } static int Lsha3_256(lua_State *L) { return Levp_hash(L, EVP_sha3_256()); } static int Lsha3_512(lua_State *L) { return Levp_hash(L, EVP_sha3_512()); } static int Levp_hmac(lua_State *L, const EVP_MD *evp) { unsigned char hash[EVP_MAX_MD_SIZE], result[EVP_MAX_MD_SIZE * 2]; size_t key_len, msg_len; unsigned int out_len = EVP_MAX_MD_SIZE; const char *key = luaL_checklstring(L, 1, &key_len); const char *msg = luaL_checklstring(L, 2, &msg_len); const int hex_out = lua_toboolean(L, 3); if(HMAC(evp, key, key_len, (const unsigned char*)msg, msg_len, (unsigned char*)hash, &out_len) == NULL) { goto fail; } if(hex_out) { toHex(hash, out_len, result); lua_pushlstring(L, (char *)result, out_len * 2); } else { lua_pushlstring(L, (char *)hash, out_len); } return 1; fail: return luaL_error(L, ERR_error_string(ERR_get_error(), NULL)); } static int Lhmac_sha1(lua_State *L) { return Levp_hmac(L, EVP_sha1()); } static int Lhmac_sha224(lua_State *L) { return Levp_hmac(L, EVP_sha224()); } static int Lhmac_sha256(lua_State *L) { return Levp_hmac(L, EVP_sha256()); } static int Lhmac_sha384(lua_State *L) { return Levp_hmac(L, EVP_sha384()); } static int Lhmac_sha512(lua_State *L) { return Levp_hmac(L, EVP_sha512()); } static int Lhmac_md5(lua_State *L) { return Levp_hmac(L, EVP_md5()); } static int Lhmac_sha3_256(lua_State *L) { return Levp_hmac(L, EVP_sha3_256()); } static int Lhmac_sha3_512(lua_State *L) { return Levp_hmac(L, EVP_sha3_512()); } static int Lhmac_blake2s256(lua_State *L) { return Levp_hmac(L, EVP_blake2s256()); } static int Lhmac_blake2b512(lua_State *L) { return Levp_hmac(L, EVP_blake2b512()); } static int Levp_pbkdf2(lua_State *L, const EVP_MD *evp, size_t out_len) { unsigned char out[EVP_MAX_MD_SIZE]; size_t pass_len, salt_len; const char *pass = luaL_checklstring(L, 1, &pass_len); const unsigned char *salt = (unsigned char *)luaL_checklstring(L, 2, &salt_len); const int iter = luaL_checkinteger(L, 3); if(PKCS5_PBKDF2_HMAC(pass, pass_len, salt, salt_len, iter, evp, out_len, out) == 0) { return luaL_error(L, ERR_error_string(ERR_get_error(), NULL)); } lua_pushlstring(L, (char *)out, out_len); return 1; } static int Lpbkdf2_sha1(lua_State *L) { return Levp_pbkdf2(L, EVP_sha1(), SHA_DIGEST_LENGTH); } static int Lpbkdf2_sha256(lua_State *L) { return Levp_pbkdf2(L, EVP_sha256(), SHA256_DIGEST_LENGTH); } /* HKDF(length, input, salt, info) */ static int Levp_hkdf(lua_State *L, const EVP_MD *evp) { unsigned char out[MAX_HKDF_OUTPUT]; size_t input_len, salt_len, info_len; size_t actual_out_len = luaL_checkinteger(L, 1); const unsigned char *input = (unsigned char *)luaL_checklstring(L, 2, &input_len); const unsigned char *salt = (unsigned char *)luaL_optlstring(L, 3, NULL, &salt_len); const unsigned char *info = (unsigned char *)luaL_checklstring(L, 4, &info_len); if(actual_out_len > MAX_HKDF_OUTPUT) return luaL_error(L, "desired output length %ul exceeds internal limit %ul", actual_out_len, MAX_HKDF_OUTPUT); EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL); if (EVP_PKEY_derive_init(pctx) <= 0) return luaL_error(L, ERR_error_string(ERR_get_error(), NULL)); if (EVP_PKEY_CTX_set_hkdf_md(pctx, evp) <= 0) return luaL_error(L, ERR_error_string(ERR_get_error(), NULL)); if(salt != NULL) { if (EVP_PKEY_CTX_set1_hkdf_salt(pctx, salt, salt_len) <= 0) return luaL_error(L, ERR_error_string(ERR_get_error(), NULL)); } if (EVP_PKEY_CTX_set1_hkdf_key(pctx, input, input_len) <= 0) return luaL_error(L, ERR_error_string(ERR_get_error(), NULL)); if (EVP_PKEY_CTX_add1_hkdf_info(pctx, info, info_len) <= 0) return luaL_error(L, ERR_error_string(ERR_get_error(), NULL)); if (EVP_PKEY_derive(pctx, out, &actual_out_len) <= 0) return luaL_error(L, ERR_error_string(ERR_get_error(), NULL)); lua_pushlstring(L, (char *)out, actual_out_len); return 1; } static int Lhkdf_sha256(lua_State *L) { return Levp_hkdf(L, EVP_sha256()); } static int Lhkdf_sha384(lua_State *L) { return Levp_hkdf(L, EVP_sha384()); } static int Lhash_equals(lua_State *L) { size_t len1, len2; const char *s1 = luaL_checklstring(L, 1, &len1); const char *s2 = luaL_checklstring(L, 2, &len2); if(len1 == len2) { lua_pushboolean(L, CRYPTO_memcmp(s1, s2, len1) == 0); } else { lua_pushboolean(L, 0); } return 1; } static const luaL_Reg Reg[] = { { "sha1", Lsha1 }, { "sha224", Lsha224 }, { "sha256", Lsha256 }, { "sha384", Lsha384 }, { "sha512", Lsha512 }, { "md5", Lmd5 }, { "sha3_256", Lsha3_256 }, { "sha3_512", Lsha3_512 }, { "blake2s256", Lblake2s256 }, { "blake2b512", Lblake2b512 }, { "hmac_sha1", Lhmac_sha1 }, { "hmac_sha224", Lhmac_sha224 }, { "hmac_sha256", Lhmac_sha256 }, { "hmac_sha384", Lhmac_sha384 }, { "hmac_sha512", Lhmac_sha512 }, { "hmac_md5", Lhmac_md5 }, { "hmac_sha3_256", Lhmac_sha3_256 }, { "hmac_sha3_512", Lhmac_sha3_512 }, { "hmac_blake2s256", Lhmac_blake2s256 }, { "hmac_blake2b512", Lhmac_blake2b512 }, { "scram_Hi_sha1", Lpbkdf2_sha1 }, /* COMPAT */ { "pbkdf2_hmac_sha1", Lpbkdf2_sha1 }, { "pbkdf2_hmac_sha256", Lpbkdf2_sha256 }, { "hkdf_hmac_sha256", Lhkdf_sha256 }, { "hkdf_hmac_sha384", Lhkdf_sha384 }, { "equals", Lhash_equals }, { NULL, NULL } }; LUALIB_API int luaopen_prosody_util_hashes(lua_State *L) { luaL_checkversion(L); lua_newtable(L); luaL_setfuncs(L, Reg, 0); lua_pushliteral(L, "-3.14"); lua_setfield(L, -2, "version"); #ifdef OPENSSL_VERSION lua_pushstring(L, OpenSSL_version(OPENSSL_VERSION)); lua_setfield(L, -2, "_LIBCRYPTO_VERSION"); #endif return 1; } LUALIB_API int luaopen_util_hashes(lua_State *L) { return luaopen_prosody_util_hashes(L); }