# HG changeset patch # User Kim Alvefur # Date 1456163219 -3600 # Node ID e8f20be3e6f873d6490884d091d07571a0fef7f0 # Parent bfa3b2ee384c4dcc25b15f7147440ad217314c1c# Parent 3d2c2f0809ee3a7c27e266e20d164be2e844e826 Merge 0.10->trunk diff -r bfa3b2ee384c -r e8f20be3e6f8 configure --- a/configure Mon Feb 22 15:24:20 2016 +0100 +++ b/configure Mon Feb 22 18:46:59 2016 +0100 @@ -19,6 +19,8 @@ LD=gcc RUNWITH=lua EXCERTS=yes +PRNG= +PRNGLIBS= CFLAGS="-fPIC -Wall" LDFLAGS="-shared" @@ -58,6 +60,11 @@ icu: use ICU from IBM --with-ssl=LIB The name of the SSL to link with. Default is $OPENSSL_LIB +--with-random=METHOD CSPRNG backend to use. One of + getrandom: Linux kernel + arc4random: OpenBSD kernel + openssl: OpenSSL RAND method + Default is to use /dev/urandom --cflags=FLAGS Flags to pass to the compiler Default is $CFLAGS --ldflags=FLAGS Flags to pass to the linker @@ -174,6 +181,16 @@ --with-ssl=*) OPENSSL_LIB="$value" ;; + --with-random=getrandom) + PRNG=GETRANDOM + ;; + --with-random=openssl) + PRNG=OPENSSL + PRNGLIBS=-lcrypto + ;; + --with-random=arc4random) + PRNG=ARC4RANDOM + ;; --cflags=*) CFLAGS="$value" ;; @@ -372,6 +389,9 @@ LD=$LD RUNWITH=$RUNWITH EXCERTS=$EXCERTS +RANDOM=$PRNG +RANDOM_LIBS=$PRNGLIBS + EOF diff -r bfa3b2ee384c -r e8f20be3e6f8 util-src/Makefile --- a/util-src/Makefile Mon Feb 22 15:24:20 2016 +0100 +++ b/util-src/Makefile Mon Feb 22 18:46:59 2016 +0100 @@ -8,6 +8,10 @@ ALL=encodings.so hashes.so net.so pposix.so signal.so table.so ringbuffer.so +ifdef RANDOM +ALL+=crand.so +endif + .PHONY: all install clean .SUFFIXES: .c .o .so @@ -17,11 +21,14 @@ $(INSTALL_DATA) $^ $(TARGET) clean: - rm -f $(ALL) + rm -f $(ALL) $(patsubst %.so,%.o,$(ALL)) encodings.so: LDLIBS+=$(IDNA_LIBS) hashes.so: LDLIBS+=$(OPENSSL_LIBS) +crand.o: CFLAGS+=-DWITH_$(RANDOM) +crand.so: LDLIBS+=$(RANDOM_LIBS) + %.so: %.o $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) diff -r bfa3b2ee384c -r e8f20be3e6f8 util-src/crand.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-src/crand.c Mon Feb 22 18:46:59 2016 +0100 @@ -0,0 +1,156 @@ +/* Prosody IM +-- Copyright (C) 2008-2016 Matthew Wild +-- Copyright (C) 2008-2016 Waqas Hussain +-- Copyright (C) 2016 Kim Alvefur +-- +-- This project is MIT/X11 licensed. Please see the +-- COPYING file in the source package for more information. +-- +*/ + +/* +* crand.c +* C PRNG interface +*/ + +#include "lualib.h" +#include "lauxlib.h" + +#include +#include + +/* + * TODO: Decide on fixed size or dynamically allocated buffer + */ +#if 1 +#include +#else +#define BUFLEN 256 +#endif + +#if defined(WITH_GETRANDOM) +#include +#include +#include + +#ifndef SYS_getrandom +#error getrandom() requires Linux 3.17 or later +#endif + +/* Was this not supposed to be a function? */ +int getrandom(char *buf, size_t len, int flags) { + return syscall(SYS_getrandom, buf, len, flags); +} + +#elif defined(WITH_ARC4RANDOM) +#include +#elif defined(WITH_OPENSSL) +#include +#else +#error util.crand compiled without a random source +#endif + +int Lrandom(lua_State *L) { +#ifdef BUFLEN + unsigned char buf[BUFLEN]; +#else + unsigned char *buf; +#endif + int ret = 0; + size_t len = (size_t)luaL_checkint(L, 1); +#ifdef BUFLEN + len = len > BUFLEN ? BUFLEN : len; +#else + buf = malloc(len); + + if(buf == NULL) { + lua_pushnil(L); + lua_pushstring(L, "out of memory"); + /* or it migth be better to + * return lua_error(L); + */ + return 2; + } +#endif + +#if defined(WITH_GETRANDOM) + ret = getrandom(buf, len, 0); + + if(ret < 0) { +#ifndef BUFLEN + free(buf); +#endif + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return 3; + } + +#elif defined(WITH_ARC4RANDOM) + arc4random_buf(buf, len); + ret = len; +#elif defined(WITH_OPENSSL) + ret = RAND_bytes(buf, len); + + if(ret == 1) { + ret = len; + } else { +#ifndef BUFLEN + free(buf); +#endif + lua_pushnil(L); + lua_pushstring(L, "failed"); + /* lua_pushinteger(L, ERR_get_error()); */ + return 2; + } + +#endif + + lua_pushlstring(L, buf, ret); +#ifndef BUFLEN + free(buf); +#endif + return 1; +} + +#ifdef ENABLE_SEEDING +int Lseed(lua_State *L) { + size_t len; + const char *seed = lua_tolstring(L, 1, &len); + +#if defined(WITH_OPENSSL) + RAND_add(seed, len, len); + return 0; +#else + lua_pushnil(L); + lua_pushliteral(L, "not-supported"); + return 2; +#endif +} +#endif + +int luaopen_util_crand(lua_State *L) { + lua_newtable(L); + lua_pushcfunction(L, Lrandom); + lua_setfield(L, -2, "bytes"); +#ifdef ENABLE_SEEDING + lua_pushcfunction(L, Lseed); + lua_setfield(L, -2, "seed"); +#endif + +#if defined(WITH_GETRANDOM) + lua_pushstring(L, "Linux"); +#elif defined(WITH_ARC4RANDOM) + lua_pushstring(L, "arc4random()"); +#elif defined(WITH_OPENSSL) + lua_pushstring(L, "OpenSSL"); +#endif + lua_setfield(L, -2, "_source"); + +#if defined(WITH_OPENSSL) && defined(_WIN32) + /* Do we need to seed this on Windows? */ +#endif + + return 1; +} + diff -r bfa3b2ee384c -r e8f20be3e6f8 util/debug.lua --- a/util/debug.lua Mon Feb 22 15:24:20 2016 +0100 +++ b/util/debug.lua Mon Feb 22 18:46:59 2016 +0100 @@ -1,6 +1,9 @@ -- Variables ending with these names will not -- have their values printed ('password' includes -- 'new_password', etc.) +-- +-- luacheck: ignore 122/debug + local censored_names = { password = true; passwd = true; diff -r bfa3b2ee384c -r e8f20be3e6f8 util/import.lua --- a/util/import.lua Mon Feb 22 15:24:20 2016 +0100 +++ b/util/import.lua Mon Feb 22 18:46:59 2016 +0100 @@ -8,6 +8,7 @@ +local unpack = table.unpack or unpack; --luacheck: ignore 113 local t_insert = table.insert; function import(module, ...) local m = package.loaded[module] or require(module); diff -r bfa3b2ee384c -r e8f20be3e6f8 util/iterators.lua --- a/util/iterators.lua Mon Feb 22 15:24:20 2016 +0100 +++ b/util/iterators.lua Mon Feb 22 18:46:59 2016 +0100 @@ -11,8 +11,9 @@ local it = {}; local t_insert = table.insert; -local select, unpack, next = select, unpack, next; -local function pack(...) return { n = select("#", ...), ... }; end +local select, next = select, next; +local unpack = table.unpack or unpack; --luacheck: ignore 113 +local pack = table.pack or function (...) return { n = select("#", ...), ... }; end -- Reverse an iterator function it.reverse(f, s, var) diff -r bfa3b2ee384c -r e8f20be3e6f8 util/multitable.lua --- a/util/multitable.lua Mon Feb 22 15:24:20 2016 +0100 +++ b/util/multitable.lua Mon Feb 22 18:46:59 2016 +0100 @@ -8,7 +8,8 @@ local select = select; local t_insert = table.insert; -local unpack, pairs, next, type = unpack, pairs, next, type; +local pairs, next, type = pairs, next, type; +local unpack = table.unpack or unpack; --luacheck: ignore 113 local _ENV = nil; diff -r bfa3b2ee384c -r e8f20be3e6f8 util/random.lua --- a/util/random.lua Mon Feb 22 15:24:20 2016 +0100 +++ b/util/random.lua Mon Feb 22 18:46:59 2016 +0100 @@ -6,6 +6,9 @@ -- COPYING file in the source package for more information. -- +local ok, crand = pcall(require, "util.crand"); +if ok then return crand; end + local urandom, urandom_err = io.open("/dev/urandom", "r"); local function seed() diff -r bfa3b2ee384c -r e8f20be3e6f8 util/session.lua --- a/util/session.lua Mon Feb 22 15:24:20 2016 +0100 +++ b/util/session.lua Mon Feb 22 18:46:59 2016 +0100 @@ -9,13 +9,13 @@ end local function set_id(session) - local id = typ .. tostring(session):match("%x+$"):lower(); + local id = session.type .. tostring(session):match("%x+$"):lower(); session.id = id; return session; end local function set_logger(session) - local log = logger.init(id); + local log = logger.init(session.id); session.log = log; return session; end @@ -30,7 +30,7 @@ local conn = session.conn; if not conn then function session.send(data) - log("debug", "Discarding data sent to unconnected session: %s", tostring(data)); + session.log("debug", "Discarding data sent to unconnected session: %s", tostring(data)); return false; end return session; diff -r bfa3b2ee384c -r e8f20be3e6f8 util/sql.lua --- a/util/sql.lua Mon Feb 22 15:24:20 2016 +0100 +++ b/util/sql.lua Mon Feb 22 18:46:59 2016 +0100 @@ -1,6 +1,6 @@ local setmetatable, getmetatable = setmetatable, getmetatable; -local ipairs, unpack, select = ipairs, unpack, select; +local ipairs, unpack, select = ipairs, table.unpack or unpack, select; --luacheck: ignore 113 local tonumber, tostring = tonumber, tostring; local assert, xpcall, debug_traceback = assert, xpcall, debug.traceback; local t_concat = table.concat;