mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-03-01 02:38:05 +01:00
commit 55ba289bed
9 changed files with 90 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/mod_admin_telnet.lua
View file

@ -1167,6 +1167,12 @@ function def_env.http:list()
return true;
end
module:hook("server-stopping", function(event)
for conn, session in pairs(sessions) do
session.print("Shutting down: "..(event.reason or "unknown reason"));
end
end);
-------------
function printbanner(session)

5
plugins/mod_register.lua
View file

@ -21,6 +21,7 @@ local new_cache = require "util.cache".new;
local compat = module:get_option_boolean("registration_compat", true);
local allow_registration = module:get_option_boolean("allow_registration", false);
local additional_fields = module:get_option("additional_registration_fields", {});
local require_encryption = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
local account_details = module:open_store("account_details");
@ -83,7 +84,7 @@ module:hook("stream-features", function(event)
local session, features = event.origin, event.features;
-- Advertise registration to unauthorized clients only.
if not(allow_registration) or session.type ~= "c2s_unauthed" then
if not(allow_registration) or session.type ~= "c2s_unauthed" or (require_encryption and not session.secure) then
return
end
@ -213,6 +214,8 @@ module:hook("stanza/iq/jabber:iq:register:query", function(event)
if not(allow_registration) or session.type ~= "c2s_unauthed" then
log("debug", "Attempted registration when disabled or already authenticated");
session.send(st.error_reply(stanza, "cancel", "service-unavailable"));
elseif require_encryption and not session.secure then
session.send(st.error_reply(stanza, "modify", "policy-violation", "Encryption is required"));
else
local query = stanza.tags[1];
if stanza.attr.type == "get" then

2
plugins/mod_tls.lua
View file

@ -63,7 +63,9 @@ end
local function can_do_tls(session)
if not session.conn.starttls then
if not session.secure then
session.log("debug", "Underlying connection does not support STARTTLS");
end
return false;
elseif session.ssl_ctx ~= nil then
return session.ssl_ctx;

2
plugins/mod_websocket.lua
View file

@ -136,6 +136,8 @@ function handle_request(event)
local request, response = event.request, event.response;
local conn = response.conn;
conn.starttls = false; -- Prevent mod_tls from believing starttls can be done
if not request.headers.sec_websocket_key then
response.headers.content_type = "text/html";
return [[<!DOCTYPE html><html><head><title>Websocket</title></head><body>

2
prosodyctl
View file

@ -621,6 +621,8 @@ function commands.reload(arg)
end
-- ejabberdctl compatibility
local unpack = table.unpack or unpack; -- luacheck: ignore 113
function commands.register(arg)
local user, host, password = unpack(arg);
if (not (user and host)) or arg[1] == "--help" then

5
tests/util/logger.lua
View file

@ -14,7 +14,8 @@ local tostring = tostring;
local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
local do_pretty_printing = not os.getenv("WINDIR");
module "logger"
local _ENV = nil
local _M = {}
local logstyles = {};
@ -25,7 +26,7 @@ if do_pretty_printing then
logstyles["error"] = getstyle("bold", "red");
end
function init(name)
function _M.init(name)
--name = nil; -- While this line is not commented, will automatically fill in file/line number info
return function (level, message, ...)
if level == "debug" or level == "info" then return; end

10
util-src/crand.c
View file

@ -67,6 +67,11 @@ int Lrandom(lua_State *L) {
arc4random_buf(buf, len);
ret = len;
#elif defined(WITH_OPENSSL)
if(!RAND_status()) {
lua_pushliteral(L, "OpenSSL PRNG not seeded");
return lua_error(L);
}
ret = RAND_bytes(buf, len);
if(ret == 1) {
@ -87,6 +92,7 @@ int luaopen_util_crand(lua_State *L) {
#if (LUA_VERSION_NUM > 501)
luaL_checkversion(L);
#endif
lua_newtable(L);
lua_pushcfunction(L, Lrandom);
lua_setfield(L, -2, "bytes");
@ -100,10 +106,6 @@ int luaopen_util_crand(lua_State *L) {
#endif
lua_setfield(L, -2, "_source");
#if defined(WITH_OPENSSL) && defined(_WIN32)
/* TODO Do we need to seed this on Windows? */
#endif
return 1;
}

2
util-src/pposix.c
View file

@ -615,7 +615,7 @@ int lc_getrlimit(lua_State *L) {
return 2;
}
} else {
/* Unsupported resoucrce. Sorry I'm pretty limited by POSIX standard. */
/* Unsupported resource. Sorry I'm pretty limited by POSIX standard. */
lua_pushboolean(L, 0);
lua_pushstring(L, "invalid-resource");
return 2;

2
util/adhoc.lua
View file

@ -22,7 +22,7 @@ local function new_initial_data_form(form, initial_data, result_handler)
return result_handler(fields, err, data);
else
return { status = "executing", actions = {"next", "complete", default = "complete"},
form = { layout = form, values = initial_data() } }, "executing";
form = { layout = form, values = initial_data(data) } }, "executing";
end
end
end