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

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2019-07-08 02:44:32 +02:00
commit f2b49140d8
108 changed files with 3594 additions and 1343 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.busted
View file

@ -2,7 +2,7 @@ return {
_all = {
},
default = {
["exclude-tags"] = "mod_bosh,storage";
["exclude-tags"] = "mod_bosh,storage,SLOW";
};
bosh = {
tags = "mod_bosh";

70
.luacheckrc
View file

@ -1,7 +1,8 @@
cache = true
codes = true
ignore = { "411/err", "421/err", "411/ok", "421/ok", "211/_ENV", "431/log", "143/table", "113/unpack" }
ignore = { "411/err", "421/err", "411/ok", "421/ok", "211/_ENV", "431/log", }
std = "lua53c"
max_line_length = 150
read_globals = {
@ -33,7 +34,6 @@ files["plugins/"] = {
"module.name",
"module.host",
"module._log",
"module.log",
"module.event_handlers",
"module.reloading",
"module.saved_state",
@ -64,12 +64,15 @@ files["plugins/"] = {
"module.get_option_scalar",
"module.get_option_set",
"module.get_option_string",
"module.get_status",
"module.handle_items",
"module.hook",
"module.hook_global",
"module.hook_object_event",
"module.hook_tag",
"module.load_resource",
"module.log",
"module.log_status",
"module.measure",
"module.measure_event",
"module.measure_global_event",
@ -79,7 +82,9 @@ files["plugins/"] = {
"module.remove_item",
"module.require",
"module.send",
"module.send_iq",
"module.set_global",
"module.set_status",
"module.shared",
"module.unhook",
"module.unhook_object_event",
@ -126,43 +131,42 @@ if os.getenv("PROSODY_STRICT_LINT") ~= "1" then
unused_secondaries = false
local exclude_files = {
"doc/net.server.lua";
"doc/net.server.lua";
"fallbacks/bit.lua";
"fallbacks/lxp.lua";
"fallbacks/bit.lua";
"fallbacks/lxp.lua";
"net/adns.lua";
"net/cqueues.lua";
"net/dns.lua";
"net/server_select.lua";
"net/cqueues.lua";
"net/dns.lua";
"net/server_select.lua";
"plugins/mod_storage_sql1.lua";
"plugins/mod_storage_sql1.lua";
"spec/core_configmanager_spec.lua";
"spec/core_moduleapi_spec.lua";
"spec/net_http_parser_spec.lua";
"spec/util_events_spec.lua";
"spec/util_http_spec.lua";
"spec/util_ip_spec.lua";
"spec/util_multitable_spec.lua";
"spec/util_rfc6724_spec.lua";
"spec/util_throttle_spec.lua";
"spec/util_xmppstream_spec.lua";
"spec/core_configmanager_spec.lua";
"spec/core_moduleapi_spec.lua";
"spec/net_http_parser_spec.lua";
"spec/util_events_spec.lua";
"spec/util_http_spec.lua";
"spec/util_ip_spec.lua";
"spec/util_multitable_spec.lua";
"spec/util_rfc6724_spec.lua";
"spec/util_throttle_spec.lua";
"spec/util_xmppstream_spec.lua";
"tools/ejabberd2prosody.lua";
"tools/ejabberdsql2prosody.lua";
"tools/erlparse.lua";
"tools/jabberd14sql2prosody.lua";
"tools/migration/migrator.cfg.lua";
"tools/migration/migrator/jabberd14.lua";
"tools/migration/migrator/mtools.lua";
"tools/migration/migrator/prosody_files.lua";
"tools/migration/migrator/prosody_sql.lua";
"tools/migration/prosody-migrator.lua";
"tools/openfire2prosody.lua";
"tools/xep227toprosody.lua";
"tools/ejabberd2prosody.lua";
"tools/ejabberdsql2prosody.lua";
"tools/erlparse.lua";
"tools/jabberd14sql2prosody.lua";
"tools/migration/migrator.cfg.lua";
"tools/migration/migrator/jabberd14.lua";
"tools/migration/migrator/mtools.lua";
"tools/migration/migrator/prosody_files.lua";
"tools/migration/migrator/prosody_sql.lua";
"tools/migration/prosody-migrator.lua";
"tools/openfire2prosody.lua";
"tools/xep227toprosody.lua";
"util/sasl/digest-md5.lua";
"util/sasl/digest-md5.lua";
}
for _, file in ipairs(exclude_files) do
files[file] = { only = {} }

12
CHANGES
View file

@ -1,3 +1,15 @@
TRUNK
=====
- Module statuses
- SNI support (not completely finished)
- CORS handling now provided by mod\_http
- CSI improvements
- mod\_limits: Exempted JIDs
- Archive quotas
- mod\_mimicking
- Rewritten migrator
0.11.0
======

9
CONTRIBUTING Normal file
View file

@ -0,0 +1,9 @@
Thanks for your interest in contributing to the project!
There are many ways to contribute, such as helping improve the
documentation, reporting bugs, spreading the word or testing the latest
development version.
You can find more information on how to contribute at <https://prosody.im/doc/contributing>
See also the HACKERS and README files.

7
GNUmakefile
View file

@ -21,6 +21,7 @@ MKDIR_PRIVATE=$(MKDIR) -m750
LUACHECK=luacheck
BUSTED=busted
SCANSION=scansion
.PHONY: all test coverage clean install
@ -71,6 +72,12 @@ clean:
test:
$(BUSTED) --lua=$(RUNWITH)
integration-test: all
$(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua start
$(SCANSION) -d ./spec/scansion; R=$$? \
$(RUNWITH) prosodyctl --config ./spec/scansion/prosody.cfg.lua stop \
exit $$R
coverage:
-rm -- luacov.*
$(BUSTED) --lua=$(RUNWITH) -c

2
HACKERS
View file

@ -5,7 +5,7 @@ involved you can join us on our mailing list and discussion rooms. More
information on these at https://prosody.im/discuss
Patches are welcome, though before sending we would appreciate if you read
docs/coding_style.txt for guidelines on how to format your code, and other tips.
docs/coding_style.md for guidelines on how to format your code, and other tips.
Documentation for developers can be found at https://prosody.im/doc/developers

4
README
View file

@ -12,6 +12,7 @@ rapidly prototype new protocols.
Homepage: https://prosody.im/
Download: https://prosody.im/download
Documentation: https://prosody.im/doc/
Issue tracker: https://issues.prosody.im/
Jabber/XMPP Chat:
Address:
@ -26,9 +27,6 @@ Mailing lists:
Development discussion:
https://groups.google.com/group/prosody-dev
Issue tracker changes:
https://groups.google.com/group/prosody-issues
## Installation
See the accompanying INSTALL file for help on building Prosody from source. Alternatively

1
TODO
View file

@ -1,5 +1,4 @@
== 1.0 ==
- Roster providers
- Statistics
- Clustering
- World domination

187
configure vendored
View file

@ -23,7 +23,8 @@ EXCERTS="yes"
PRNG=
PRNGLIBS=
CFLAGS="-fPIC -Wall -pedantic -std=c99"
CFLAGS="-fPIC -std=c99"
CFLAGS="$CFLAGS -Wall -pedantic -Wextra -Wshadow -Wformat=2"
LDFLAGS="-shared"
IDN_LIBRARY="idn"
@ -152,74 +153,8 @@ do
SYSCONFDIR_SET=yes
;;
--ostype)
# TODO make this a switch?
OSPRESET="$value"
if [ "$OSPRESET" = "debian" ]; then
if [ "$LUA_SUFFIX_SET" != "yes" ]; then
LUA_SUFFIX="5.1";
LUA_SUFFIX_SET=yes
fi
if [ "$RUNWITH_SET" != "yes" ]; then
RUNWITH="lua$LUA_SUFFIX";
RUNWITH_SET=yes
fi
LUA_INCDIR="/usr/include/lua$LUA_SUFFIX"
LUA_INCDIR_SET=yes
CFLAGS="$CFLAGS -ggdb"
fi
if [ "$OSPRESET" = "macosx" ]; then
LUA_INCDIR=/usr/local/include;
LUA_INCDIR_SET=yes
LUA_LIBDIR=/usr/local/lib
LUA_LIBDIR_SET=yes
CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
LDFLAGS="-bundle -undefined dynamic_lookup"
fi
if [ "$OSPRESET" = "linux" ]; then
LUA_INCDIR=/usr/local/include;
LUA_INCDIR_SET=yes
LUA_LIBDIR=/usr/local/lib
LUA_LIBDIR_SET=yes
CFLAGS="$CFLAGS -ggdb"
fi
if [ "$OSPRESET" = "freebsd" ] || [ "$OSPRESET" = "openbsd" ]; then
LUA_INCDIR="/usr/local/include/lua51"
LUA_INCDIR_SET=yes
CFLAGS="-Wall -fPIC -I/usr/local/include"
LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared"
LUA_SUFFIX="51"
LUA_SUFFIX_SET=yes
LUA_DIR=/usr/local
LUA_DIR_SET=yes
CC=cc
LD=ld
fi
if [ "$OSPRESET" = "openbsd" ]; then
LUA_INCDIR="/usr/local/include";
LUA_INCDIR_SET="yes"
fi
if [ "$OSPRESET" = "netbsd" ]; then
LUA_INCDIR="/usr/pkg/include/lua-5.1"
LUA_INCDIR_SET=yes
LUA_LIBDIR="/usr/pkg/lib/lua/5.1"
LUA_LIBDIR_SET=yes
CFLAGS="-Wall -fPIC -I/usr/pkg/include"
LDFLAGS="-L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib -shared"
fi
if [ "$OSPRESET" = "pkg-config" ]; then
if [ "$LUA_SUFFIX_SET" != "yes" ]; then
LUA_SUFFIX="5.1";
LUA_SUFFIX_SET=yes
fi
LUA_CF="$(pkg-config --cflags-only-I lua$LUA_SUFFIX)"
LUA_CF="${LUA_CF#*-I}"
LUA_CF="${LUA_CF%% *}"
if [ "$LUA_CF" != "" ]; then
LUA_INCDIR="$LUA_CF"
LUA_INCDIR_SET=yes
fi
CFLAGS="$CFLAGS"
fi
OSPRESET_SET="yes"
;;
--libdir)
LIBDIR="$value"
@ -237,7 +172,7 @@ do
--lua-version|--with-lua-version)
[ -n "$value" ] || die "Missing value in flag $key."
LUA_VERSION="$value"
[ "$LUA_VERSION" = "5.1" ] || [ "$LUA_VERSION" = "5.2" ] || [ "$LUA_VERSION" = "5.3" ] || die "Invalid Lua version in flag $key."
[ "$LUA_VERSION" = "5.1" ] || [ "$LUA_VERSION" = "5.2" ] || [ "$LUA_VERSION" = "5.3" ] || [ "$LUA_VERSION" = "5.4" ] || die "Invalid Lua version in flag $key."
LUA_VERSION_SET=yes
;;
--with-lua)
@ -318,6 +253,66 @@ do
shift
done
if [ "$OSPRESET_SET" = "yes" ]; then
# TODO make this a switch?
if [ "$OSPRESET" = "debian" ]; then
CFLAGS="$CFLAGS -ggdb"
fi
if [ "$OSPRESET" = "macosx" ]; then
if [ "$LUA_INCDIR_SET" != "yes" ]; then
LUA_INCDIR=/usr/local/include;
LUA_INCDIR_SET=yes
fi
if [ "$LUA_LIBDIR_SET" != "yes" ]; then
LUA_LIBDIR=/usr/local/lib
LUA_LIBDIR_SET=yes
fi
CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
LDFLAGS="-bundle -undefined dynamic_lookup"
fi
if [ "$OSPRESET" = "linux" ]; then
CFLAGS="$CFLAGS -ggdb"
fi
if [ "$OSPRESET" = "freebsd" ] || [ "$OSPRESET" = "openbsd" ]; then
LUA_INCDIR="/usr/local/include/lua51"
LUA_INCDIR_SET=yes
CFLAGS="-Wall -fPIC -I/usr/local/include"
LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared"
LUA_SUFFIX="51"
LUA_SUFFIX_SET=yes
LUA_DIR=/usr/local
LUA_DIR_SET=yes
CC=cc
LD=ld
fi
if [ "$OSPRESET" = "openbsd" ]; then
LUA_INCDIR="/usr/local/include";
LUA_INCDIR_SET="yes"
fi
if [ "$OSPRESET" = "netbsd" ]; then
LUA_INCDIR="/usr/pkg/include/lua-5.1"
LUA_INCDIR_SET=yes
LUA_LIBDIR="/usr/pkg/lib/lua/5.1"
LUA_LIBDIR_SET=yes
CFLAGS="-Wall -fPIC -I/usr/pkg/include"
LDFLAGS="-L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib -shared"
fi
if [ "$OSPRESET" = "pkg-config" ]; then
if [ "$LUA_SUFFIX_SET" != "yes" ]; then
LUA_SUFFIX="5.1";
LUA_SUFFIX_SET=yes
fi
LUA_CF="$(pkg-config --cflags-only-I lua$LUA_SUFFIX)"
LUA_CF="${LUA_CF#*-I}"
LUA_CF="${LUA_CF%% *}"
if [ "$LUA_CF" != "" ]; then
LUA_INCDIR="$LUA_CF"
LUA_INCDIR_SET=yes
fi
CFLAGS="$CFLAGS"
fi
fi
if [ "$PREFIX_SET" = "yes" ] && [ ! "$SYSCONFDIR_SET" = "yes" ]
then
if [ "$PREFIX" = "/usr" ]
@ -340,7 +335,7 @@ then
fi
detect_lua_version() {
detected_lua=$("$1" -e 'print(_VERSION:match(" (5%.[123])$"))' 2> /dev/null)
detected_lua=$("$1" -e 'print(_VERSION:match(" (5%.[1234])$"))' 2> /dev/null)
if [ "$detected_lua" != "nil" ]
then
if [ "$LUA_VERSION_SET" != "yes" ]
@ -403,8 +398,14 @@ then
elif [ "$LUA_VERSION_SET" = "yes" ] && [ "$LUA_VERSION" = "5.3" ]
then
suffixes="5.3 53 -5.3 -53"
elif [ "$LUA_VERSION_SET" = "yes" ] && [ "$LUA_VERSION" = "5.4" ]
then
suffixes="5.4 54 -5.4 -54"
else
suffixes="5.1 51 -5.1 -51 5.2 52 -5.2 -52 5.3 53 -5.3 -53"
suffixes="5.1 51 -5.1 -51"
suffixes="$suffixes 5.2 52 -5.2 -52"
suffixes="$suffixes 5.3 53 -5.3 -53"
suffixes="$suffixes 5.4 54 -5.4 -54"
fi
for suffix in "" $suffixes
do
@ -464,30 +465,46 @@ then
LUA_LIBDIR="$LUA_DIR/lib"
fi
echo_n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"
echo_n "Looking for lua.h at $lua_h..."
if [ -f "$lua_h" ]
then
echo "lua.h found in $lua_h"
echo found
else
v_dir="$LUA_INCDIR/lua/$LUA_VERSION"
lua_h="$v_dir/lua.h"
if [ -f "$lua_h" ]
then
echo "lua.h found in $lua_h"
echo "not found"
for postfix in "$LUA_VERSION" "$LUA_SUFFIX"; do
if ! [ "$postfix" = "" ]; then
v_dir="$LUA_INCDIR/lua/$postfix";
else
v_dir="$LUA_INCDIR/lua";
fi
lua_h="$v_dir/lua.h"
echo_n "Looking for lua.h at $lua_h..."
if [ -f "$lua_h" ]
then
LUA_INCDIR="$v_dir"
else
d_dir="$LUA_INCDIR/lua$LUA_VERSION"
echo found
break;
else
echo "not found"
d_dir="$LUA_INCDIR/lua$postfix"
lua_h="$d_dir/lua.h"
echo_n "Looking for lua.h at $lua_h..."
if [ -f "$lua_h" ]
then
echo "lua.h found in $lua_h (Debian/Ubuntu)"
LUA_INCDIR="$d_dir"
echo found
LUA_INCDIR="$d_dir"
break;
else
echo "lua.h not found (looked in $LUA_INCDIR, $v_dir, $d_dir)"
die "You may want to use the flag --with-lua or --with-lua-include. See --help."
echo "not found"
fi
fi
fi
done
if [ ! -f "$lua_h" ]; then
echo "lua.h not found."
echo
die "You may want to use the flag --with-lua or --with-lua-include. See --help."
fi
fi
if [ "$lua_interp_found" = "yes" ]

2
core/certmanager.lua
View file

@ -106,7 +106,7 @@ local core_defaults = {
capath = "/etc/ssl/certs";
depth = 9;
protocol = "tlsv1+";
verify = (ssl_x509 and { "peer", "client_once", }) or "none";
verify = "none";
options = {
cipher_server_preference = luasec_has.options.cipher_server_preference;
no_ticket = luasec_has.options.no_ticket;

30
core/configmanager.lua
View file

@ -7,15 +7,16 @@
--
local _G = _G;
local setmetatable, rawget, rawset, io, os, error, dofile, type, pairs =
setmetatable, rawget, rawset, io, os, error, dofile, type, pairs;
local format, math_max = string.format, math.max;
local setmetatable, rawget, rawset, io, os, error, dofile, type, pairs, ipairs =
setmetatable, rawget, rawset, io, os, error, dofile, type, pairs, ipairs;
local format, math_max, t_insert = string.format, math.max, table.insert;
local envload = require"util.envload".envload;
local deps = require"util.dependencies";
local resolve_relative_path = require"util.paths".resolve_relative_path;
local glob_to_pattern = require"util.paths".glob_to_pattern;
local path_sep = package.config:sub(1,1);
local get_traceback_table = require "util.debug".get_traceback_table;
local encodings = deps.softreq"util.encodings";
local nameprep = encodings and encodings.stringprep.nameprep or function (host) return host:lower(); end
@ -100,8 +101,18 @@ end
-- Built-in Lua parser
do
local pcall = _G.pcall;
local function get_line_number(config_file)
local tb = get_traceback_table(nil, 2);
for i = 1, #tb do
if tb[i].info.short_src == config_file then
return tb[i].info.currentline;
end
end
end
parser = {};
function parser.load(data, config_file, config_table)
local set_options = {}; -- set_options[host.."/"..option_name] = true (when the option has been set already in this file)
local warnings = {};
local env;
-- The ' = true' are needed so as not to set off __newindex when we assign the functions below
env = setmetatable({
@ -115,6 +126,12 @@ do
return rawget(_G, k);
end,
__newindex = function (_, k, v)
local host = env.__currenthost or "*";
local option_path = host.."/"..k;
if set_options[option_path] then
t_insert(warnings, ("%s:%d: Duplicate option '%s'"):format(config_file, get_line_number(config_file), k));
end
set_options[option_path] = true;
set(config_table, env.__currenthost or "*", k, v);
end
});
@ -195,6 +212,11 @@ do
if f then
local ret, err = parser.load(f:read("*a"), file, config_table);
if not ret then error(err:gsub("%[string.-%]", file), 0); end
if err then
for _, warning in ipairs(err) do
t_insert(warnings, warning);
end
end
end
if not f then error("Error loading included "..file..": "..err, 0); end
return f, err;
@ -217,7 +239,7 @@ do
return nil, err;
end
return true;
return true, warnings;
end
end

19
core/loggingmanager.lua
View file

@ -18,6 +18,9 @@ local getstyle, getstring = require "util.termcolours".getstyle, require "util.t
local config = require "core.configmanager";
local logger = require "util.logger";
local have_pposix, pposix = pcall(require, "util.pposix");
have_pposix = have_pposix and pposix._VERSION == "0.4.0";
local _ENV = nil;
-- luacheck: std none
@ -232,6 +235,22 @@ local function log_to_console(sink_config)
end
log_sink_types.console = log_to_console;
if have_pposix then
local syslog_opened;
local function log_to_syslog(sink_config) -- luacheck: ignore 212/sink_config
if not syslog_opened then
local facility = sink_config.syslog_facility or config.get("*", "syslog_facility");
pposix.syslog_open(sink_config.syslog_name or "prosody", facility);
syslog_opened = true;
end
local syslog = pposix.syslog_log;
return function (name, level, message, ...)
syslog(level, name, format(message, ...));
end;
end
log_sink_types.syslog = log_to_syslog;
end
local function register_sink_type(name, sink_maker)
local old_sink_maker = log_sink_types[name];
log_sink_types[name] = sink_maker;

113
core/moduleapi.lua
View file

@ -14,13 +14,18 @@ local pluginloader = require "util.pluginloader";
local timer = require "util.timer";
local resolve_relative_path = require"util.paths".resolve_relative_path;
local st = require "util.stanza";
local cache = require "util.cache";
local errutil = require "util.error";
local promise = require "util.promise";
local time_now = require "util.time".now;
local format = require "util.format".format;
local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
local error, setmetatable, type = error, setmetatable, type;
local ipairs, pairs, select = ipairs, pairs, select;
local tonumber, tostring = tonumber, tostring;
local require = require;
local pack = table.pack or function(...) return {n=select("#",...), ...}; end -- table.pack is only in 5.2
local pack = table.pack or require "util.table".pack; -- table.pack is only in 5.2
local unpack = table.unpack or unpack; --luacheck: ignore 113 -- renamed in 5.2
local prosody = prosody;
@ -361,6 +366,84 @@ function api:send(stanza, origin)
return core_post_stanza(origin or hosts[self.host], stanza);
end
function api:send_iq(stanza, origin, timeout)
local iq_cache = self._iq_cache;
if not iq_cache then
iq_cache = cache.new(256, function (_, iq)
iq.reject(errutil.new({
type = "wait", condition = "resource-constraint",
text = "evicted from iq tracking cache"
}));
self:unhook(iq.result_event, iq.result_handler);
self:unhook(iq.error_event, iq.error_handler);
end);
self._iq_cache = iq_cache;
end
return promise.new(function (resolve, reject)
local event_type;
if stanza.attr.from == self.host then
event_type = "host";
else -- assume bare since we can't hook full jids
event_type = "bare";
end
local result_event = "iq-result/"..event_type.."/"..stanza.attr.id;
local error_event = "iq-error/"..event_type.."/"..stanza.attr.id;
local cache_key = event_type.."/"..stanza.attr.id;
local function result_handler(event)
if event.stanza.attr.from == stanza.attr.to then
resolve(event);
return true;
end
end
local function error_handler(event)
if event.stanza.attr.from == stanza.attr.to then
reject(errutil.from_stanza(event.stanza), event);
return true;
end
end
if iq_cache:get(cache_key) then
reject(errutil.new({
type = "modify", condition = "conflict",
text = "iq stanza id attribute already used",
}));
return;
end
self:hook(result_event, result_handler);
self:hook(error_event, error_handler);
local timeout_handle = self:add_timer(timeout or 120, function ()
reject(errutil.new({
type = "wait", condition = "remote-server-timeout",
text = "IQ stanza timed out",
}));
self:unhook(result_event, result_handler);
self:unhook(error_event, error_handler);
iq_cache:set(cache_key, nil);
end);
local ok = iq_cache:set(cache_key, {
reject = reject, resolve = resolve,
timeout_handle = timeout_handle,
result_event = result_event, error_event = error_event,
result_handler = result_handler, error_handler = error_handler;
});
if not ok then
reject(errutil.new({
type = "wait", condition = "internal-server-error",
text = "Could not store IQ tracking data"
}));
return;
end
self:send(stanza, origin);
end);
end
function api:broadcast(jids, stanza, iter)
for jid in (iter or it.values)(jids) do
local new_stanza = st.clone(stanza);
@ -432,4 +515,32 @@ function api:measure_global_event(event_name, stat_name)
return self:measure_object_event(prosody.events.wrappers, event_name, stat_name);
end
local status_priorities = { error = 3, warn = 2, info = 1, core = 0 };
function api:set_status(status_type, status_message, override)
local priority = status_priorities[status_type];
if not priority then
self:log("error", "set_status: Invalid status type '%s', assuming 'info'");
status_type, priority = "info", status_priorities.info;
end
local current_priority = status_priorities[self.status_type] or 0;
-- By default an 'error' status can only be overwritten by another 'error' status
if (current_priority >= status_priorities.error and priority < current_priority and override ~= true)
or (override == false and current_priority > priority) then
self:log("debug", "moduleapi: ignoring status [prio %d override %s]: %s", priority, override, status_message);
return;
end
self.status_type, self.status_message, self.status_time = status_type, status_message, time_now();
self:fire_event("module-status/updated", { name = self.name });
end
function api:log_status(level, msg, ...)
self:set_status(level, format(msg, ...));
return self:log(level, msg, ...);
end
function api:get_status()
return self.status_type, self.status_message, self.status_time;
end
return api;

5
core/modulemanager.lua
View file

@ -169,6 +169,7 @@ local function do_load_module(host, module_name, state)
local mod, err = pluginloader.load_code(module_name, nil, pluginenv);
if not mod then
log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil");
api_instance:set_status("error", "Failed to load (see log)");
return nil, err;
end
@ -182,6 +183,7 @@ local function do_load_module(host, module_name, state)
ok, err = call_module_method(pluginenv, "load");
if not ok then
log("warn", "Error loading module '%s' on '%s': %s", module_name, host, err or "nil");
api_instance:set_status("warn", "Error during load (see log)");
end
end
api_instance.reloading, api_instance.saved_state = nil, nil;
@ -204,6 +206,9 @@ local function do_load_module(host, module_name, state)
if not ok then
modulemap[api_instance.host][module_name] = nil;
log("error", "Error initializing module '%s' on '%s': %s", module_name, host, err or "nil");
api_instance:set_status("warn", "Error during load (see log)");
else
api_instance:set_status("core", "Loaded", false);
end
return ok and pluginenv, err;
end

54
core/portmanager.lua
View file

@ -10,6 +10,7 @@ local set = require "util.set";
local table = table;
local setmetatable, rawset, rawget = setmetatable, rawset, rawget;
local type, tonumber, tostring, ipairs = type, tonumber, tostring, ipairs;
local pairs = pairs;
local prosody = prosody;
local fire_event = prosody.events.fire_event;
@ -95,7 +96,7 @@ local function activate(service_name)
}
bind_ports = set.new(type(bind_ports) ~= "table" and { bind_ports } or bind_ports );
local mode, ssl = listener.default_mode or default_mode;
local mode = listener.default_mode or default_mode;
local hooked_ports = {};
for interface in bind_interfaces do
@ -107,13 +108,13 @@ local function activate(service_name)
log("error", "Multiple services configured to listen on the same port ([%s]:%d): %s, %s", interface, port,
active_services:search(nil, interface, port)[1][1].service.name or "<unnamed>", service_name or "<unnamed>");
else
local err;
local ssl, cfg, err;
-- Create SSL context for this service/port
if service_info.encryption == "ssl" then
local global_ssl_config = config.get("*", "ssl") or {};
local prefix_ssl_config = config.get("*", config_prefix.."ssl") or global_ssl_config;
log("debug", "Creating context for direct TLS service %s on port %d", service_info.name, port);
ssl, err = certmanager.create_context(service_info.name.." port "..port, "server",
ssl, err, cfg = certmanager.create_context(service_info.name.." port "..port, "server",
prefix_ssl_config[interface],
prefix_ssl_config[port],
prefix_ssl_config,
@ -127,7 +128,12 @@ local function activate(service_name)
end
if not err then
-- Start listening on interface+port
local handler, err = server.addserver(interface, port_number, listener, mode, ssl);
local handler, err = server.listen(interface, port_number, listener, {
read_size = mode,
tls_ctx = ssl,
tls_direct = service_info.encryption == "ssl";
sni_hosts = {},
});
if not handler then
log("error", "Failed to open server port %d on %s, %s", port_number, interface,
error_to_friendly_message(service_name, port_number, err));
@ -137,6 +143,7 @@ local function activate(service_name)
active_services:add(service_name, interface, port_number, {
server = handler;
service = service_info;
tls_cfg = cfg;
});
end
end
@ -222,15 +229,54 @@ end
-- Event handlers
local function add_sni_host(host, service)
-- local global_ssl_config = config.get(host, "ssl") or {};
for name, interface, port, n, active_service --luacheck: ignore 213
in active_services:iter(service, nil, nil, nil) do
if active_service.server.hosts and active_service.tls_cfg then
-- local config_prefix = (active_service.config_prefix or name).."_";
-- if config_prefix == "_" then
-- config_prefix = "";
-- end
-- local prefix_ssl_config = config.get(host, config_prefix.."ssl") or global_ssl_config;
-- FIXME only global 'ssl' settings are mixed in here
-- TODO per host and per service settings should be merged in,
-- without overriding the per-host certificate
local ssl, err, cfg = certmanager.create_context(host, "server");
if ssl then
active_service.server.hosts[host] = ssl;
if not active_service.tls_cfg.certificate then
active_service.server.tls_ctx = ssl;
active_service.tls_cfg = cfg;
end
else
log("error", "err = %q", err);
end
end
end
end
prosody.events.add_handler("item-added/net-provider", function (event)
local item = event.item;
register_service(item.name, item);
for host in pairs(prosody.hosts) do
add_sni_host(host, item.name);
end
end);
prosody.events.add_handler("item-removed/net-provider", function (event)
local item = event.item;
unregister_service(item.name, item);
end);
prosody.events.add_handler("host-activated", add_sni_host);
prosody.events.add_handler("host-deactivated", function (host)
for name, interface, port, n, active_service --luacheck: ignore 213
in active_services:iter(nil, nil, nil, nil) do
if active_service.tls_cfg then
active_service.server.hosts[host] = nil;
end
end
end);
return {
activate = activate;
deactivate = deactivate;

28
core/rostermanager.lua
View file

@ -12,6 +12,7 @@
local log = require "util.logger".init("rostermanager");
local new_id = require "util.id".short;
local new_cache = require "util.cache".new;
local pairs = pairs;
local tostring = tostring;
@ -111,6 +112,23 @@ local function load_roster(username, host)
else -- Attempt to load roster for non-loaded user
log("debug", "load_roster: loading for offline user: %s", jid);
end
local roster_cache = hosts[host] and hosts[host].roster_cache;
if not roster_cache then
if hosts[host] then
roster_cache = new_cache(1024);
hosts[host].roster_cache = roster_cache;
end
else
roster = roster_cache:get(jid);
if roster then
log("debug", "load_roster: cache hit");
roster_cache:set(jid, roster);
if user then user.roster = roster; end
return roster;
else
log("debug", "load_roster: cache miss, loading from storage");
end
end
local roster_store = storagemanager.open(host, "roster", "keyval");
local data, err = roster_store:get(username);
roster = data or {};
@ -134,6 +152,10 @@ local function load_roster(username, host)
if not err then
hosts[host].events.fire_event("roster-load", { username = username, host = host, roster = roster });
end
if roster_cache and not user then
log("debug", "load_roster: caching loaded roster");
roster_cache:set(jid, roster);
end
return roster, err;
end
@ -263,15 +285,15 @@ end
function is_contact_pending_in(username, host, jid)
local roster = load_roster(username, host);
return roster[false].pending[jid];
return roster[false].pending[jid] ~= nil;
end
local function set_contact_pending_in(username, host, jid)
local function set_contact_pending_in(username, host, jid, stanza)
local roster = load_roster(username, host);
local item = roster[jid];
if item and (item.subscription == "from" or item.subscription == "both") then
return; -- false
end
roster[false].pending[jid] = true;
roster[false].pending[jid] = st.is_stanza(stanza) and st.preserialize(stanza) or true;
return save_roster(username, host, roster, jid);
end
function is_contact_pending_out(username, host, jid)

28
core/s2smanager.lua
View file

@ -13,6 +13,7 @@ local tostring, pairs, setmetatable
= tostring, pairs, setmetatable;
local logger_init = require "util.logger".init;
local sessionlib = require "util.session";
local log = logger_init("s2smanager");
@ -26,18 +27,26 @@ local _ENV = nil;
-- luacheck: std none
local function new_incoming(conn)
local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming", hosts = {} };
session.log = logger_init("s2sin"..tostring(session):match("[a-f0-9]+$"));
incoming_s2s[session] = true;
return session;
local host_session = sessionlib.new("s2sin");
sessionlib.set_id(host_session);
sessionlib.set_logger(host_session);
sessionlib.set_conn(host_session, conn);
host_session.direction = "incoming";
host_session.hosts = {};
incoming_s2s[host_session] = true;
return host_session;
end
local function new_outgoing(from_host, to_host)
local host_session = { to_host = to_host, from_host = from_host, host = from_host,
notopen = true, type = "s2sout_unauthed", direction = "outgoing" };
local host_session = sessionlib.new("s2sout");
sessionlib.set_id(host_session);
sessionlib.set_logger(host_session);
host_session.to_host = to_host;
host_session.from_host = from_host;
host_session.host = from_host;
host_session.notopen = true;
host_session.direction = "outgoing";
hosts[from_host].s2sout[to_host] = host_session;
local conn_name = "s2sout"..tostring(host_session):match("[a-f0-9]*$");
host_session.log = logger_init(conn_name);
return host_session;
end
@ -50,6 +59,9 @@ local resting_session = { -- Resting, not dead
close = function (session)
session.log("debug", "Attempt to close already-closed session");
end;
reset_stream = function (session)
session.log("debug", "Attempt to reset stream of already-closed session");
end;
filter = function (type, data) return data; end; --luacheck: ignore 212/type
}; resting_session.__index = resting_session;

32
core/sessionmanager.lua
View file

@ -21,6 +21,7 @@ local config_get = require "core.configmanager".get;
local resourceprep = require "util.encodings".stringprep.resourceprep;
local nodeprep = require "util.encodings".stringprep.nodeprep;
local generate_identifier = require "util.id".short;
local sessionlib = require "util.session";
local initialize_filters = require "util.filters".initialize;
local gettime = require "socket".gettime;
@ -29,23 +30,34 @@ local _ENV = nil;
-- luacheck: std none
local function new_session(conn)
local session = { conn = conn, type = "c2s_unauthed", conntime = gettime() };
local session = sessionlib.new("c2s");
sessionlib.set_id(session);
sessionlib.set_logger(session);
sessionlib.set_conn(session, conn);
session.conntime = gettime();
local filter = initialize_filters(session);
local w = conn.write;
function session.rawsend(t)
t = filter("bytes/out", tostring(t));
if t then
local ret, err = w(conn, t);
if not ret then
session.log("debug", "Error writing to connection: %s", tostring(err));
return false, err;
end
end
return true;
end
session.send = function (t)
session.log("debug", "Sending[%s]: %s", session.type, t.top_tag and t:top_tag() or t:match("^[^>]*>?"));
if t.name then
t = filter("stanzas/out", t);
end
if t then
t = filter("bytes/out", tostring(t));
if t then
local ret, err = w(conn, t);
if not ret then
session.log("debug", "Error writing to connection: %s", tostring(err));
return false, err;
end
end
return session.rawsend(t);
end
return true;
end
@ -117,7 +129,7 @@ local function make_authenticated(session, username)
if session.type == "c2s_unauthed" then
session.type = "c2s_unbound";
end
session.log("info", "Authenticated as %s@%s", username or "(unknown)", session.host or "(unknown)");
session.log("info", "Authenticated as %s@%s", username, session.host or "(unknown)");
return true;
end

1
core/statsmanager.lua
View file

@ -97,6 +97,7 @@ if stats then
end
timer.add_task(stats_interval, collect);
prosody.events.add_handler("server-started", function () collect() end, -1);
prosody.events.add_handler("server-stopped", function () collect() end, -1);
else
log("debug", "Statistics enabled using %s provider, collection is disabled", stats_provider_name);
end

804
doc/coding_style.md Normal file
View file

@ -0,0 +1,804 @@
# Prosody Coding Style Guide
This style guides lists the coding conventions used in the
[Prosody](https://prosody.im/) project. It is based heavily on the [style guide used by the LuaRocks project](https://github.com/luarocks/lua-style-guide).
## Indentation and formatting
* Prosody code is indented with tabs at the start of the line, a single
tab per logical indent level:
```lua
for i, pkg in ipairs(packages) do
for name, version in pairs(pkg) do
if name == searched then
print(version);
end
end
end
```
Tab width is configurable in editors, so never assume a particular width.
Specically this means you should not mix tabs and spaces, or use tabs for
alignment of items at different indentation levels.
* Use LF (Unix) line endings.
## Comments
* Comments are encouraged where necessary to explain non-obvious code.
* In general comments should be used to explain 'why', not 'how'
### Comment tags
A comment may be prefixed with one of the following tags:
* **FIXME**: Indicates a serious problem with the code that should be addressed
* **TODO**: Indicates an open task, feature request or code restructuring that
is primarily of interest to developers (otherwise it should be in the
issue tracker).
* **COMPAT**: Must be used on all code that is present only for backwards-compatibility,
and may be removed one day. For example code that is added to support old
or buggy third-party software or dependencies.
**Example:**
```lua
-- TODO: implement method
local function something()
-- FIXME: check conditions
end
```
## Variable names
* Variable names with larger scope should be more descriptive than those with
smaller scope. One-letter variable names should be avoided except for very
small scopes (less than ten lines) or for iterators.
* `i` should be used only as a counter variable in for loops (either numeric for
or `ipairs`).
* Prefer more descriptive names than `k` and `v` when iterating with `pairs`,
unless you are writing a function that operates on generic tables.
* Use `_` for ignored variables (e.g. in for loops:)
```lua
for _, item in ipairs(items) do
do_something_with_item(item);
end
```
* Generally all identifiers (variables and function names) should use `snake_case`,
i.e. lowercase words joined by `_`.
```lua
-- bad
local OBJEcttsssss = {}
local thisIsMyObject = {}
local c = function()
-- ...stuff...
end
-- good
local this_is_my_object = {};
local function do_that_thing()
-- ...stuff...
end
```
> **Rationale:** The standard library uses lowercase APIs, with `joinedlowercase`
names, but this does not scale too well for more complex APIs. `snake_case`
tends to look good enough and not too out-of-place along side the standard
APIs.
```lua
for _, name in pairs(names) do
-- ...stuff...
end
```
* Prefer using `is_` when naming boolean functions:
```lua
-- bad
local function evil(alignment)
return alignment < 100
end
-- good
local function is_evil(alignment)
return alignment < 100;
end
```
* `UPPER_CASE` is to be used sparingly, with "constants" only.
> **Rationale:** "Sparingly", since Lua does not have real constants. This
notation is most useful in libraries that bind C libraries, when bringing over
constants from C.
* Do not use uppercase names starting with `_`, they are reserved by Lua.
## Tables
* When creating a table, prefer populating its fields all at once, if possible:
```lua
local player = { name = "Jack", class = "Rogue" };
```
* Items should be separated by commas. If there are many items, put each
key/value on a separate line and use a semi-colon after each item (including
the last one):
```lua
local player = {
name = "Jack";
class = "Rogue";
}
```
> **Rationale:** This makes the structure of your tables more evident at a glance.
Trailing semi-colons make it quicker to add new fields and produces shorter diffs.
* Use plain `key` syntax whenever possible, use `["key"]` syntax when using names
that can't be represented as identifiers and avoid mixing representations in
a declaration:
```lua
local mytable = {
["1394-E"] = val1;
["UTF-8"] = val2;
["and"] = val2;
}
```
## Strings
* Use `"double quotes"` for strings; use `'single quotes'` when writing strings
that contain double quotes.
```lua
local name = "Prosody";
local sentence = 'The name of the program is "Prosody"';
```
> **Rationale:** Double quotes are used as string delimiters in a larger number of
programming languages. Single quotes are useful for avoiding escaping when
using double quotes in literals.
## Line lengths
* There are no hard or soft limits on line lengths. Line lengths are naturally
limited by using one statement per line. If that still produces lines that are
too long (e.g. an expression that produces a line over 256-characters long,
for example), this means the expression is too complex and would do better
split into subexpressions with reasonable names.
> **Rationale:** No one works on VT100 terminals anymore. If line lengths are a proxy
for code complexity, we should address code complexity instead of using line
breaks to fit mind-bending statements over multiple lines.
## Function declaration syntax
* Prefer function syntax over variable syntax. This helps differentiate between
named and anonymous functions.
```lua
-- bad
local nope = function(name, options)
-- ...stuff...
end
-- good
local function yup(name, options)
-- ...stuff...
end
```
* Perform validation early and return as early as possible.
```lua
-- bad
local function is_good_name(name, options, arg)
local is_good = #name > 3
is_good = is_good and #name < 30
-- ...stuff...
return is_good
end
-- good
local function is_good_name(name, options, args)
if #name < 3 or #name > 30 then
return false;
end
-- ...stuff...
return true;
end
```
## Function calls
* Even though Lua allows it, generally you should not omit parentheses
for functions that take a unique string literal argument.
```lua
-- bad
local data = get_data"KRP"..tostring(area_number)
-- good
local data = get_data("KRP"..tostring(area_number));
local data = get_data("KRP")..tostring(area_number);
```
> **Rationale:** It is not obvious at a glace what the precedence rules are
when omitting the parentheses in a function call. Can you quickly tell which
of the two "good" examples in equivalent to the "bad" one? (It's the second
one).
* You should not omit parenthesis for functions that take a unique table
argument on a single line. You may do so for table arguments that span several
lines.
```lua
local an_instance = a_module.new {
a_parameter = 42;
another_parameter = "yay";
}
```
> **Rationale:** The use as in `a_module.new` above occurs alone in a statement,
so there are no precedence issues.
## Table attributes
* Use dot notation when accessing known properties.
```lua
local luke = {
jedi = true;
age = 28;
}
-- bad
local is_jedi = luke["jedi"]
-- good
local is_jedi = luke.jedi;
```
* Use subscript notation `[]` when accessing properties with a variable or if using a table as a list.
```lua
local vehicles = load_vehicles_from_disk("vehicles.dat")
if vehicles["Porsche"] then
porsche_handler(vehicles["Porsche"]);
vehicles["Porsche"] = nil;
end
for name, cars in pairs(vehicles) do
regular_handler(cars);
end
```
> **Rationale:** Using dot notation makes it clearer that the given key is meant
to be used as a record/object field.
## Functions in tables
* When declaring modules and classes, declare functions external to the table definition:
```lua
local my_module = {};
function my_module.a_function(x)
-- code
end
```
* When declaring metatables, declare function internal to the table definition.
```lua
local version_mt = {
__eq = function(a, b)
-- code
end;
__lt = function(a, b)
-- code
end;
}
```
> **Rationale:** Metatables contain special behavior that affect the tables
they're assigned (and are used implicitly at the call site), so it's good to
be able to get a view of the complete behavior of the metatable at a glance.
This is not as important for objects and modules, which usually have way more
code, and which don't fit in a single screen anyway, so nesting them inside
the table does not gain much: when scrolling a longer file, it is more evident
that `check_version` is a method of `Api` if it says `function Api:check_version()`
than if it says `check_version = function()` under some indentation level.
## Variable declaration
* Always use `local` to declare variables.
```lua
-- bad
superpower = get_superpower()
-- good
local superpower = get_superpower();
```
> **Rationale:** Not doing so will result in global variables to avoid polluting
the global namespace.
## Variable scope
* Assign variables with the smallest possible scope.
```lua
-- bad
local function good()
local name = get_name()
test()
print("doing stuff..")
--...other stuff...
if name == "test" then
return false
end
return name
end
-- good
local bad = function()
test();
print("doing stuff..");
--...other stuff...
local name = get_name();
if name == "test" then
return false;
end
return name;
end
```
> **Rationale:** Lua has proper lexical scoping. Declaring the function later means that its
scope is smaller, so this makes it easier to check for the effects of a variable.
## Conditional expressions
* False and nil are falsy in conditional expressions. Use shortcuts when you
can, unless you need to know the difference between false and nil.
```lua
-- bad
if name ~= nil then
-- ...stuff...
end
-- good
if name then
-- ...stuff...
end
```
* Avoid designing APIs which depend on the difference between `nil` and `false`.
* Use the `and`/`or` idiom for the pseudo-ternary operator when it results in
more straightforward code. When nesting expressions, use parentheses to make it
easier to scan visually:
```lua
local function default_name(name)
-- return the default "Waldo" if name is nil
return name or "Waldo";
end
local function brew_coffee(machine)
return (machine and machine.is_loaded) and "coffee brewing" or "fill your water";
end
```
Note that the `x and y or z` as a substitute for `x ? y : z` does not work if
`y` may be `nil` or `false` so avoid it altogether for returning booleans or
values which may be nil.
## Blocks
* Use single-line blocks only for `then return`, `then break` and `function return` (a.k.a "lambda") constructs:
```lua
-- good
if test then break end
-- good
if not ok then return nil, "this failed for this reason: " .. reason end
-- good
use_callback(x, function(k) return k.last end);
-- good
if test then
return false
end
-- bad
if test < 1 and do_complicated_function(test) == false or seven == 8 and nine == 10 then do_other_complicated_function() end
-- good
if test < 1 and do_complicated_function(test) == false or seven == 8 and nine == 10 then
do_other_complicated_function();
return false;
end
```
* Separate statements onto multiple lines. Use semicolons as statement terminators.
```lua
-- bad
local whatever = "sure"
a = 1 b = 2
-- good
local whatever = "sure";
a = 1;
b = 2;
```
## Spacing
* Use a space after `--`.
```lua
--bad
-- good
```
* Always put a space after commas and between operators and assignment signs:
```lua
-- bad
local x = y*9
local numbers={1,2,3}
numbers={1 , 2 , 3}
numbers={1 ,2 ,3}
local strings = { "hello"
, "Lua"
, "world"
}
dog.set( "attr",{
age="1 year",
breed="Bernese Mountain Dog"
})
-- good
local x = y * 9;
local numbers = {1, 2, 3};
local strings = {
"hello";
"Lua";
"world";
}
dog.set("attr", {
age = "1 year";
breed = "Bernese Mountain Dog";
});
```
* Indent tables and functions according to the start of the line, not the construct:
```lua
-- bad
local my_table = {
"hello",
"world",
}
using_a_callback(x, function(...)
print("hello")
end)
-- good
local my_table = {
"hello";
"world";
}
using_a_callback(x, function(...)
print("hello");
end)
```
> **Rationale:** This keep indentation levels aligned at predictable places. You don't
need to realign the entire block if something in the first line changes (such as
replacing `x` with `xy` in the `using_a_callback` example above).
* The concatenation operator gets a pass for avoiding spaces:
```lua
-- okay
local message = "Hello, "..user.."! This is your day # "..day.." in our platform!";
```
> **Rationale:** Being at the baseline, the dots already provide some visual spacing.
* No spaces after the name of a function in a declaration or in its arguments:
```lua
-- bad
local function hello ( name, language )
-- code
end
-- good
local function hello(name, language)
-- code
end
```
* Add blank lines between functions:
```lua
-- bad
local function foo()
-- code
end
local function bar()
-- code
end
-- good
local function foo()
-- code
end
local function bar()
-- code
end
```
* Avoid aligning variable declarations:
```lua
-- bad
local a = 1
local long_identifier = 2
-- good
local a = 1;
local long_identifier = 2;
```
> **Rationale:** This produces extra diffs which add noise to `git blame`.
* Alignment is occasionally useful when logical correspondence is to be highlighted:
```lua
-- okay
sys_command(form, UI_FORM_UPDATE_NODE, "a", FORM_NODE_HIDDEN, false);
sys_command(form, UI_FORM_UPDATE_NODE, "sample", FORM_NODE_VISIBLE, false);
```
## Typing
* In non-performance critical code, it can be useful to add type-checking assertions
for function arguments:
```lua
function manif.load_manifest(repo_url, lua_version)
assert(type(repo_url) == "string");
assert(type(lua_version) == "string" or not lua_version);
-- ...
end
```
* Use the standard functions for type conversion, avoid relying on coercion:
```lua
-- bad
local total_score = review_score .. ""
-- good
local total_score = tostring(review_score);
```
## Errors
* Functions that can fail for reasons that are expected (e.g. I/O) should
return `nil` and a (string) error message on error, possibly followed by other
return values such as an error code.
* On errors such as API misuse, an error should be thrown, either with `error()`
or `assert()`.
## Modules
Follow [these guidelines](http://hisham.hm/2014/01/02/how-to-write-lua-modules-in-a-post-module-world/) for writing modules. In short:
* Always require a module into a local variable named after the last component of the module’s full name.
```lua
local bar = require("foo.bar"); -- requiring the module
bar.say("hello"); -- using the module
```
* Don’t rename modules arbitrarily:
```lua
-- bad
local skt = require("socket")
```
> **Rationale:** Code is much harder to read if we have to keep going back to the top
to check how you chose to call a module.
* Start a module by declaring its table using the same all-lowercase local
name that will be used to require it. You may use an LDoc comment to identify
the whole module path.
```lua
--- @module foo.bar
local bar = {};
```
* Try to use names that won't clash with your local variables. For instance, don't
name your module something like “size”.
* Use `local function` to declare _local_ functions only: that is, functions
that won’t be accessible from outside the module.
That is, `local function helper_foo()` means that `helper_foo` is really local.
* Public functions are declared in the module table, with dot syntax:
```lua
function bar.say(greeting)
print(greeting);
end
```
> **Rationale:** Visibility rules are made explicit through syntax.
* Do not set any globals in your module and always return a table in the end.
* If you would like your module to be used as a function, you may set the
`__call` metamethod on the module table instead.
> **Rationale:** Modules should return tables in order to be amenable to have their
contents inspected via the Lua interactive interpreter or other tools.
* Requiring a module should cause no side-effect other than loading other
modules and returning the module table.
* A module should not have state. If a module needs configuration, turn
it into a factory. For example, do not make something like this:
```lua
-- bad
local mp = require "MessagePack"
mp.set_integer("unsigned")
```
and do something like this instead:
```lua
-- good
local messagepack = require("messagepack");
local mpack = messagepack.new({integer = "unsigned"});
```
* The invocation of require may omit parentheses around the module name:
```lua
local bla = require "bla";
```
## Metatables, classes and objects
If creating a new type of object that has a metatable and methods, the
metatable and methods table should be separate, and the metatable name
should end with `_mt`.
```lua
local mytype_methods = {};
local mytype_mt = { __index = mytype_methods };
function mytype_methods:add_new_thing(thing)
end
local function new()
return setmetatable({}, mytype_mt);
end
return { new = new };
```
* Use the method notation when invoking methods:
```
-- bad
my_object.my_method(my_object)
-- good
my_object:my_method();
```
> **Rationale:** This makes it explicit that the intent is to use the function as a method.
* Do not rely on the `__gc` metamethod to release resources other than memory.
If your object manage resources such as files, add a `close` method to their
APIs and do not auto-close via `__gc`. Auto-closing via `__gc` would entice
users of your module to not close resources as soon as possible. (Note that
the standard `io` library does not follow this recommendation, and users often
forget that not closing files immediately can lead to "too many open files"
errors when the program runs for a while.)
> **Rationale:** The garbage collector performs automatic *memory* management,
dealing with memory only. There is no guarantees as to when the garbage
collector will be invoked, and memory pressure does not correlate to pressure
on other resources.
## File structure
* Lua files should be named in all lowercase.
* Tests should be in a top-level `spec` directory. Prosody uses
[Busted](http://olivinelabs.com/busted/) for testing.
## Static checking
All code should pass [luacheck](https://github.com/mpeterv/luacheck) using
the `.luacheckrc` provided in the Prosody repository, and using miminal
inline exceptions.
* luacheck warnings of class 211, 212, 213 (unused variable, argument or loop
variable) may be ignored, if the unused variable was added explicitly: for
example, sometimes it is useful, for code understandability, to spell out what
the keys and values in a table are, even if you're only using one of them.
Another example is a function that needs to follow a given signature for API
reasons (e.g. a callback that follows a given format) but doesn't use some of
its arguments; it's better to spell out in the argument what the API the
function implements is, instead of adding `_` variables.
```
local foo, bar = some_function(); --luacheck: ignore 212/foo
print(bar);
```
* luacheck warning 542 (empty if branch) can also be ignored, when a sequence
of `if`/`elseif`/`else` blocks implements a "switch/case"-style list of cases,
and one of the cases is meant to mean "pass". For example:
```lua
if warning >= 600 and warning <= 699 then
print("no whitespace warnings");
elseif warning == 542 then --luacheck: ignore 542
-- pass
else
print("got a warning: "..warning);
end
```
> **Rationale:** This avoids writing negated conditions in the final fallback
case, and it's easy to add another case to the construct without having to
edit the fallback.

33
doc/coding_style.txt
View file

@ -1,33 +0,0 @@
This file describes some coding styles to try and adhere to when contributing to this project.
Please try to follow, and feel free to fix code you see not following this standard.
== Indentation ==
1 tab indentation for all blocks
== Spacing ==
No space between function names and parenthesis and parenthesis and parameters:
function foo(bar, baz)
Single space between braces and key/value pairs in table constructors:
{ foo = "bar", bar = "foo" }
== Local variable naming ==
In this project there are many places where use of globals is restricted, and locals used for faster access.
Local versions of standard functions should follow the below form:
math.random -> m_random
string.char -> s_char
== Miscellaneous ==
Single-statement blocks may be written on one line when short
if foo then bar(); end
'do' and 'then' keywords should be placed at the end of the line, and never on a line by themself.

21
doc/net.server.lua
View file

@ -160,6 +160,26 @@ Returns:
local function addserver(address, port, listeners, pattern, sslctx)
end
--[[ Binds and listens on the given address and port
Mostly the same as addserver but with all optional arguments in a table
Arguments:
- address: address to bind to, may be "*" to bind all addresses. will be resolved if it is a string.
- port: port to bind (as number)
- listeners: a table of listeners
- config: table of extra settings
- read_size: the amount of bytes to read or a read pattern
- tls_ctx: is a valid luasec constructor
- tls_direct: boolean true for direct TLS, false (or nil) for starttls
Returns:
- handle
- nil, "an error message": on failure (e.g. out of file descriptors)
]]
local function listen(address, port, listeners, config)
end
--[[ Wraps a lua-socket socket client socket in a handle.
The socket must be already connected to the remote end.
If `sslctx` is given, a SSL session will be negotiated before listeners are called.
@ -255,4 +275,5 @@ return {
closeall = closeall;
hook_signal = hook_signal;
watchfd = watchfd;
listen = listen;
}

3
doc/storage.tld
View file

@ -47,6 +47,9 @@ interface archive_store
-- Array of dates which do have messages (Optional?)
dates : ( self, string? ) -> ({ string }) | (nil, string)
-- Map of counts per "with" field
summary : ( self, string?, archive_query? ) -> ( { string : integer } ) | (nil, string)
end
-- This represents moduleapi

10
makefile
View file

@ -19,6 +19,9 @@ INSTALL_EXEC=$(INSTALL) -m755
MKDIR=install -d
MKDIR_PRIVATE=$(MKDIR) -m750
LUACHECK=luacheck
BUSTED=busted
.PHONY: all test clean install
all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
@ -68,8 +71,13 @@ clean:
rm -f prosody.version
$(MAKE) clean -C util-src
lint:
$(LUACHECK) -q $$(HGPLAIN= hg files -I '**.lua') prosody prosodyctl
@echo $$(sed -n '/^\tlocal exclude_files/,/^}/p;' .luacheckrc | sed '1d;$d' | wc -l) files ignored
shellcheck configure
test:
busted --lua=$(RUNWITH)
$(BUSTED) --lua=$(RUNWITH)
prosody.install: prosody

16
net/adns.lua
View file

@ -14,7 +14,7 @@ local log = require "util.logger".init("adns");
local coroutine, tostring, pcall = coroutine, tostring, pcall;
local setmetatable = setmetatable;
local function dummy_send(sock, data, i, j) return (j-i)+1; end
local function dummy_send(sock, data, i, j) return (j-i)+1; end -- luacheck: ignore 212
local _ENV = nil;
-- luacheck: std none
@ -29,8 +29,7 @@ local function new_async_socket(sock, resolver)
local peername = "<unknown>";
local listener = {};
local handler = {};
local err;
function listener.onincoming(conn, data)
function listener.onincoming(conn, data) -- luacheck: ignore 212/conn
if data then
resolver:feed(handler, data);
end
@ -46,9 +45,12 @@ local function new_async_socket(sock, resolver)
resolver:servfail(conn); -- Let the magic commence
end
end
handler, err = server.wrapclient(sock, "dns", 53, listener);
if not handler then
return nil, err;
do
local err;
handler, err = server.wrapclient(sock, "dns", 53, listener);
if not handler then
return nil, err;
end
end
handler.settimeout = function () end
@ -89,7 +91,7 @@ function async_resolver_methods:lookup(handler, qname, qtype, qclass)
end)(resolver:peek(qname, qtype, qclass));
end
function query_methods:cancel(call_handler, reason)
function query_methods:cancel(call_handler, reason) -- luacheck: ignore 212/reason
log("warn", "Cancelling DNS lookup for %s", tostring(self[4]));
self[1].cancel(self[2], self[3], self[4], self[5], call_handler);
end

18
net/connlisteners.lua
View file

@ -1,18 +0,0 @@
-- COMPAT w/pre-0.9
local log = require "util.logger".init("net.connlisteners");
local traceback = debug.traceback;
local _ENV = nil;
-- luacheck: std none
local function fail()
log("error", "Attempt to use legacy connlisteners API. For more info see https://prosody.im/doc/developers/network");
log("error", "Legacy connlisteners API usage, %s", traceback("", 2));
end
return {
register = fail;
get = fail;
start = fail;
-- epic fail
};

149
net/http/files.lua Normal file
View file

@ -0,0 +1,149 @@
-- Prosody IM
-- Copyright (C) 2008-2010 Matthew Wild
-- Copyright (C) 2008-2010 Waqas Hussain
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
local server = require"net.http.server";
local lfs = require "lfs";
local new_cache = require "util.cache".new;
local log = require "util.logger".init("net.http.files");
local os_date = os.date;
local open = io.open;
local stat = lfs.attributes;
local build_path = require"socket.url".build_path;
local path_sep = package.config:sub(1,1);
local forbidden_chars_pattern = "[/%z]";
if package.config:sub(1,1) == "\\" then
forbidden_chars_pattern = "[/%z\001-\031\127\"*:<>?|]"
end
local urldecode = require "util.http".urldecode;
local function sanitize_path(path) --> util.paths or util.http?
if not path then return end
local out = {};
local c = 0;
for component in path:gmatch("([^/]+)") do
component = urldecode(component);
if component:find(forbidden_chars_pattern) then
return nil;
elseif component == ".." then
if c <= 0 then
return nil;
end
out[c] = nil;
c = c - 1;
elseif component ~= "." then
c = c + 1;
out[c] = component;
end
end
if path:sub(-1,-1) == "/" then
out[c+1] = "";
end
return "/"..table.concat(out, "/");
end
local function serve(opts)
if type(opts) ~= "table" then -- assume path string
opts = { path = opts };
end
local mime_map = opts.mime_map or { html = "text/html" };
local cache = new_cache(opts.cache_size or 256);
local cache_max_file_size = tonumber(opts.cache_max_file_size) or 1024
-- luacheck: ignore 431
local base_path = opts.path;
local dir_indices = opts.index_files or { "index.html", "index.htm" };
local directory_index = opts.directory_index;
local function serve_file(event, path)
local request, response = event.request, event.response;
local sanitized_path = sanitize_path(path);
if path and not sanitized_path then
return 400;
end
path = sanitized_path;
local orig_path = sanitize_path(request.path);
local full_path = base_path .. (path or ""):gsub("/", path_sep);
local attr = stat(full_path:match("^.*[^\\/]")); -- Strip trailing path separator because Windows
if not attr then
return 404;
end
local request_headers, response_headers = request.headers, response.headers;
local last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification);
response_headers.last_modified = last_modified;
local etag = ('"%02x-%x-%x-%x"'):format(attr.dev or 0, attr.ino or 0, attr.size or 0, attr.modification or 0);
response_headers.etag = etag;
local if_none_match = request_headers.if_none_match
local if_modified_since = request_headers.if_modified_since;
if etag == if_none_match
or (not if_none_match and last_modified == if_modified_since) then
return 304;
end
local data = cache:get(orig_path);
if data and data.etag == etag then
response_headers.content_type = data.content_type;
data = data.data;
cache:get(orig_path, data);
elseif attr.mode == "directory" and path then
if full_path:sub(-1) ~= "/" then
local dir_path = { is_absolute = true, is_directory = true };
for dir in orig_path:gmatch("[^/]+") do dir_path[#dir_path+1]=dir; end
response_headers.location = build_path(dir_path);
return 301;
end
for i=1,#dir_indices do
if stat(full_path..dir_indices[i], "mode") == "file" then
return serve_file(event, path..dir_indices[i]);
end
end
if directory_index then
data = server._events.fire_event("directory-index", { path = request.path, full_path = full_path });
end
if not data then
return 403;
end
cache:set(orig_path, { data = data, content_type = mime_map.html; etag = etag; });
response_headers.content_type = mime_map.html;
else
local f, err = open(full_path, "rb");
if not f then
log("debug", "Could not open %s. Error was %s", full_path, err);
return 403;
end
local ext = full_path:match("%.([^./]+)$");
local content_type = ext and mime_map[ext];
response_headers.content_type = content_type;
if attr.size > cache_max_file_size then
response_headers.content_length = attr.size;
log("debug", "%d > cache_max_file_size", attr.size);
return response:send_file(f);
else
data = f:read("*a");
f:close();
end
cache:set(orig_path, { data = data; content_type = content_type; etag = etag });
end
return response:send(data);
end
return serve_file;
end
return {
serve = serve;
}

1
net/resolvers/basic.lua
View file

@ -1,5 +1,6 @@
local adns = require "net.adns";
local inet_pton = require "util.net".pton;
local unpack = table.unpack or unpack; -- luacheck: ignore 113
local methods = {};
local resolver_mt = { __index = methods };

1
net/resolvers/manual.lua
View file

@ -1,5 +1,6 @@
local methods = {};
local resolver_mt = { __index = methods };
local unpack = table.unpack or unpack; -- luacheck: ignore 113
-- Find the next target to connect to, and
-- pass it to cb()

1
net/resolvers/service.lua
View file

@ -1,5 +1,6 @@
local adns = require "net.adns";
local basic = require "net.resolvers.basic";
local unpack = table.unpack or unpack; -- luacheck: ignore 113
local methods = {};
local resolver_mt = { __index = methods };

66
net/server_epoll.lua
View file

@ -38,7 +38,10 @@ local default_config = { __index = {
read_timeout = 14 * 60;
-- How long to wait for a socket to become writable after queuing data to send
send_timeout = 60;
send_timeout = 180;
-- How long to wait for a socket to become writable after creation
connect_timeout = 20;
-- Some number possibly influencing how many pending connections can be accepted
tcp_backlog = 128;
@ -102,7 +105,7 @@ local function runtimers(next_delay, min_wait)
if peek > now then
next_delay = peek - now;
break;
end
end
local _, timer, id = timers:pop();
local ok, ret = pcall(timer[2], now);
@ -110,10 +113,10 @@ local function runtimers(next_delay, min_wait)
local next_time = now+ret;
timer[1] = next_time;
timers:insert(timer, next_time);
end
end
peek = timers:peek();
end
end
if peek == nil then
return next_delay;
end
@ -159,6 +162,7 @@ function interface:on(what, ...)
local ok, err = pcall(listener, self, ...);
if not ok then
log("error", "Error calling on%s: %s", what, err);
return;
end
return err;
end
@ -407,8 +411,10 @@ function interface:write(data)
else
self.writebuffer = { data };
end
self:setwritetimeout();
self:set(nil, true);
if not self._write_lock then
self:setwritetimeout();
self:set(nil, true);
end
return #data;
end
interface.send = interface.write;
@ -483,6 +489,13 @@ function interface:tlshandskake()
end
conn:settimeout(0);
self.conn = conn;
if conn.sni then
if self.servername then
conn:sni(self.servername);
elseif self._server and type(self._server.hosts) == "table" and next(self._server.hosts) ~= nil then
conn:sni(self._server.hosts, true);
end
end
self:on("starttls");
self.ondrain = nil;
self.onwritable = interface.tlshandskake;
@ -555,12 +568,14 @@ function interface:onacceptable()
client:init();
if self.tls_direct then
client:starttls(self.tls_ctx);
else
client:onconnect();
end
end
-- Initialization
function interface:init()
self:setwritetimeout();
self:setwritetimeout(cfg.connect_timeout);
return self:add(true, true);
end
@ -588,16 +603,28 @@ function interface:pausefor(t)
end);
end
function interface:pause_writes()
self._write_lock = true;
self:setwritetimeout(false);
self:set(nil, false);
end
function interface:resume_writes()
self._write_lock = nil;
if self.writebuffer[1] then
self:setwritetimeout();
self:set(nil, true);
end
end
-- Connected!
function interface:onconnect()
if self.conn and not self.peername and self.conn.getpeername then
self.peername, self.peerport = self.conn:getpeername();
end
self:updatenames();
self.onconnect = noop;
self:on("connect");
end
local function addserver(addr, port, listeners, read_size, tls_ctx)
local function listen(addr, port, listeners, config)
local conn, err = socket.bind(addr, port, cfg.tcp_backlog);
if not conn then return conn, err; end
conn:settimeout(0);
@ -605,10 +632,11 @@ local function addserver(addr, port, listeners, read_size, tls_ctx)
conn = conn;
created = gettime();
listeners = listeners;
read_size = read_size;
read_size = config and config.read_size;
onreadable = interface.onacceptable;
tls_ctx = tls_ctx;
tls_direct = tls_ctx and true or false;
tls_ctx = config and config.tls_ctx;
tls_direct = config and config.tls_direct;
hosts = config and config.sni_hosts;
sockname = addr;
sockport = port;
}, interface_mt);
@ -616,6 +644,15 @@ local function addserver(addr, port, listeners, read_size, tls_ctx)
return server;
end
-- COMPAT
local function addserver(addr, port, listeners, read_size, tls_ctx)
return listen(addr, port, listeners, {
read_size = read_size;
tls_ctx = tls_ctx;
tls_direct = tls_ctx and true or false;
});
end
-- COMPAT
local function wrapclient(conn, addr, port, listeners, read_size, tls_ctx)
local client = wrapsocket(conn, nil, read_size, listeners, tls_ctx);
@ -752,6 +789,7 @@ return {
addserver = addserver;
addclient = addclient;
add_task = addtimer;
listen = listen;
at = at;
loop = loop;
closeall = closeall;

50
net/server_event.lua
View file

@ -164,6 +164,15 @@ function interface_mt:_start_ssl(call_onconnect) -- old socket will be destroyed
debug( "fatal error while ssl wrapping:", err )
return false
end
if self.conn.sni then
if self.servername then
self.conn:sni(self.servername);
elseif self._server and type(self._server.hosts) == "table" and next(self._server.hosts) ~= nil then
self.conn:sni(self._server.hosts, true);
end
end
self.conn:settimeout( 0 ) -- set non blocking
local handshakecallback = coroutine_wrap(function( event )
local _, err
@ -253,6 +262,7 @@ end
--TODO: Deprecate
function interface_mt:lock_read(switch)
log("warn", ":lock_read is deprecated, use :pasue() and :resume()");
if switch then
return self:pause();
else
@ -272,6 +282,19 @@ function interface_mt:resume()
end
end
function interface_mt:pause_writes()
return self:_lock(self.nointerface, self.noreading, true);
end
function interface_mt:resume_writes()
self:_lock(self.nointerface, self.noreading, false);
if self.writecallback and not self.eventwrite then
self.eventwrite = addevent( base, self.conn, EV_WRITE, self.writecallback, cfg.WRITE_TIMEOUT ); -- register callback
return true;
end
end
function interface_mt:counter(c)
if c then
self._connections = self._connections + c
@ -281,7 +304,7 @@ end
-- Public methods
function interface_mt:write(data)
if self.nowriting then return nil, "locked" end
if self.nointerface then return nil, "locked"; end
--vdebug( "try to send data to client, id/data:", self.id, data )
data = tostring( data )
local len = #data
@ -293,7 +316,7 @@ function interface_mt:write(data)
end
t_insert(self.writebuffer, data) -- new buffer
self.writebufferlen = total
if not self.eventwrite then -- register new write event
if not self.eventwrite and not self.nowriting then -- register new write event
--vdebug( "register new write event" )
self.eventwrite = addevent( base, self.conn, EV_WRITE, self.writecallback, cfg.WRITE_TIMEOUT )
end
@ -635,7 +658,7 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx
return interface
end
local function handleserver( server, addr, port, pattern, listener, sslctx ) -- creates an server interface
local function handleserver( server, addr, port, pattern, listener, sslctx, startssl ) -- creates a server interface
debug "creating server interface..."
local interface = {
_connections = 0;
@ -651,6 +674,7 @@ local function handleserver( server, addr, port, pattern, listener, sslctx ) --
_ip = addr, _port = port, _pattern = pattern,
_sslctx = sslctx;
hosts = {};
}
interface.id = tostring(interface):match("%x+$");
interface.readcallback = function( event ) -- server handler, called on incoming connections
@ -681,7 +705,7 @@ local function handleserver( server, addr, port, pattern, listener, sslctx ) --
interface._connections = interface._connections + 1 -- increase connection count
local clientinterface = handleclient( client, client_ip, client_port, interface, pattern, listener, sslctx )
--vdebug( "client id:", clientinterface, "startssl:", startssl )
if has_luasec and sslctx then
if has_luasec and startssl then
clientinterface:starttls(sslctx, true)
else
clientinterface:_start_session( true )
@ -700,9 +724,9 @@ local function handleserver( server, addr, port, pattern, listener, sslctx ) --
return interface
end
local function addserver( addr, port, listener, pattern, sslctx, startssl ) -- TODO: check arguments
--vdebug( "creating new tcp server with following parameters:", addr or "nil", port or "nil", sslctx or "nil", startssl or "nil")
if sslctx and not has_luasec then
local function listen(addr, port, listener, config)
config = config or {}
if config.sslctx and not has_luasec then
debug "fatal error: luasec not found"
return nil, "luasec not found"
end
@ -711,11 +735,20 @@ local function addserver( addr, port, listener, pattern, sslctx, startssl ) --
debug( "creating server socket on "..addr.." port "..port.." failed:", err )
return nil, err
end
local interface = handleserver( server, addr, port, pattern, listener, sslctx, startssl ) -- new server handler
local interface = handleserver( server, addr, port, config.read_size, listener, config.tls_ctx, config.tls_direct) -- new server handler
debug( "new server created with id:", tostring(interface))
return interface
end
local function addserver( addr, port, listener, pattern, sslctx ) -- TODO: check arguments
--vdebug( "creating new tcp server with following parameters:", addr or "nil", port or "nil", sslctx or "nil", startssl or "nil")
return listen( addr, port, listener, {
read_size = pattern,
tls_ctx = sslctx,
tls_direct = not not sslctx,
});
end
local function wrapclient( client, ip, port, listeners, pattern, sslctx )
local interface = handleclient( client, ip, port, nil, pattern, listeners, sslctx )
interface:_start_connection(sslctx)
@ -876,6 +909,7 @@ return {
event_base = base,
addevent = newevent,
addserver = addserver,
listen = listen,
addclient = addclient,
wrapclient = wrapclient,
setquitting = setquitting,

107
net/server_select.lua
View file

@ -68,6 +68,7 @@ local idfalse
local closeall
local addsocket
local addserver
local listen
local addtimer
local getserver
local wrapserver
@ -123,7 +124,7 @@ local _maxsslhandshake
_server = { } -- key = port, value = table; list of listening servers
_readlist = { } -- array with sockets to read from
_sendlist = { } -- arrary with sockets to write to
_sendlist = { } -- array with sockets to write to
_timerlist = { } -- array of timer functions
_socketlist = { } -- key = socket, value = wrapped socket (handlers)
_readtimes = { } -- key = handler, value = timestamp of last data reading
@ -149,7 +150,7 @@ _checkinterval = 30 -- interval in secs to check idle clients
_sendtimeout = 60000 -- allowed send idle time in secs
_readtimeout = 14 * 60 -- allowed read idle time in secs
local is_windows = package.config:sub(1,1) == "\\" -- check the directory separator, to detemine whether this is Windows
local is_windows = package.config:sub(1,1) == "\\" -- check the directory separator, to determine whether this is Windows
_maxfd = (is_windows and math.huge) or luasocket._SETSIZE or 1024 -- max fd number, limit to 1024 by default to prevent glibc buffer overflow, but not on Windows
_maxselectlen = luasocket._SETSIZE or 1024 -- But this still applies on Windows
@ -157,7 +158,7 @@ _maxsslhandshake = 30 -- max handshake round-trips
----------------------------------// PRIVATE //--
wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx ) -- this function wraps a server -- FIXME Make sure FD < _maxfd
wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, ssldirect ) -- this function wraps a server -- FIXME Make sure FD < _maxfd
if socket:getfd() >= _maxfd then
out_error("server.lua: Disallowed FD number: "..socket:getfd())
@ -183,6 +184,7 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx ) -- t
handler.sslctx = function( )
return sslctx
end
handler.hosts = {} -- sni
handler.remove = function( )
connections = connections - 1
if handler then
@ -244,13 +246,13 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx ) -- t
local client, err = accept( socket ) -- try to accept
if client then
local ip, clientport = client:getpeername( )
local handler, client, err = wrapconnection( handler, listeners, client, ip, serverport, clientport, pattern, sslctx ) -- wrap new client socket
local handler, client, err = wrapconnection( handler, listeners, client, ip, serverport, clientport, pattern, sslctx, ssldirect ) -- wrap new client socket
if err then -- error while wrapping ssl socket
return false
end
connections = connections + 1
out_put( "server.lua: accepted new client connection from ", tostring(ip), ":", tostring(clientport), " to ", tostring(serverport))
if dispatch and not sslctx then -- SSL connections will notify onconnect when handshake completes
if dispatch and not ssldirect then -- SSL connections will notify onconnect when handshake completes
return dispatch( handler );
end
return;
@ -264,7 +266,7 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx ) -- t
return handler
end
wrapconnection = function( server, listeners, socket, ip, serverport, clientport, pattern, sslctx ) -- this function wraps a client to a handler object
wrapconnection = function( server, listeners, socket, ip, serverport, clientport, pattern, sslctx, ssldirect ) -- this function wraps a client to a handler object
if socket:getfd() >= _maxfd then
out_error("server.lua: Disallowed FD number: "..socket:getfd()) -- PROTIP: Switch to libevent
@ -424,9 +426,8 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
bufferlen = bufferlen + #data
if bufferlen > maxsendlen then
_closelist[ handler ] = "send buffer exceeded" -- cannot close the client at the moment, have to wait to the end of the cycle
handler.write = idfalse -- don't write anymore
return false
elseif socket and not _sendlist[ socket ] then
elseif not nosend and socket and not _sendlist[ socket ] then
_sendlistlen = addsocket(_sendlist, socket, _sendlistlen)
end
bufferqueuelen = bufferqueuelen + 1
@ -456,49 +457,55 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
maxreadlen = readlen or maxreadlen
return bufferlen, maxreadlen, maxsendlen
end
--TODO: Deprecate
handler.lock_read = function (self, switch)
out_error( "server.lua, lock_read() is deprecated, use pause() and resume()" )
if switch == true then
local tmp = _readlistlen
_readlistlen = removesocket( _readlist, socket, _readlistlen )
_readtimes[ handler ] = nil
if _readlistlen ~= tmp then
noread = true
end
return self:pause()
elseif switch == false then
if noread then
noread = false
_readlistlen = addsocket(_readlist, socket, _readlistlen)
_readtimes[ handler ] = _currenttime
end
return self:resume()
end
return noread
end
handler.pause = function (self)
return self:lock_read(true);
local tmp = _readlistlen
_readlistlen = removesocket( _readlist, socket, _readlistlen )
_readtimes[ handler ] = nil
if _readlistlen ~= tmp then
noread = true
end
return noread;
end
handler.resume = function (self)
return self:lock_read(false);
if noread then
noread = false
_readlistlen = addsocket(_readlist, socket, _readlistlen)
_readtimes[ handler ] = _currenttime
end
return noread;
end
handler.lock = function( self, switch )
handler.lock_read (switch)
out_error( "server.lua, lock() is deprecated" )
handler.lock_read (self, switch)
if switch == true then
handler.write = idfalse
local tmp = _sendlistlen
_sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
_writetimes[ handler ] = nil
if _sendlistlen ~= tmp then
nosend = true
end
handler.pause_writes (self)
elseif switch == false then
handler.write = write
if nosend then
nosend = false
write( "" )
end
handler.resume_writes (self)
end
return noread, nosend
end
handler.pause_writes = function (self)
local tmp = _sendlistlen
_sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
_writetimes[ handler ] = nil
nosend = true
end
handler.resume_writes = function (self)
nosend = false
if bufferlen > 0 then
_sendlistlen = addsocket(_sendlist, socket, _sendlistlen)
end
end
local _readbuffer = function( ) -- this function reads data
local buffer, err, part = receive( socket, pattern ) -- receive buffer with "pattern"
if not err or (err == "wantread" or err == "timeout") then -- received something
@ -619,11 +626,20 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
out_put( "server.lua: attempting to start tls on " .. tostring( socket ) )
local oldsocket, err = socket
socket, err = ssl_wrap( socket, sslctx ) -- wrap socket
if not socket then
out_put( "server.lua: error while starting tls on client: ", tostring(err or "unknown error") )
return nil, err -- fatal error
end
if socket.sni then
if self.servername then
socket:sni(self.servername);
elseif self._server and type(self._server.hosts) == "table" and next(self._server.hosts) ~= nil then
socket:sni(self.server().hosts, true);
end
end
socket:settimeout( 0 )
-- add the new socket to our system
@ -659,7 +675,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
_socketlist[ socket ] = handler
_readlistlen = addsocket(_readlist, socket, _readlistlen)
if sslctx and has_luasec then
if sslctx and ssldirect and has_luasec then
out_put "server.lua: auto-starting ssl negotiation..."
handler.autostart_ssl = true;
local ok, err = handler:starttls(sslctx);
@ -734,9 +750,13 @@ end
----------------------------------// PUBLIC //--
addserver = function( addr, port, listeners, pattern, sslctx ) -- this function provides a way for other scripts to reg a server
listen = function ( addr, port, listeners, config )
addr = addr or "*"
config = config or {}
local err
local sslctx = config.tls_ctx;
local ssldirect = config.tls_direct;
local pattern = config.read_size;
if type( listeners ) ~= "table" then
err = "invalid listener table"
elseif type ( addr ) ~= "string" then
@ -757,7 +777,7 @@ addserver = function( addr, port, listeners, pattern, sslctx ) -- this function
out_error( "server.lua, [", addr, "]:", port, ": ", err )
return nil, err
end
local handler, err = wrapserver( listeners, server, addr, port, pattern, sslctx ) -- wrap new server socket
local handler, err = wrapserver( listeners, server, addr, port, pattern, sslctx, ssldirect ) -- wrap new server socket
if not handler then
server:close( )
return nil, err
@ -770,6 +790,14 @@ addserver = function( addr, port, listeners, pattern, sslctx ) -- this function
return handler
end
addserver = function( addr, port, listeners, pattern, sslctx ) -- this function provides a way for other scripts to reg a server
return listen(addr, port, listeners, {
read_size = pattern;
tls_ctx = sslctx;
tls_direct = sslctx and true or false;
});
end
getserver = function ( addr, port )
return _server[ addr..":"..port ];
end
@ -978,7 +1006,7 @@ end
--// EXPERIMENTAL //--
local wrapclient = function( socket, ip, serverport, listeners, pattern, sslctx )
local handler, socket, err = wrapconnection( nil, listeners, socket, ip, serverport, "clientport", pattern, sslctx )
local handler, socket, err = wrapconnection( nil, listeners, socket, ip, serverport, "clientport", pattern, sslctx, sslctx)
if not handler then return nil, err end
_socketlist[ socket ] = handler
if not sslctx then
@ -1114,6 +1142,7 @@ return {
stats = stats,
closeall = closeall,
addserver = addserver,
listen = listen,
getserver = getserver,
setlogger = setlogger,
getsettings = getsettings,

7
net/websocket/frames.lua
View file

@ -9,20 +9,21 @@
local softreq = require "util.dependencies".softreq;
local random_bytes = require "util.random".bytes;
local bit = assert(softreq"bit" or softreq"bit32",
local bit = assert(softreq"bit32" or softreq"bit",
"No bit module found. See https://prosody.im/doc/depends#bitop");
local band = bit.band;
local bor = bit.bor;
local bxor = bit.bxor;
local lshift = bit.lshift;
local rshift = bit.rshift;
local unpack = table.unpack or unpack; -- luacheck: ignore 113
local t_concat = table.concat;
local s_byte = string.byte;
local s_char= string.char;
local s_sub = string.sub;
local s_pack = string.pack; -- luacheck: ignore 143
local s_unpack = string.unpack; -- luacheck: ignore 143
local s_pack = string.pack;
local s_unpack = string.unpack;
if not s_pack and softreq"struct" then
s_pack = softreq"struct".pack;

101
plugins/mod_admin_telnet.lua
View file

@ -22,6 +22,7 @@ local prosody = _G.prosody;
local console_listener = { default_port = 5582; default_mode = "*a"; interface = "127.0.0.1" };
local unpack = table.unpack or unpack; -- luacheck: ignore 113
local iterators = require "util.iterators";
local keys, values = iterators.keys, iterators.values;
local jid_bare, jid_split, jid_join = import("util.jid", "bare", "prepped_split", "join");
@ -30,6 +31,8 @@ local cert_verify_identity = require "util.x509".verify_identity;
local envload = require "util.envload".envload;
local envloadfile = require "util.envload".envloadfile;
local has_pposix, pposix = pcall(require, "util.pposix");
local async = require "util.async";
local serialize = require "util.serialization".new({ fatal = false, unquoted = true});
local commands = module:shared("commands")
local def_env = module:shared("env");
@ -47,6 +50,21 @@ end
console = {};
local runner_callbacks = {};
function runner_callbacks:ready()
self.data.conn:resume();
end
function runner_callbacks:waiting()
self.data.conn:pause();
end
function runner_callbacks:error(err)
module:log("error", "Traceback[telnet]: %s", err);
end
function console:new_session(conn)
local w = function(s) conn:write(s:gsub("\n", "\r\n")); end;
local session = { conn = conn;
@ -62,6 +80,11 @@ function console:new_session(conn)
};
session.env = setmetatable({}, default_env_mt);
session.thread = async.runner(function (line)
console:process_line(session, line);
session.send(string.char(0));
end, runner_callbacks, session);
-- Load up environment with helper objects
for name, t in pairs(def_env) do
if type(t) == "table" then
@ -150,8 +173,7 @@ function console_listener.onincoming(conn, data)
for line in data:gmatch("[^\n]*[\n\004]") do
if session.closed then return end
console:process_line(session, line);
session.send(string.char(0));
session.thread:run(line);
end
session.partial_data = data:match("[^\n]+$");
end
@ -228,6 +250,7 @@ function commands.help(session, data)
print [[c2s:show_secure() - Show all encrypted client connections]]
print [[c2s:show_tls() - Show TLS cipher info for encrypted sessions]]
print [[c2s:close(jid) - Close all sessions for the specified JID]]
print [[c2s:closeall() - Close all active c2s connections ]]
elseif section == "s2s" then
print [[s2s:show(domain) - Show all s2s connections for the given domain (or all if no domain given)]]
print [[s2s:show_tls(domain) - Show TLS cipher info for encrypted sessions]]
@ -458,7 +481,12 @@ function def_env.module:list(hosts)
end
else
for _, name in ipairs(modules) do
print(" "..name);
local status, status_text = modulemanager.get_module(host, name).module:get_status();
local status_summary = "";
if status == "warn" or status == "error" then
status_summary = (" (%s: %s)"):format(status, status_text);
end
print((" %s%s"):format(name, status_summary));
end
end
end
@ -474,9 +502,12 @@ function def_env.config:load(filename, format)
return true, "Config loaded";
end
function def_env.config:get(host, section, key)
function def_env.config:get(host, key)
if key == nil then
host, key = "*", host;
end
local config_get = require "core.configmanager".get
return true, tostring(config_get(host, section, key));
return true, serialize(config_get(host, key));
end
function def_env.config:reload()
@ -520,6 +551,15 @@ local function session_flags(session, line)
if session.remote then
line[#line+1] = "(remote)";
end
if session.is_bidi then
line[#line+1] = "(bidi)";
end
if session.bosh_version then
line[#line+1] = "(bosh)";
end
if session.websocket_request then
line[#line+1] = "(websocket)";
end
return table.concat(line, " ");
end
@ -557,6 +597,7 @@ end
local function show_c2s(callback)
local c2s = array.collect(values(module:shared"/*/c2s/sessions"));
c2s:append(array.collect(values(module:shared"/*/bosh/sessions")));
c2s:sort(function(a, b)
if a.host == b.host then
if a.username == b.username then
@ -571,7 +612,9 @@ local function show_c2s(callback)
end
function def_env.c2s:count()
return true, "Total: ".. iterators.count(values(module:shared"/*/c2s/sessions")) .." clients";
local c2s_count = iterators.count(values(module:shared"/*/c2s/sessions"))
local bosh_count = iterators.count(values(module:shared"/*/bosh/sessions"))
return true, "Total: ".. c2s_count + bosh_count .." clients";
end
function def_env.c2s:show(match_jid, annotate)
@ -628,6 +671,16 @@ function def_env.c2s:close(match_jid)
return true, "Total: "..count.." sessions closed";
end
function def_env.c2s:closeall()
local count = 0;
--luacheck: ignore 212/jid
show_c2s(function (jid, session)
count = count + 1;
session:close();
end);
return true, "Total: "..count.." sessions closed";
end
def_env.s2s = {};
function def_env.s2s:show(match_jid, annotate)
@ -1062,13 +1115,33 @@ end
def_env.xmpp = {};
local st = require "util.stanza";
function def_env.xmpp:ping(localhost, remotehost)
if prosody.hosts[localhost] then
module:send(st.iq{ from=localhost, to=remotehost, type="get", id="ping" }
:tag("ping", {xmlns="urn:xmpp:ping"}), prosody.hosts[localhost]);
return true, "Sent ping";
local new_id = require "util.id".medium;
function def_env.xmpp:ping(localhost, remotehost, timeout)
localhost = select(2, jid_split(localhost));
remotehost = select(2, jid_split(remotehost));
if not localhost then
return nil, "Invalid sender hostname";
elseif not prosody.hosts[localhost] then
return nil, "No such local host";
end
if not remotehost then
return nil, "Invalid destination hostname";
elseif prosody.hosts[remotehost] then
return nil, "Both hosts are local";
end
local iq = st.iq{ from=localhost, to=remotehost, type="get", id=new_id()}
:tag("ping", {xmlns="urn:xmpp:ping"});
local ret, err;
local wait, done = async.waiter();
module:context(localhost):send_iq(iq, nil, timeout)
:next(function (ret_) ret = ret_; end,
function (err_) err = err_; end)
:finally(done);
wait();
if ret then
return true, "pong from " .. ret.stanza.attr.from;
else
return nil, "No such host";
return false, tostring(err);
end
end
@ -1207,7 +1280,7 @@ local function format_stat(type, value, ref_value)
--do return tostring(value) end
if type == "duration" then
if ref_value < 0.001 then
return ("%d µs"):format(value*1000000);
return ("%g µs"):format(value*1000000);
elseif ref_value < 0.9 then
return ("%0.2f ms"):format(value*1000);
end
@ -1495,7 +1568,7 @@ function def_env.stats:show(filter)
local stats, changed, extra = require "core.statsmanager".get_stats();
local available, displayed = 0, 0;
local displayed_stats = new_stats_context(self);
for name, value in pairs(stats) do
for name, value in iterators.sorted_pairs(stats) do
available = available + 1;
if not filter or name:match(filter) then
displayed = displayed + 1;

3
plugins/mod_blocklist.lua
View file

@ -162,7 +162,7 @@ local function edit_blocklist(event)
local blocklist = cache[username] or get_blocklist(username);
local new_blocklist = {
-- We set the [false] key to someting as a signal not to migrate privacy lists
-- We set the [false] key to something as a signal not to migrate privacy lists
[false] = blocklist[false] or { created = now; };
};
if type(blocklist[false]) == "table" then
@ -189,6 +189,7 @@ local function edit_blocklist(event)
if is_blocking then
for jid in pairs(send_unavailable) do
-- Check that this JID isn't already blocked, i.e. this is not a change
if not blocklist[jid] then
for _, session in pairs(sessions[username].sessions) do
if session.presence then

59
plugins/mod_bosh.lua
View file

@ -44,16 +44,38 @@ local bosh_max_polling = module:get_option_number("bosh_max_polling", 5);
local bosh_max_wait = module:get_option_number("bosh_max_wait", 120);
local consider_bosh_secure = module:get_option_boolean("consider_bosh_secure");
local cross_domain = module:get_option("cross_domain_bosh", false);
local cross_domain = module:get_option("cross_domain_bosh");
if cross_domain == true then cross_domain = "*"; end
if type(cross_domain) == "table" then cross_domain = table.concat(cross_domain, ", "); end
if cross_domain ~= nil then
module:log("info", "The 'cross_domain_bosh' option has been deprecated");
end
local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
-- All sessions, and sessions that have no requests open
local sessions = module:shared("sessions");
local measure_active = module:measure("active_sessions", "amount");
local measure_inactive = module:measure("inactive_sessions", "amount");
local report_bad_host = module:measure("bad_host", "rate");
local report_bad_sid = module:measure("bad_sid", "rate");
local report_new_sid = module:measure("new_sid", "rate");
local report_timeout = module:measure("timeout", "rate");
module:hook("stats-update", function ()
local active = 0;
local inactive = 0;
for _, session in pairs(sessions) do
if #session.requests > 0 then
active = active + 1;
else
inactive = inactive + 1;
end
end
measure_active(active);
measure_inactive(inactive);
end);
-- Used to respond to idle sessions (those with waiting requests)
function on_destroy_request(request)
log("debug", "Request destroyed: %s", tostring(request));
@ -73,7 +95,7 @@ function on_destroy_request(request)
if session.inactive_timer then
session.inactive_timer:stop();
end
session.inactive_timer = module:add_timer(max_inactive, check_inactive, session, request.context,
session.inactive_timer = module:add_timer(max_inactive, session_timeout, session, request.context,
"BOSH client silent for over "..max_inactive.." seconds");
(session.log or log)("debug", "BOSH session marked as inactive (for %ds)", max_inactive);
end
@ -84,29 +106,14 @@ function on_destroy_request(request)
end
end
function check_inactive(now, session, context, reason) -- luacheck: ignore 212/now
function session_timeout(now, session, context, reason) -- luacheck: ignore 212/now
if not session.destroyed then
report_timeout();
sessions[context.sid] = nil;
sm_destroy_session(session, reason);
end
end
local function set_cross_domain_headers(response)
local headers = response.headers;
headers.access_control_allow_methods = "GET, POST, OPTIONS";
headers.access_control_allow_headers = "Content-Type";
headers.access_control_max_age = "7200";
headers.access_control_allow_origin = cross_domain;
return response;
end
function handle_OPTIONS(event)
if cross_domain and event.request.headers.origin then
set_cross_domain_headers(event.response);
end
return "";
end
function handle_POST(event)
log("debug", "Handling new request %s: %s\n----------", tostring(event.request), tostring(event.request.body));
@ -121,10 +128,6 @@ function handle_POST(event)
local headers = response.headers;
headers.content_type = "text/xml; charset=utf-8";
if cross_domain and request.headers.origin then
set_cross_domain_headers(response);
end
-- stream:feed() calls the stream_callbacks, so all stanzas in
-- the body are processed in this next line before it returns.
-- In particular, the streamopened() stream callback is where
@ -205,6 +208,7 @@ function handle_POST(event)
return;
end
module:log("warn", "Unable to associate request with a session (incomplete request?)");
report_bad_sid();
local close_reply = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate",
["xmlns:stream"] = xmlns_streams, condition = "item-not-found" });
return tostring(close_reply) .. "\n";
@ -272,6 +276,7 @@ function stream_callbacks.streamopened(context, attr)
local wait = tonumber(attr.wait);
if not to_host then
log("debug", "BOSH client tried to connect to invalid host: %s", tostring(attr.to));
report_bad_host();
local close_reply = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate",
["xmlns:stream"] = xmlns_streams, condition = "improper-addressing" });
response:send(tostring(close_reply));
@ -309,6 +314,7 @@ function stream_callbacks.streamopened(context, attr)
session.log("debug", "BOSH session created for request from %s", session.ip);
log("info", "New BOSH session, assigned it sid '%s'", sid);
report_new_sid();
module:fire_event("bosh-session", { session = session, request = request });
@ -363,6 +369,7 @@ function stream_callbacks.streamopened(context, attr)
if not session then
-- Unknown sid
log("info", "Client tried to use sid '%s' which we don't know about", sid);
report_bad_sid();
response:send(tostring(st.stanza("body", { xmlns = xmlns_bosh, type = "terminate", condition = "item-not-found" })));
context.notopen = nil;
return;
@ -511,8 +518,6 @@ module:provides("http", {
route = {
["GET"] = GET_response;
["GET /"] = GET_response;
["OPTIONS"] = handle_OPTIONS;
["OPTIONS /"] = handle_OPTIONS;
["POST"] = handle_POST;
["POST /"] = handle_POST;
};

17
plugins/mod_c2s.lua
View file

@ -106,7 +106,13 @@ function stream_callbacks.streamopened(session, attr)
if features.tags[1] or session.full_jid then
send(features);
else
(session.log or log)("warn", "No stream features to offer");
if session.secure then
-- Normally STARTTLS would be offered
(session.log or log)("warn", "No stream features to offer on secure session. Check authentication settings.");
else
-- Here SASL should be offered
(session.log or log)("warn", "No stream features to offer on insecure session. Check encryption and security settings.");
end
session:close{ condition = "undefined-condition", text = "No stream features to proceed with" };
end
end
@ -283,7 +289,7 @@ function listener.onconnect(conn)
if data then
local ok, err = stream:feed(data);
if not ok then
log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
log("debug", "Received invalid XML (%s) %d bytes: %q", tostring(err), #data, data:sub(1, 300));
session:close("not-well-formed");
end
end
@ -327,6 +333,13 @@ function listener.onreadtimeout(conn)
end
end
function listener.ondrain(conn)
local session = sessions[conn];
if session then
return (hosts[session.host] or prosody).events.fire_event("c2s-ondrain", { session = session });
end
end
local function keepalive(event)
local session = event.session;
if not session.notopen then

4
plugins/mod_component.lua
View file

@ -49,6 +49,7 @@ function module.add_host(module)
local send;
local function on_destroy(session, err) --luacheck: ignore 212/err
module:set_status("warn", err and ("Disconnected: "..err) or "Disconnected");
env.connected = false;
env.session = false;
send = nil;
@ -102,6 +103,7 @@ function module.add_host(module)
module:log("info", "External component successfully authenticated");
session.send(st.stanza("handshake"));
module:fire_event("component-authenticated", { session = session });
module:set_status("info", "Connected");
return true;
end
@ -310,7 +312,7 @@ function listener.onconnect(conn)
function session.data(_, data)
local ok, err = stream:feed(data);
if ok then return; end
module:log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
log("debug", "Received invalid XML (%s) %d bytes: %q", tostring(err), #data, data:sub(1, 300));
session:close("not-well-formed");
end

141
plugins/mod_csi_simple.lua
View file

@ -9,40 +9,7 @@ module:depends"csi"
local jid = require "util.jid";
local st = require "util.stanza";
local dt = require "util.datetime";
local new_queue = require "util.queue".new;
local function new_pump(output, ...)
-- luacheck: ignore 212/self
local q = new_queue(...);
local flush = true;
function q:pause()
flush = false;
end
function q:resume()
flush = true;
return q:flush();
end
local push = q.push;
function q:push(item)
local ok = push(self, item);
if not ok then
q:flush();
output(item, self);
elseif flush then
return q:flush();
end
return true;
end
function q:flush()
local item = self:pop();
while item do
output(item, self);
item = self:pop();
end
return true;
end
return q;
end
local filters = require "util.filters";
local queue_size = module:get_option_number("csi_queue_size", 256);
@ -84,37 +51,93 @@ module:hook("csi-is-stanza-important", function (event)
return true;
end, -1);
local function with_timestamp(stanza, from)
if st.is_stanza(stanza) and stanza.attr.xmlns == nil and stanza.name ~= "iq" then
stanza = st.clone(stanza);
stanza:add_direct_child(st.stanza("delay", {xmlns = "urn:xmpp:delay", from = from, stamp = dt.datetime()}));
end
return stanza;
end
local function manage_buffer(stanza, session)
local ctr = session.csi_counter or 0;
if ctr >= queue_size then
session.log("debug", "Queue size limit hit, flushing buffer (queue size is %d)", session.csi_counter);
session.conn:resume_writes();
elseif module:fire_event("csi-is-stanza-important", { stanza = stanza, session = session }) then
session.log("debug", "Important stanza, flushing buffer (queue size is %d)", session.csi_counter);
session.conn:resume_writes();
else
stanza = with_timestamp(stanza, jid.join(session.username, session.host))
end
session.csi_counter = ctr + 1;
return stanza;
end
local function flush_buffer(data, session)
session.log("debug", "Client sent something, flushing buffer once (queue size is %d)", session.csi_counter);
session.conn:resume_writes();
return data;
end
function enable_optimizations(session)
if session.conn and session.conn and session.conn.pause_writes then
session.conn:pause_writes();
filters.add_filter(session, "stanzas/out", manage_buffer);
filters.add_filter(session, "bytes/in", flush_buffer);
else
session.log("warn", "Session connection does not support write pausing");
end
end
function disable_optimizations(session)
if session.conn and session.conn and session.conn.resume_writes then
filters.remove_filter(session, "stanzas/out", manage_buffer);
filters.remove_filter(session, "bytes/in", flush_buffer);
session.conn:resume_writes();
end
end
module:hook("csi-client-inactive", function (event)
local session = event.origin;
if session.pump then
session.pump:pause();
else
local bare_jid = jid.join(session.username, session.host);
local send = session.send;
session._orig_send = send;
local pump = new_pump(session.send, queue_size);
pump:pause();
session.pump = pump;
function session.send(stanza)
if session.state == "active" or module:fire_event("csi-is-stanza-important", { stanza = stanza, session = session }) then
pump:flush();
send(stanza);
else
if st.is_stanza(stanza) and stanza.attr.xmlns == nil and stanza.name ~= "iq" then
stanza = st.clone(stanza);
stanza:add_direct_child(st.stanza("delay", {xmlns = "urn:xmpp:delay", from = bare_jid, stamp = dt.datetime()}));
end
pump:push(stanza);
end
return true;
end
end
enable_optimizations(session);
end);
module:hook("csi-client-active", function (event)
local session = event.origin;
if session.pump then
session.pump:resume();
disable_optimizations(session);
end);
module:hook("pre-resource-unbind", function (event)
local session = event.session;
disable_optimizations(session);
end);
module:hook("c2s-ondrain", function (event)
local session = event.session;
if session.state == "inactive" and session.conn and session.conn and session.conn.pause_writes then
session.conn:pause_writes();
session.log("debug", "Buffer flushed, resuming inactive mode (queue size was %d)", session.csi_counter);
session.csi_counter = 0;
end
end);
function module.load()
for _, user_session in pairs(prosody.hosts[module.host].sessions) do
for _, session in pairs(user_session.sessions) do
if session.state == "inactive" then
enable_optimizations(session);
end
end
end
end
function module.unload()
for _, user_session in pairs(prosody.hosts[module.host].sessions) do
for _, session in pairs(user_session.sessions) do
if session.state == "inactive" then
disable_optimizations(session);
end
end
end
end

36
plugins/mod_http.lua
View file

@ -14,6 +14,7 @@ local moduleapi = require "core.moduleapi";
local url_parse = require "socket.url".parse;
local url_build = require "socket.url".build;
local normalize_path = require "util.http".normalize_path;
local set = require "util.set";
local server = require "net.http.server";
@ -22,6 +23,11 @@ server.set_default_host(module:get_option_string("http_default_host"));
server.set_option("body_size_limit", module:get_option_number("http_max_content_size"));
server.set_option("buffer_size_limit", module:get_option_number("http_max_buffer_size"));
-- CORS settigs
local opt_methods = module:get_option_set("access_control_allow_methods", { "GET", "OPTIONS" });
local opt_headers = module:get_option_set("access_control_allow_headers", { "Content-Type" });
local opt_max_age = module:get_option_number("access_control_max_age", 2 * 60 * 60);
local function get_http_event(host, app_path, key)
local method, path = key:match("^(%S+)%s+(.+)$");
if not method then -- No path specified, default to "" (base path)
@ -83,6 +89,13 @@ function moduleapi.http_url(module, app_name, default_path)
return "http://disabled.invalid/";
end
local function apply_cors_headers(response, methods, headers, max_age, origin)
response.headers.access_control_allow_methods = tostring(methods);
response.headers.access_control_allow_headers = tostring(headers);
response.headers.access_control_max_age = tostring(max_age)
response.headers.access_control_allow_origin = origin or "*";
end
function module.add_host(module)
local host = module.host;
if host ~= "*" then
@ -101,9 +114,27 @@ function module.add_host(module)
end
apps[app_name] = apps[app_name] or {};
local app_handlers = apps[app_name];
local app_methods = opt_methods;
local function cors_handler(event_data)
local request, response = event_data.request, event_data.response;
apply_cors_headers(response, app_methods, opt_headers, opt_max_age, request.headers.origin);
end
local function options_handler(event_data)
cors_handler(event_data);
return "";
end
for key, handler in pairs(event.item.route or {}) do
local event_name = get_http_event(host, app_path, key);
if event_name then
local method = event_name:match("^%S+");
if not app_methods:contains(method) then
app_methods = app_methods + set.new{ method };
end
local options_event_name = event_name:gsub("^%S+", "OPTIONS");
if type(handler) ~= "function" then
local data = handler;
handler = function () return data; end
@ -121,6 +152,8 @@ function module.add_host(module)
if not app_handlers[event_name] then
app_handlers[event_name] = handler;
module:hook_object_event(server, event_name, handler);
module:hook_object_event(server, event_name, cors_handler, 1);
module:hook_object_event(server, options_event_name, options_handler, -1);
else
module:log("warn", "App %s added handler twice for '%s', ignoring", app_name, event_name);
end
@ -195,9 +228,6 @@ module:provides("net", {
listener = server.listener;
default_port = 5281;
encryption = "ssl";
ssl_config = {
verify = "none";
};
multiplex = {
pattern = "^[A-Z]";
};

25
plugins/mod_http_errors.lua
View file

@ -26,21 +26,24 @@ local html = [[
<meta charset="utf-8">
<title>{title}</title>
<style>
body{
margin-top:14%;
text-align:center;
background-color:#F8F8F8;
font-family:sans-serif;
body {
margin-top : 14%;
text-align : center;
background-color : #F8F8F8;
font-family : sans-serif
}
h1{
font-size:xx-large;
h1 {
font-size : xx-large
}
p{
font-size:x-large;
p {
font-size : x-large
}
p+p {
font-size:large;
font-family:courier;
font-size : large;
font-family : courier
}
</style>
</head>

171
plugins/mod_http_files.lua
View file

@ -7,14 +7,9 @@
--
module:depends("http");
local server = require"net.http.server";
local lfs = require "lfs";
local os_date = os.date;
local open = io.open;
local stat = lfs.attributes;
local build_path = require"socket.url".build_path;
local path_sep = package.config:sub(1,1);
local fileserver = require"net.http.files";
local base_path = module:get_option_path("http_files_dir", module:get_option_path("http_path"));
local cache_size = module:get_option_number("http_files_cache_size", 128);
@ -51,148 +46,56 @@ if not mime_map then
end
end
local forbidden_chars_pattern = "[/%z]";
if prosody.platform == "windows" then
forbidden_chars_pattern = "[/%z\001-\031\127\"*:<>?|]"
local function get_calling_module()
local info = debug.getinfo(3, "S");
if not info then return "An unknown module"; end
return info.source:match"mod_[^/\\.]+" or info.short_src;
end
local urldecode = require "util.http".urldecode;
function sanitize_path(path)
if not path then return end
local out = {};
local c = 0;
for component in path:gmatch("([^/]+)") do
component = urldecode(component);
if component:find(forbidden_chars_pattern) then
return nil;
elseif component == ".." then
if c <= 0 then
return nil;
end
out[c] = nil;
c = c - 1;
elseif component ~= "." then
c = c + 1;
out[c] = component;
end
end
if path:sub(-1,-1) == "/" then
out[c+1] = "";
end
return "/"..table.concat(out, "/");
end
local cache = require "util.cache".new(cache_size);
-- COMPAT -- TODO deprecate
function serve(opts)
if type(opts) ~= "table" then -- assume path string
opts = { path = opts };
end
-- luacheck: ignore 431
local base_path = opts.path;
local dir_indices = opts.index_files or dir_indices;
local directory_index = opts.directory_index;
local function serve_file(event, path)
local request, response = event.request, event.response;
local sanitized_path = sanitize_path(path);
if path and not sanitized_path then
return 400;
end
path = sanitized_path;
local orig_path = sanitize_path(request.path);
local full_path = base_path .. (path or ""):gsub("/", path_sep);
local attr = stat(full_path:match("^.*[^\\/]")); -- Strip trailing path separator because Windows
if not attr then
return 404;
end
local request_headers, response_headers = request.headers, response.headers;
local last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification);
response_headers.last_modified = last_modified;
local etag = ('"%02x-%x-%x-%x"'):format(attr.dev or 0, attr.ino or 0, attr.size or 0, attr.modification or 0);
response_headers.etag = etag;
local if_none_match = request_headers.if_none_match
local if_modified_since = request_headers.if_modified_since;
if etag == if_none_match
or (not if_none_match and last_modified == if_modified_since) then
return 304;
end
local data = cache:get(orig_path);
if data and data.etag == etag then
response_headers.content_type = data.content_type;
data = data.data;
elseif attr.mode == "directory" and path then
if full_path:sub(-1) ~= "/" then
local dir_path = { is_absolute = true, is_directory = true };
for dir in orig_path:gmatch("[^/]+") do dir_path[#dir_path+1]=dir; end
response_headers.location = build_path(dir_path);
return 301;
end
for i=1,#dir_indices do
if stat(full_path..dir_indices[i], "mode") == "file" then
return serve_file(event, path..dir_indices[i]);
end
end
if directory_index then
data = server._events.fire_event("directory-index", { path = request.path, full_path = full_path });
end
if not data then
return 403;
end
cache:set(orig_path, { data = data, content_type = mime_map.html; etag = etag; });
response_headers.content_type = mime_map.html;
else
local f, err = open(full_path, "rb");
if not f then
module:log("debug", "Could not open %s. Error was %s", full_path, err);
return 403;
end
local ext = full_path:match("%.([^./]+)$");
local content_type = ext and mime_map[ext];
response_headers.content_type = content_type;
if attr.size > cache_max_file_size then
response_headers.content_length = attr.size;
module:log("debug", "%d > cache_max_file_size", attr.size);
return response:send_file(f);
else
data = f:read("*a");
f:close();
end
cache:set(orig_path, { data = data; content_type = content_type; etag = etag });
end
return response:send(data);
if opts.directory_index == nil then
opts.directory_index = directory_index;
end
return serve_file;
if opts.mime_map == nil then
opts.mime_map = mime_map;
end
if opts.cache_size == nil then
opts.cache_size = cache_size;
end
if opts.cache_max_file_size == nil then
opts.cache_max_file_size = cache_max_file_size;
end
if opts.index_files == nil then
opts.index_files = dir_indices;
end
-- TODO Crank up to warning
module:log("debug", "%s should be updated to use 'net.http.files' insead of mod_http_files", get_calling_module());
return fileserver.serve(opts);
end
function wrap_route(routes)
module:log("debug", "%s should be updated to use 'net.http.files' insead of mod_http_files", get_calling_module());
for route,handler in pairs(routes) do
if type(handler) ~= "function" then
routes[route] = serve(handler);
routes[route] = fileserver.serve(handler);
end
end
return routes;
end
if base_path then
module:provides("http", {
route = {
["GET /*"] = serve {
path = base_path;
directory_index = directory_index;
}
};
});
else
module:log("debug", "http_files_dir not set, assuming use by some other module");
end
module:provides("http", {
route = {
["GET /*"] = fileserver.serve({
path = base_path;
directory_index = directory_index;
mime_map = mime_map;
cache_size = cache_size;
cache_max_file_size = cache_max_file_size;
index_files = dir_indices;
});
};
});

27
plugins/mod_limits.lua
View file

@ -51,18 +51,18 @@ end
local default_filter_set = {};
function default_filter_set.bytes_in(bytes, session)
local sess_throttle = session.throttle;
if sess_throttle then
local ok, balance, outstanding = sess_throttle:poll(#bytes, true);
local sess_throttle = session.throttle;
if sess_throttle then
local ok, balance, outstanding = sess_throttle:poll(#bytes, true);
if not ok then
session.log("debug", "Session over rate limit (%d) with %d (by %d), pausing", sess_throttle.max, #bytes, outstanding);
session.log("debug", "Session over rate limit (%d) with %d (by %d), pausing", sess_throttle.max, #bytes, outstanding);
outstanding = ceil(outstanding);
session.conn:pause(); -- Read no more data from the connection until there is no outstanding data
local outstanding_data = bytes:sub(-outstanding);
bytes = bytes:sub(1, #bytes-outstanding);
timer.add_task(limits_resolution, function ()
if not session.conn then return; end
if sess_throttle:peek(#outstanding_data) then
if sess_throttle:peek(#outstanding_data) then
session.log("debug", "Resuming paused session");
session.conn:resume();
end
@ -96,3 +96,20 @@ end
function module.unload()
filters.remove_filter_hook(filter_hook);
end
function module.add_host(module)
local unlimited_jids = module:get_option_inherited_set("unlimited_jids", {});
if not unlimited_jids:empty() then
module:hook("authentication-success", function (event)
local session = event.session;
local session_type = session.type:match("^[^_]+");
local jid = session.username .. "@" .. session.host;
if unlimited_jids:contains(jid) then
local filter_set = type_filters[session_type];
filters.remove_filter(session, "bytes/in", filter_set.bytes_in);
session.throttle = nil;
end
end);
end
end

37
plugins/mod_mam/mod_mam.lua
View file

@ -40,6 +40,9 @@ local strip_tags = module:get_option_set("dont_archive_namespaces", { "http://ja
local archive_store = module:get_option_string("archive_store", "archive");
local archive = module:open_store(archive_store, "archive");
local cleanup_after = module:get_option_string("archive_expires_after", "1w");
local cleanup_interval = module:get_option_number("archive_cleanup_interval", 4 * 60 * 60);
local archive_item_limit = module:get_option_number("storage_archive_item_limit", archive.caps and archive.caps.quota or 1000);
if not archive.find then
error("mod_"..(archive._provided_by or archive.name and "storage_"..archive.name).." does not support archiving\n"
.."See https://prosody.im/doc/storage and https://prosody.im/doc/archiving for more information");
@ -138,7 +141,11 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
});
if not data then
origin.send(st.error_reply(stanza, "cancel", "internal-server-error", err));
if err == "item-not-found" then
origin.send(st.error_reply(stanza, "modify", "item-not-found"));
else
origin.send(st.error_reply(stanza, "cancel", "internal-server-error"));
end
return true;
end
local total = tonumber(err);
@ -295,7 +302,28 @@ local function message_handler(event, c2s)
log("debug", "Archiving stanza: %s", stanza:top_tag());
-- And stash it
local ok = archive:append(store_user, nil, clone_for_storage, time_now(), with);
local time = time_now();
local ok, err = archive:append(store_user, nil, clone_for_storage, time, with);
if not ok and err == "quota-limit" then
if type(cleanup_after) == "number" then
module:log("debug", "User '%s' over quota, cleaning archive", store_user);
local cleaned = archive:delete(store_user, {
["end"] = (os.time() - cleanup_after);
});
if cleaned then
ok, err = archive:append(store_user, nil, clone_for_storage, time, with);
end
end
if not ok and (archive.caps and archive.caps.truncate) then
module:log("debug", "User '%s' over quota, truncating archive", store_user);
local truncated = archive:delete(store_user, {
truncate = archive_item_limit - 1;
});
if truncated then
ok, err = archive:append(store_user, nil, clone_for_storage, time, with);
end
end
end
if ok then
local clone_for_other_handlers = st.clone(stanza);
local id = ok;
@ -321,8 +349,6 @@ end
module:hook("pre-message/bare", strip_stanza_id_after_other_events, -1);
module:hook("pre-message/full", strip_stanza_id_after_other_events, -1);
local cleanup_after = module:get_option_string("archive_expires_after", "1w");
local cleanup_interval = module:get_option_number("archive_cleanup_interval", 4 * 60 * 60);
if cleanup_after ~= "never" then
local cleanup_storage = module:open_store("archive_cleanup");
local cleanup_map = module:open_store("archive_cleanup", "map");
@ -357,8 +383,10 @@ if cleanup_after ~= "never" then
last_date:set(username, date);
end
end
local cleanup_time = module:measure("cleanup", "times");
cleanup_runner = require "util.async".runner(function ()
local cleanup_done = cleanup_time();
local users = {};
local cut_off = datestamp(os.time() - cleanup_after);
for date in cleanup_storage:users() do
@ -386,6 +414,7 @@ if cleanup_after ~= "never" then
end
end
module:log("info", "Deleted %d expired messages for %d users", sum, num_users);
cleanup_done();
end);
cleanup_task = module:add_timer(1, function ()

85
plugins/mod_mimicking.lua Normal file
View file

@ -0,0 +1,85 @@
-- Prosody IM
-- Copyright (C) 2012 Florian Zeitz
-- Copyright (C) 2019 Kim Alvefur
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
local encodings = require "util.encodings";
assert(encodings.confusable, "This module requires that Prosody be built with ICU");
local skeleton = encodings.confusable.skeleton;
local usage = require "util.prosodyctl".show_usage;
local usermanager = require "core.usermanager";
local storagemanager = require "core.storagemanager";
local skeletons
function module.load()
if module.host ~= "*" then
skeletons = module:open_store("skeletons");
end
end
module:hook("user-registered", function(user)
local skel = skeleton(user.username);
local ok, err = skeletons:set(skel, { username = user.username });
if not ok then
module:log("error", "Unable to store mimicry data (%q => %q): %s", user.username, skel, err);
end
end);
module:hook("user-deleted", function(user)
local skel = skeleton(user.username);
local ok, err = skeletons:set(skel, nil);
if not ok and err then
module:log("error", "Unable to clear mimicry data (%q): %s", skel, err);
end
end);
module:hook("user-registering", function(user)
local existing, err = skeletons:get(skeleton(user.username));
if existing then
module:log("debug", "Attempt to register username '%s' which could be confused with '%s'", user.username, existing.username);
user.allowed = false;
elseif err then
module:log("error", "Unable to check if new username '%s' can be confused with any existing user: %s", err);
end
end);
function module.command(arg)
if (arg[1] ~= "bootstrap" or not arg[2]) then
usage("mod_mimicking bootstrap <host>", "Initialize username mimicry database");
return;
end
local host = arg[2];
local host_session = prosody.hosts[host];
if not host_session then
return "No such host";
end
storagemanager.initialize_host(host);
usermanager.initialize_host(host);
skeletons = storagemanager.open(host, "skeletons");
local count = 0;
for user in usermanager.users(host) do
local skel = skeleton(user);
local existing, err = skeletons:get(skel);
if existing and existing.username ~= user then
module:log("warn", "Existing usernames '%s' and '%s' are confusable", existing.username, user);
elseif err then
module:log("error", "Error checking for existing mimicry data (%q = %q): %s", user, skel, err);
end
local ok, err = skeletons:set(skel, { username = user });
if ok then
count = count + 1;
elseif err then
module:log("error", "Unable to store mimicry data (%q => %q): %s", user, skel, err);
end
end
module:log("info", "%d usernames indexed", count);
end

50
plugins/mod_muc_mam.lua
View file

@ -4,7 +4,7 @@
-- This file is MIT/X11 licensed.
if module:get_host_type() ~= "component" then
module:log("error", "mod_%s should be loaded only on a MUC component, not normal hosts", module.name);
module:log_status("error", "mod_%s should be loaded only on a MUC component, not normal hosts", module.name);
return;
end
@ -21,6 +21,7 @@ local jid_bare = require "util.jid".bare;
local jid_split = require "util.jid".split;
local jid_prep = require "util.jid".prep;
local dataform = require "util.dataforms".new;
local get_form_type = require "util.dataforms".get_type;
local mod_muc = module:depends"muc";
local get_room_from_jid = mod_muc.get_room_from_jid;
@ -32,6 +33,9 @@ local m_min = math.min;
local timestamp, timestamp_parse, datestamp = import( "util.datetime", "datetime", "parse", "date");
local default_max_items, max_max_items = 20, module:get_option_number("max_archive_query_results", 50);
local cleanup_after = module:get_option_string("muc_log_expires_after", "1w");
local cleanup_interval = module:get_option_number("muc_log_cleanup_interval", 4 * 60 * 60);
local default_history_length = 20;
local max_history_length = module:get_option_number("max_history_messages", math.huge);
@ -49,6 +53,8 @@ local log_by_default = module:get_option_boolean("muc_log_by_default", true);
local archive_store = "muc_log";
local archive = module:open_store(archive_store, "archive");
local archive_item_limit = module:get_option_number("storage_archive_item_limit", archive.caps and archive.caps.quota or 1000);
if archive.name == "null" or not archive.find then
if not archive.find then
module:log("error", "Attempt to open archive storage returned a driver without archive API support");
@ -63,12 +69,15 @@ end
local function archiving_enabled(room)
if log_all_rooms then
module:log("debug", "Archiving all rooms");
return true;
end
local enabled = room._data.archiving;
if enabled == nil then
module:log("debug", "Default is %s (for %s)", log_by_default, room.jid);
return log_by_default;
end
module:log("debug", "Logging in room %s is %s", room.jid, enabled);
return enabled;
end
@ -135,7 +144,11 @@ module:hook("iq-set/bare/"..xmlns_mam..":query", function(event)
local qstart, qend;
local form = query:get_child("x", "jabber:x:data");
if form then
local err;
local form_type, err = get_form_type(form);
if form_type ~= xmlns_mam then
origin.send(st.error_reply(stanza, "modify", "bad-request", "Unexpected FORM_TYPE, expected '"..xmlns_mam.."'"));
return true;
end
form, err = query_form:data(form);
if err then
origin.send(st.error_reply(stanza, "modify", "bad-request", select(2, next(err))));
@ -176,7 +189,11 @@ module:hook("iq-set/bare/"..xmlns_mam..":query", function(event)
});
if not data then
origin.send(st.error_reply(stanza, "cancel", "internal-server-error"));
if err == "item-not-found" then
origin.send(st.error_reply(stanza, "modify", "item-not-found"));
else
origin.send(st.error_reply(stanza, "cancel", "internal-server-error"));
end
return true;
end
local total = tonumber(err);
@ -352,7 +369,29 @@ local function save_to_history(self, stanza)
end
-- And stash it
local id = archive:append(room_node, nil, stored_stanza, time_now(), with);
local time = time_now();
local id, err = archive:append(room_node, nil, stored_stanza, time, with);
if not id and err == "quota-limit" then
if type(cleanup_after) == "number" then
module:log("debug", "Room '%s' over quota, cleaning archive", room_node);
local cleaned = archive:delete(room_node, {
["end"] = (os.time() - cleanup_after);
});
if cleaned then
id, err = archive:append(room_node, nil, stored_stanza, time, with);
end
end
if not id and (archive.caps and archive.caps.truncate) then
module:log("debug", "User '%s' over quota, truncating archive", room_node);
local truncated = archive:delete(room_node, {
truncate = archive_item_limit - 1;
});
if truncated then
id, err = archive:append(room_node, nil, stored_stanza, time, with);
end
end
end
if id then
schedule_cleanup(room_node);
@ -394,9 +433,6 @@ end);
-- Cleanup
local cleanup_after = module:get_option_string("muc_log_expires_after", "1w");
local cleanup_interval = module:get_option_number("muc_log_cleanup_interval", 4 * 60 * 60);
if cleanup_after ~= "never" then
local cleanup_storage = module:open_store("muc_log_cleanup");
local cleanup_map = module:open_store("muc_log_cleanup", "map");

17
plugins/mod_pep.lua
View file

@ -8,6 +8,7 @@ local calculate_hash = require "util.caps".calculate_hash;
local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
local cache = require "util.cache";
local set = require "util.set";
local new_id = require "util.id".medium;
local storagemanager = require "core.storagemanager";
local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
@ -138,9 +139,6 @@ local function get_broadcaster(username)
if kind == "retract" then
kind = "items"; -- XEP-0060 signals retraction in an <items> container
end
local message = st.message({ from = user_bare, type = "headline" })
:tag("event", { xmlns = xmlns_pubsub_event })
:tag(kind, { node = node });
if item then
item = st.clone(item);
item.attr.xmlns = nil; -- Clear the pubsub namespace
@ -149,10 +147,19 @@ local function get_broadcaster(username)
item:maptags(function () return nil; end);
end
end
end
local id = new_id();
local message = st.message({ from = user_bare, type = "headline", id = id })
:tag("event", { xmlns = xmlns_pubsub_event })
:tag(kind, { node = node });
if item then
message:add_child(item);
end
for jid in pairs(jids) do
module:log("debug", "Sending notification to %s from %s: %s", jid, user_bare, tostring(item));
module:log("debug", "Sending notification to %s from %s for node %s", jid, user_bare, node);
message.attr.to = jid;
module:send(message);
end
@ -252,8 +259,6 @@ end
module:hook("iq/bare/"..xmlns_pubsub..":pubsub", handle_pubsub_iq);
module:hook("iq/bare/"..xmlns_pubsub_owner..":pubsub", handle_pubsub_iq);
module:add_identity("pubsub", "pep", module:get_option_string("name", "Prosody"));
module:add_feature("http://jabber.org/protocol/pubsub#publish");
local function get_caps_hash_from_presence(stanza, current)
local t = stanza.attr.type;

1
plugins/mod_pep_simple.lua
View file

@ -14,6 +14,7 @@ local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed
local pairs = pairs;
local next = next;
local type = type;
local unpack = table.unpack or unpack; -- luacheck: ignore 113
local calculate_hash = require "util.caps".calculate_hash;
local core_post_stanza = prosody.core_post_stanza;
local bare_sessions = prosody.bare_sessions;

14
plugins/mod_posix.lua
View file

@ -20,7 +20,6 @@ if not have_signal then
module:log("warn", "Couldn't load signal library, won't respond to SIGTERM");
end
local format = require "util.format".format;
local lfs = require "lfs";
local stat = lfs.attributes;
@ -113,19 +112,6 @@ local function write_pidfile()
end
end
local syslog_opened;
function syslog_sink_maker(config) -- luacheck: ignore 212/config
if not syslog_opened then
pposix.syslog_open("prosody", module:get_option_string("syslog_facility"));
syslog_opened = true;
end
local syslog = pposix.syslog_log;
return function (name, level, message, ...)
syslog(level, name, format(message, ...));
end;
end
require "core.loggingmanager".register_sink_type("syslog", syslog_sink_maker);
local daemonize = module:get_option("daemonize", prosody.installed);
local function remove_log_sinks()

12
plugins/mod_presence.lua
View file

@ -81,8 +81,14 @@ function handle_normal_presence(origin, stanza)
res.presence.attr.to = nil;
end
end
for jid in pairs(roster[false].pending) do -- resend incoming subscription requests
origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original?
for jid, pending_request in pairs(roster[false].pending) do -- resend incoming subscription requests
if type(pending_request) == "table" then
local subscribe = st.deserialize(pending_request);
subscribe.attr.type, subscribe.attr.from = "subscribe", jid;
origin.send(subscribe);
else
origin.send(st.presence({type="subscribe", from=jid}));
end
end
local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host});
for jid, item in pairs(roster) do -- resend outgoing subscription requests
@ -226,7 +232,7 @@ function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_b
else
core_post_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unavailable"}), true); -- acknowledging receipt
if not rostermanager.is_contact_pending_in(node, host, from_bare) then
if rostermanager.set_contact_pending_in(node, host, from_bare) then
if rostermanager.set_contact_pending_in(node, host, from_bare, stanza) then
sessionmanager.send_to_available_resources(node, host, stanza);
end -- TODO else return error, unable to save
end

7
plugins/mod_pubsub/mod_pubsub.lua
View file

@ -75,7 +75,7 @@ function simple_broadcast(kind, node, jids, item, actor, node_obj)
local msg_type = node_obj and node_obj.config.message_type or "headline";
local message = st.message({ from = module.host, type = msg_type, id = id })
:tag("event", { xmlns = xmlns_pubsub_event })
:tag(kind, { node = node })
:tag(kind, { node = node });
if item then
message:add_child(item);
@ -101,11 +101,12 @@ function simple_broadcast(kind, node, jids, item, actor, node_obj)
end
local max_max_items = module:get_option_number("pubsub_max_items", 256);
function check_node_config(node, actor, new_config) -- luacheck: ignore 212/actor 212/node
function check_node_config(node, actor, new_config) -- luacheck: ignore 212/node 212/actor
if (new_config["max_items"] or 1) > max_max_items then
return false;
end
if new_config["access_model"] ~= "whitelist" and new_config["access_model"] ~= "open" then
if new_config["access_model"] ~= "whitelist"
and new_config["access_model"] ~= "open" then
return false;
end
return true;

6
plugins/mod_s2s/mod_s2s.lua
View file

@ -595,8 +595,7 @@ local function initialize_session(session)
if data then
local ok, err = stream:feed(data);
if ok then return; end
log("warn", "Received invalid XML: %s", data);
log("warn", "Problem was: %s", err);
log("debug", "Received invalid XML (%s) %d bytes: %q", tostring(err), #data, data:sub(1, 300));
session:close("not-well-formed");
end
end
@ -739,6 +738,9 @@ module:provides("net", {
listener = listener;
default_port = 5269;
encryption = "starttls";
ssl_config = { -- FIXME This is not used atm, see mod_tls
verify = { "peer", "client_once", };
};
multiplex = {
pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:server%1.*>";
};

2
plugins/mod_s2s/s2sout.lib.lua
View file

@ -318,7 +318,7 @@ module:hook_global("service-added", function (event)
local s2s_sources = portmanager.get_active_services():get("s2s");
if not s2s_sources then
module:log("warn", "s2s not listening on any ports, outgoing connections may fail");
module:log_status("warn", "s2s not listening on any ports, outgoing connections may fail");
return;
end
for source, _ in pairs(s2s_sources) do

5
plugins/mod_saslauth.lua
View file

@ -248,7 +248,7 @@ module:hook("stream-features", function(event)
local sasl_handler = usermanager_get_sasl_handler(module.host, origin)
origin.sasl_handler = sasl_handler;
if origin.encrypted then
-- check wether LuaSec has the nifty binding to the function needed for tls-unique
-- check whether LuaSec has the nifty binding to the function needed for tls-unique
-- FIXME: would be nice to have this check only once and not for every socket
if sasl_handler.add_cb_handler then
local socket = origin.conn:socket();
@ -275,7 +275,8 @@ module:hook("stream-features", function(event)
if mechanisms[1] then
features:add_child(mechanisms);
elseif not next(sasl_mechanisms) then
log("warn", "No available SASL mechanisms, verify that the configured authentication module is working");
local authmod = module:get_option_string("authentication", "internal_plain");
log("error", "No available SASL mechanisms, verify that the configured authentication module '%s' is loaded and configured correctly", authmod);
else
log("warn", "All available authentication mechanisms are either disabled or not suitable for an insecure connection");
end

88
plugins/mod_storage_internal.lua
View file

@ -1,12 +1,17 @@
local cache = require "util.cache";
local datamanager = require "core.storagemanager".olddm;
local array = require "util.array";
local datetime = require "util.datetime";
local st = require "util.stanza";
local now = require "util.time".now;
local id = require "util.id".medium;
local jid_join = require "util.jid".join;
local host = module.host;
local archive_item_limit = module:get_option_number("storage_archive_item_limit", 10000);
local archive_item_count_cache = cache.new(module:get_option("storage_archive_item_limit_cache_size", 1000));
local driver = {};
function driver:open(store, typ)
@ -43,6 +48,12 @@ end
local archive = {};
driver.archive = { __index = archive };
archive.caps = {
total = true;
quota = archive_item_limit;
truncate = true;
};
function archive:append(username, key, value, when, with)
when = when or now();
if not st.is_stanza(value) then
@ -54,28 +65,57 @@ function archive:append(username, key, value, when, with)
value.attr.stamp = datetime.datetime(when);
value.attr.stamp_legacy = datetime.legacy(when);
local cache_key = jid_join(username, host, self.store);
local item_count = archive_item_count_cache:get(cache_key);
if key then
local items, err = datamanager.list_load(username, host, self.store);
if not items and err then return items, err; end
-- Check the quota
item_count = items and #items or 0;
archive_item_count_cache:set(cache_key, item_count);
if item_count >= archive_item_limit then
module:log("debug", "%s reached or over quota, not adding to store", username);
return nil, "quota-limit";
end
if items then
-- Filter out any item with the same key as the one being added
items = array(items);
items:filter(function (item)
return item.key ~= key;
end);
value.key = key;
items:push(value);
local ok, err = datamanager.list_store(username, host, self.store, items);
if not ok then return ok, err; end
archive_item_count_cache:set(cache_key, #items);
return key;
end
else
if not item_count then -- Item count not cached?
-- We need to load the list to get the number of items currently stored
local items, err = datamanager.list_load(username, host, self.store);
if not items and err then return items, err; end
item_count = items and #items or 0;
archive_item_count_cache:set(cache_key, item_count);
end
if item_count >= archive_item_limit then
module:log("debug", "%s reached or over quota, not adding to store", username);
return nil, "quota-limit";
end
key = id();
end
module:log("debug", "%s has %d items out of %d limit in store %s", username, item_count, archive_item_limit, self.store);
value.key = key;
local ok, err = datamanager.list_append(username, host, self.store, value);
if not ok then return ok, err; end
archive_item_count_cache:set(cache_key, item_count+1);
return key;
end
@ -84,11 +124,17 @@ function archive:find(username, query)
if not items then
if err then
return items, err;
else
return function () end, 0;
elseif query then
if query.before or query.after then
return nil, "item-not-found";
end
if query.total then
return function () end, 0;
end
end
return function () end;
end
local count = #items;
local count = nil;
local i = 0;
if query then
items = array(items);
@ -112,24 +158,36 @@ function archive:find(username, query)
return item.when <= query["end"];
end);
end
count = #items;
if query.total then
count = #items;
end
if query.reverse then
items:reverse();
if query.before then
for j = 1, count do
local found = false;
for j = 1, #items do
if (items[j].key or tostring(j)) == query.before then
found = true;
i = j;
break;
end
end
if not found then
return nil, "item-not-found";
end
end
elseif query.after then
for j = 1, count do
local found = false;
for j = 1, #items do
if (items[j].key or tostring(j)) == query.after then
found = true;
i = j;
break;
end
end
if not found then
return nil, "item-not-found";
end
end
if query.limit and #items - i > query.limit then
items[i+query.limit+1] = nil;
@ -156,8 +214,24 @@ function archive:dates(username)
return array(items):pluck("when"):map(datetime.date):unique();
end
function archive:summary(username, query)
local iter, err = self:find(username, query)
if not iter then return iter, err; end
local summary = {};
for _, _, _, with in iter do
summary[with] = (summary[with] or 0) + 1;
end
return summary;
end
function archive:users()
return datamanager.users(host, self.store, "list");
end
function archive:delete(username, query)
local cache_key = jid_join(username, host, self.store);
if not query or next(query) == nil then
archive_item_count_cache:set(cache_key, nil);
return datamanager.list_store(username, host, self.store, nil);
end
local items, err = datamanager.list_load(username, host, self.store);
@ -165,6 +239,7 @@ function archive:delete(username, query)
if err then
return items, err;
end
archive_item_count_cache:set(cache_key, 0);
-- Store is empty
return 0;
end
@ -214,6 +289,7 @@ function archive:delete(username, query)
end
local ok, err = datamanager.list_store(username, host, self.store, items);
if not ok then return ok, err; end
archive_item_count_cache:set(cache_key, #items);
return count;
end

50
plugins/mod_storage_memory.lua
View file

@ -8,6 +8,8 @@ local new_id = require "util.id".medium;
local auto_purge_enabled = module:get_option_boolean("storage_memory_temporary", false);
local auto_purge_stores = module:get_option_set("storage_memory_temporary_stores", {});
local archive_item_limit = module:get_option_number("storage_archive_item_limit", 1000);
local memory = setmetatable({}, {
__index = function(t, k)
local store = module:shared(k)
@ -51,6 +53,12 @@ archive_store.__index = archive_store;
archive_store.users = _users;
archive_store.caps = {
total = true;
quota = archive_item_limit;
truncate = true;
};
function archive_store:append(username, key, value, when, with)
if is_stanza(value) then
value = st.preserialize(value);
@ -70,6 +78,8 @@ function archive_store:append(username, key, value, when, with)
end
if a[key] then
table.remove(a, a[key]);
elseif #a >= archive_item_limit then
return nil, "quota-limit";
end
local i = #a+1;
a[i] = v;
@ -80,9 +90,17 @@ end
function archive_store:find(username, query)
local items = self.store[username or NULL];
if not items then
return function () end, 0;
if query then
if query.before or query.after then
return nil, "item-not-found";
end
if query.total then
return function () end, 0;
end
end
return function () end;
end
local count = #items;
local count = nil;
local i = 0;
if query then
items = array():append(items);
@ -106,24 +124,36 @@ function archive_store:find(username, query)
return item.when <= query["end"];
end);
end
count = #items;
if query.total then
count = #items;
end
if query.reverse then
items:reverse();
if query.before then
for j = 1, count do
local found = false;
for j = 1, #items do
if (items[j].key or tostring(j)) == query.before then
found = true;
i = j;
break;
end
end
if not found then
return nil, "item-not-found";
end
end
elseif query.after then
for j = 1, count do
local found = false;
for j = 1, #items do
if (items[j].key or tostring(j)) == query.after then
found = true;
i = j;
break;
end
end
if not found then
return nil, "item-not-found";
end
end
if query.limit and #items - i > query.limit then
items[i+query.limit+1] = nil;
@ -137,6 +167,16 @@ function archive_store:find(username, query)
end, count;
end
function archive_store:summary(username, query)
local iter, err = self:find(username, query)
if not iter then return iter, err; end
local summary = {};
for _, _, _, with in iter do
summary[with] = (summary[with] or 0) + 1;
end
return summary;
end
function archive_store:delete(username, query)
if not query or next(query) == nil then

180
plugins/mod_storage_sql.lua
View file

@ -1,17 +1,19 @@
-- luacheck: ignore 212/self
local cache = require "util.cache";
local json = require "util.json";
local sql = require "util.sql";
local xml_parse = require "util.xml".parse;
local uuid = require "util.uuid";
local resolve_relative_path = require "util.paths".resolve_relative_path;
local jid_join = require "util.jid".join;
local is_stanza = require"util.stanza".is_stanza;
local t_concat = table.concat;
local noop = function() end
local unpack = table.unpack or unpack;
local unpack = table.unpack or unpack; -- luacheck: ignore 113
local function iterator(result)
return function(result_)
local row = result_();
@ -148,7 +150,10 @@ end
--- Archive store API
-- luacheck: ignore 512 431/user 431/store
local archive_item_limit = module:get_option_number("storage_archive_item_limit");
local archive_item_count_cache = cache.new(module:get_option("storage_archive_item_limit_cache_size", 1000));
-- luacheck: ignore 512 431/user 431/store 431/err
local map_store = {};
map_store.__index = map_store;
map_store.remove = {};
@ -228,10 +233,41 @@ end
local archive_store = {}
archive_store.caps = {
total = true;
quota = archive_item_limit;
truncate = true;
};
archive_store.__index = archive_store
function archive_store:append(username, key, value, when, with)
local user,store = username,self.store;
local cache_key = jid_join(username, host, store);
local item_count = archive_item_count_cache:get(cache_key);
if not item_count then
local ok, ret = engine:transaction(function()
local count_sql = [[
SELECT COUNT(*) FROM "prosodyarchive"
WHERE "host"=? AND "user"=? AND "store"=?;
]];
local result = engine:select(count_sql, host, user, store);
if result then
for row in result do
item_count = row[1];
end
end
end);
if not ok or not item_count then
module:log("error", "Failed while checking quota for %s: %s", username, ret);
return nil, "Failure while checking quota";
end
archive_item_count_cache:set(cache_key, item_count);
end
if archive_item_limit then
module:log("debug", "%s has %d items out of %d limit", username, item_count, archive_item_limit);
if item_count >= archive_item_limit then
return nil, "quota-limit";
end
end
when = when or os.time();
with = with or "";
local ok, ret = engine:transaction(function()
@ -245,12 +281,16 @@ function archive_store:append(username, key, value, when, with)
VALUES (?,?,?,?,?,?,?,?);
]];
if key then
engine:delete(delete_sql, host, user or "", store, key);
local result, err = engine:delete(delete_sql, host, user or "", store, key);
if result then
item_count = item_count - result:affected();
end
else
key = uuid.generate();
end
local t, encoded_value = assert(serialize(value));
engine:insert(insert_sql, host, user or "", store, when, with, key, t, encoded_value);
archive_item_count_cache:set(cache_key, item_count+1);
return key;
end);
if not ok then return ok, ret; end
@ -287,45 +327,47 @@ local function archive_where(query, args, where)
end
end
local function archive_where_id_range(query, args, where)
local args_len = #args
-- Before or after specific item, exclusive
local id_lookup_sql = [[
SELECT "sort_id"
FROM "prosodyarchive"
WHERE "key" = ? AND "host" = ? AND "user" = ? AND "store" = ?
LIMIT 1;
]];
if query.after then -- keys better be unique!
where[#where+1] = [[
"sort_id" > COALESCE(
(
SELECT "sort_id"
FROM "prosodyarchive"
WHERE "key" = ? AND "host" = ? AND "user" = ? AND "store" = ?
LIMIT 1
), 0)
]];
args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.after, args[1], args[2], args[3];
args_len = args_len + 4
local after_id = nil;
for row in engine:select(id_lookup_sql, query.after, args[1], args[2], args[3]) do
after_id = row[1];
end
if not after_id then
return nil, "item-not-found";
end
where[#where+1] = '"sort_id" > ?';
args[#args+1] = after_id;
end
if query.before then
where[#where+1] = [[
"sort_id" < COALESCE(
(
SELECT "sort_id"
FROM "prosodyarchive"
WHERE "key" = ? AND "host" = ? AND "user" = ? AND "store" = ?
LIMIT 1
),
(
SELECT MAX("sort_id")+1
FROM "prosodyarchive"
)
)
]]
args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.before, args[1], args[2], args[3];
local before_id = nil;
for row in engine:select(id_lookup_sql, query.after, args[1], args[2], args[3]) do
before_id = row[1];
end
if not before_id then
return nil, "item-not-found";
end
where[#where+1] = '"sort_id" < ?';
args[#args+1] = before_id;
end
return true;
end
function archive_store:find(username, query)
query = query or {};
local user,store = username,self.store;
local total;
local ok, result = engine:transaction(function()
local cache_key = jid_join(username, host, self.store);
local total = archive_item_count_cache:get(cache_key);
if total ~= nil and query.limit == 0 and query.start == nil and query.with == nil and query["end"] == nil and query.key == nil then
return noop, total;
end
local ok, result, err = engine:transaction(function()
local sql_query = [[
SELECT "key", "type", "value", "when", "with"
FROM "prosodyarchive"
@ -346,11 +388,53 @@ function archive_store:find(username, query)
total = row[1];
end
end
if query.start == nil and query.with == nil and query["end"] == nil and query.key == nil then
archive_item_count_cache:set(cache_key, total);
end
if query.limit == 0 then -- Skip the real query
return noop, total;
end
end
local ok, err = archive_where_id_range(query, args, where);
if not ok then return ok, err; end
if query.limit then
args[#args+1] = query.limit;
end
sql_query = sql_query:format(t_concat(where, " AND "), query.reverse
and "DESC" or "ASC", query.limit and " LIMIT ?" or "");
return engine:select(sql_query, unpack(args));
end);
if not ok then return ok, result; end
if not result then return nil, err; end
return function()
local row = result();
if row ~= nil then
local value, err = deserialize(row[2], row[3]);
assert(value ~= nil, err);
return row[1], value, row[4], row[5];
end
end, total;
end
function archive_store:summary(username, query)
query = query or {};
local user,store = username,self.store;
local ok, result = engine:transaction(function()
local sql_query = [[
SELECT DISTINCT "with", COUNT(*)
FROM "prosodyarchive"
WHERE %s
GROUP BY "with"
ORDER BY "sort_id" %s%s;
]];
local args = { host, user or "", store, };
local where = { "\"host\" = ?", "\"user\" = ?", "\"store\" = ?", };
archive_where(query, args, where);
archive_where_id_range(query, args, where);
if query.limit then
@ -362,14 +446,12 @@ function archive_store:find(username, query)
return engine:select(sql_query, unpack(args));
end);
if not ok then return ok, result end
return function()
local row = result();
if row ~= nil then
local value, err = deserialize(row[2], row[3]);
assert(value ~= nil, err);
return row[1], value, row[4], row[5];
end
end, total;
local summary = {};
for row in result do
local with, count = row[1], row[2];
summary[with] = count;
end
return summary;
end
function archive_store:delete(username, query)
@ -384,7 +466,8 @@ function archive_store:delete(username, query)
table.remove(where, 2);
end
archive_where(query, args, where);
archive_where_id_range(query, args, where);
local ok, err = archive_where_id_range(query, args, where);
if not ok then return ok, err; end
if query.truncate == nil then
sql_query = sql_query:format(t_concat(where, " AND "));
else
@ -423,9 +506,24 @@ function archive_store:delete(username, query)
end
return engine:delete(sql_query, unpack(args));
end);
local cache_key = jid_join(username, host, self.store);
archive_item_count_cache:set(cache_key, nil);
return ok and stmt:affected(), stmt;
end
function archive_store:users()
local ok, result = engine:transaction(function()
local select_sql = [[
SELECT DISTINCT "user"
FROM "prosodyarchive"
WHERE "host"=? AND "store"=?;
]];
return engine:select(select_sql, host, self.store);
end);
if not ok then error(result); end
return iterator(result);
end
local stores = {
keyval = keyval_store;
map = map_store;

28
plugins/mod_tls.lua
View file

@ -35,9 +35,10 @@ local host = hosts[module.host];
local ssl_ctx_c2s, ssl_ctx_s2sout, ssl_ctx_s2sin;
local ssl_cfg_c2s, ssl_cfg_s2sout, ssl_cfg_s2sin;
local err_c2s, err_s2sin, err_s2sout;
function module.load()
local NULL, err = {};
local NULL = {};
local modhost = module.host;
local parent = modhost:match("%.(.*)$");
@ -53,16 +54,20 @@ function module.load()
local host_s2s = rawgetopt(modhost, "s2s_ssl") or parent_s2s;
module:log("debug", "Creating context for c2s");
ssl_ctx_c2s, err, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections
if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", err); end
local request_client_certs = { verify = { "peer", "client_once", }; };
module:log("debug", "Creating context for s2sout");
ssl_ctx_s2sout, err, ssl_cfg_s2sout = create_context(host.host, "client", host_s2s, host_ssl, global_s2s); -- for outgoing server connections
if not ssl_ctx_s2sout then module:log("error", "Error creating contexts for s2sout: %s", err); end
ssl_ctx_c2s, err_c2s, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections
if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", err_c2s); end
module:log("debug", "Creating context for s2sin");
ssl_ctx_s2sin, err, ssl_cfg_s2sin = create_context(host.host, "server", host_s2s, host_ssl, global_s2s); -- for incoming server connections
if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", err); end
-- for outgoing server connections
ssl_ctx_s2sout, err_s2sout, ssl_cfg_s2sout = create_context(host.host, "client", host_s2s, host_ssl, global_s2s, request_client_certs);
if not ssl_ctx_s2sout then module:log("error", "Error creating contexts for s2sout: %s", err_s2sout); end
-- for incoming server connections
ssl_ctx_s2sin, err_s2sin, ssl_cfg_s2sin = create_context(host.host, "server", host_s2s, host_ssl, global_s2s, request_client_certs);
if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", err_s2sin); end
end
module:hook_global("config-reloaded", module.load);
@ -77,12 +82,21 @@ local function can_do_tls(session)
return session.ssl_ctx;
end
if session.type == "c2s_unauthed" then
if not ssl_ctx_c2s and c2s_require_encryption then
session.log("error", "No TLS context available for c2s. Earlier error was: %s", err_c2s);
end
session.ssl_ctx = ssl_ctx_c2s;
session.ssl_cfg = ssl_cfg_c2s;
elseif session.type == "s2sin_unauthed" and allow_s2s_tls then
if not ssl_ctx_s2sin and s2s_require_encryption then
session.log("error", "No TLS context available for s2sin. Earlier error was: %s", err_s2sin);
end
session.ssl_ctx = ssl_ctx_s2sin;
session.ssl_cfg = ssl_cfg_s2sin;
elseif session.direction == "outgoing" and allow_s2s_tls then
if not ssl_ctx_s2sout and s2s_require_encryption then
session.log("error", "No TLS context available for s2sout. Earlier error was: %s", err_s2sout);
end
session.ssl_ctx = ssl_ctx_s2sout;
session.ssl_cfg = ssl_cfg_s2sout;
else

42
plugins/mod_websocket.lua
View file

@ -29,18 +29,10 @@ local t_concat = table.concat;
local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
local consider_websocket_secure = module:get_option_boolean("consider_websocket_secure");
local cross_domain = module:get_option_set("cross_domain_websocket", {});
if cross_domain:contains("*") or cross_domain:contains(true) then
cross_domain = true;
local cross_domain = module:get_option("cross_domain_websocket");
if cross_domain ~= nil then
module:log("info", "The 'cross_domain_websocket' option has been deprecated");
end
local function check_origin(origin)
if cross_domain == true then
return true;
end
return cross_domain:contains(origin);
end
local xmlns_framing = "urn:ietf:params:xml:ns:xmpp-framing";
local xmlns_streams = "http://etherx.jabber.org/streams";
local xmlns_client = "jabber:client";
@ -158,11 +150,6 @@ function handle_request(event)
return 501;
end
if not check_origin(request.headers.origin or "") then
module:log("debug", "Origin %s is not allowed by 'cross_domain_websocket' [ %s ]", request.headers.origin or "(missing header)", cross_domain);
return 403;
end
local function websocket_close(code, message)
conn:write(build_close(code, message));
conn:close();
@ -329,27 +316,4 @@ module:provides("http", {
function module.add_host(module)
module:hook("c2s-read-timeout", keepalive, -0.9);
if cross_domain ~= true then
local url = require "socket.url";
local ws_url = module:http_url("websocket", "xmpp-websocket");
local url_components = url.parse(ws_url);
-- The 'Origin' consists of the base URL without path
url_components.path = nil;
local this_origin = url.build(url_components);
local local_cross_domain = module:get_option_set("cross_domain_websocket", { this_origin });
if local_cross_domain:contains(true) then
module:log("error", "cross_domain_websocket = true only works in the global section");
return;
end
-- Don't add / remove something added by another host
-- This might be weird with random load order
local_cross_domain:exclude(cross_domain);
cross_domain:include(local_cross_domain);
module:log("debug", "cross_domain = %s", tostring(cross_domain));
function module.unload()
cross_domain:exclude(local_cross_domain);
end
end
end

2
plugins/muc/mod_muc.lua
View file

@ -453,7 +453,7 @@ for event_name, method in pairs {
if room == nil then
-- Watch presence to create rooms
if stanza.attr.type == nil and stanza.name == "presence" then
if stanza.attr.type == nil and stanza.name == "presence" and stanza:get_child("x", "http://jabber.org/protocol/muc") then
room = muclib.new_room(room_jid);
return room:handle_first_presence(origin, stanza);
elseif stanza.attr.type ~= "error" then

104
plugins/muc/muc.lib.lua
View file

@ -23,6 +23,7 @@ local resourceprep = require "util.encodings".stringprep.resourceprep;
local st = require "util.stanza";
local base64 = require "util.encodings".base64;
local md5 = require "util.hashes".md5;
local new_id = require "util.id".medium;
local log = module._log;
@ -39,7 +40,7 @@ function room_mt:__tostring()
end
function room_mt.save()
-- overriden by mod_muc.lua
-- overridden by mod_muc.lua
end
function room_mt:get_occupant_jid(real_jid)
@ -279,7 +280,7 @@ function room_mt:publicise_occupant_status(occupant, x, nick, actor, reason)
self_p = st.clone(base_presence):add_child(self_x);
end
-- General populance
-- General populace
for occupant_nick, n_occupant in self:each_occupant() do
if occupant_nick ~= occupant.nick then
local pr;
@ -390,7 +391,11 @@ function room_mt:handle_kickable(origin, stanza) -- luacheck: ignore 212
end
self:publicise_occupant_status(new_occupant or occupant, x);
if is_last_session then
module:fire_event("muc-occupant-left", {room = self; nick = occupant.nick; occupant = occupant;});
module:fire_event("muc-occupant-left", {
room = self;
nick = occupant.nick;
occupant = occupant;
});
end
return true;
end
@ -428,13 +433,6 @@ module:hook("muc-occupant-pre-change", function(event)
end, 1);
function room_mt:handle_first_presence(origin, stanza)
if not stanza:get_child("x", "http://jabber.org/protocol/muc") then
module:log("debug", "Room creation without <x>, possibly desynced");
origin.send(st.error_reply(stanza, "cancel", "item-not-found"));
return true;
end
local real_jid = stanza.attr.from;
local dest_jid = stanza.attr.to;
local bare_jid = jid_bare(real_jid);
@ -504,7 +502,7 @@ function room_mt:handle_normal_presence(origin, stanza)
if orig_occupant == nil and not muc_x and stanza.attr.type == nil then
module:log("debug", "Attempted join without <x>, possibly desynced");
origin.send(st.error_reply(stanza, "cancel", "item-not-found",
"You must join the room before sending presence updates"));
"You are not currently connected to this chat"));
return true;
end
@ -609,7 +607,7 @@ function room_mt:handle_normal_presence(origin, stanza)
x:tag("status", {code = "303";}):up();
x:tag("status", {code = "110";}):up();
self:route_stanza(generated_unavail:add_child(x));
dest_nick = nil; -- set dest_nick to nil; so general populance doesn't see it for whole orig_occupant
dest_nick = nil; -- set dest_nick to nil; so general populace doesn't see it for whole orig_occupant
end
end
@ -874,7 +872,11 @@ function room_mt:clear(x)
end
for occupant in pairs(occupants_updated) do
self:publicise_occupant_status(occupant, x);
module:fire_event("muc-occupant-left", { room = self; nick = occupant.nick; occupant = occupant;});
module:fire_event("muc-occupant-left", {
room = self;
nick = occupant.nick;
occupant = occupant;
});
end
end
@ -967,7 +969,7 @@ function room_mt:handle_admin_query_get_command(origin, stanza)
local _aff_rank = valid_affiliations[_aff or "none"];
local _rol = item.attr.role;
if _aff and _aff_rank and not _rol then
-- You need to be at least an admin, and be requesting info about your affifiliation or lower
-- You need to be at least an admin, and be requesting info about your affiliation or lower
-- e.g. an admin can't ask for a list of owners
local affiliation_rank = valid_affiliations[affiliation or "none"];
if (affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank)
@ -1044,6 +1046,9 @@ end
function room_mt:handle_groupchat_to_room(origin, stanza)
local from = stanza.attr.from;
local occupant = self:get_occupant_by_real_jid(from);
if not stanza.attr.id then
stanza.attr.id = new_id()
end
if module:fire_event("muc-occupant-groupchat", {
room = self; origin = origin; stanza = stanza; from = from; occupant = occupant;
}) then return true; end
@ -1292,7 +1297,7 @@ function room_mt:set_affiliation(actor, jid, affiliation, reason, data)
-- Outcast can be by host.
is_host_only and affiliation == "outcast" and select(2, jid_split(occupant.bare_jid)) == host
) then
-- need to publcize in all cases; as affiliation in <item/> has changed.
-- need to publicize in all cases; as affiliation in <item/> has changed.
occupants_updated[occupant] = occupant.role;
if occupant.role ~= role and (
is_downgrade or
@ -1319,7 +1324,11 @@ function room_mt:set_affiliation(actor, jid, affiliation, reason, data)
for occupant, old_role in pairs(occupants_updated) do
self:publicise_occupant_status(occupant, x, nil, actor, reason);
if occupant.role == nil then
module:fire_event("muc-occupant-left", {room = self; nick = occupant.nick; occupant = occupant;});
module:fire_event("muc-occupant-left", {
room = self;
nick = occupant.nick;
occupant = occupant;
});
elseif is_semi_anonymous and
(old_role == "moderator" and occupant.role ~= "moderator") or
(old_role ~= "moderator" and occupant.role == "moderator") then -- Has gained or lost moderator status
@ -1371,6 +1380,42 @@ function room_mt:get_role(nick)
return occupant and occupant.role or nil;
end
function room_mt:may_set_role(actor, occupant, role)
local event = {
room = self,
actor = actor,
occupant = occupant,
role = role,
};
module:fire_event("muc-pre-set-role", event);
if event.allowed ~= nil then
return event.allowed, event.error, event.condition;
end
-- Can't do anything to other owners or admins
local occupant_affiliation = self:get_affiliation(occupant.bare_jid);
if occupant_affiliation == "owner" or occupant_affiliation == "admin" then
return nil, "cancel", "not-allowed";
end
-- If you are trying to give or take moderator role you need to be an owner or admin
if occupant.role == "moderator" or role == "moderator" then
local actor_affiliation = self:get_affiliation(actor);
if actor_affiliation ~= "owner" and actor_affiliation ~= "admin" then
return nil, "cancel", "not-allowed";
end
end
-- Need to be in the room and a moderator
local actor_occupant = self:get_occupant_by_real_jid(actor);
if not actor_occupant or actor_occupant.role ~= "moderator" then
return nil, "cancel", "not-allowed";
end
return true;
end
function room_mt:set_role(actor, occupant_jid, role, reason)
if not actor then return nil, "modify", "not-acceptable"; end
@ -1385,24 +1430,9 @@ function room_mt:set_role(actor, occupant_jid, role, reason)
if actor == true then
actor = nil -- So we can pass it safely to 'publicise_occupant_status' below
else
-- Can't do anything to other owners or admins
local occupant_affiliation = self:get_affiliation(occupant.bare_jid);
if occupant_affiliation == "owner" or occupant_affiliation == "admin" then
return nil, "cancel", "not-allowed";
end
-- If you are trying to give or take moderator role you need to be an owner or admin
if occupant.role == "moderator" or role == "moderator" then
local actor_affiliation = self:get_affiliation(actor);
if actor_affiliation ~= "owner" and actor_affiliation ~= "admin" then
return nil, "cancel", "not-allowed";
end
end
-- Need to be in the room and a moderator
local actor_occupant = self:get_occupant_by_real_jid(actor);
if not actor_occupant or actor_occupant.role ~= "moderator" then
return nil, "cancel", "not-allowed";
local allowed, err, condition = self:may_set_role(actor, occupant, role)
if not allowed then
return allowed, err, condition;
end
end
@ -1414,7 +1444,11 @@ function room_mt:set_role(actor, occupant_jid, role, reason)
self:save_occupant(occupant);
self:publicise_occupant_status(occupant, x, nil, actor, reason);
if role == nil then
module:fire_event("muc-occupant-left", {room = self; nick = occupant.nick; occupant = occupant;});
module:fire_event("muc-occupant-left", {
room = self;
nick = occupant.nick;
occupant = occupant;
});
end
return true;
end

6
plugins/muc/subject.lib.lua
View file

@ -94,6 +94,12 @@ module:hook("muc-occupant-groupchat", function(event)
local stanza = event.stanza;
local subject = stanza:get_child("subject");
if subject then
if stanza:get_child("body") or stanza:get_child("thread") then
-- Note: A message with a <subject/> and a <body/> or a <subject/> and
-- a <thread/> is a legitimate message, but it SHALL NOT be interpreted
-- as a subject change.
return;
end
local room = event.room;
local occupant = event.occupant;
-- Role check for subject changes

2
prosody
View file

@ -94,4 +94,6 @@ cleanup();
prosody.events.fire_event("server-stopped");
prosody.log("info", "Shutdown complete");
prosody.log("debug", "Shutdown reason was: %s", prosody.shutdown_reason or "not specified");
prosody.log("debug", "Exiting with status code: %d", prosody.shutdown_code or 0);
os.exit(prosody.shutdown_code);

17
prosodyctl
View file

@ -83,7 +83,7 @@ local jid_split = require "util.jid".prepped_split;
local prosodyctl_timeout = (configmanager.get("*", "prosodyctl_timeout") or 5) * 2;
-----------------------
local commands = {};
local command = arg[1];
local command = table.remove(arg, 1);
function commands.adduser(arg)
if not arg[1] or arg[1] == "--help" then
@ -222,7 +222,7 @@ function commands.start(arg)
end
--luacheck: ignore 411/ret
local ok, ret = prosodyctl.start(prosody.paths.source);
local ok, ret = prosodyctl.start(prosody.paths.source, arg[-1]);
if ok then
local daemonize = configmanager.get("*", "daemonize");
if daemonize == nil then
@ -363,6 +363,13 @@ function commands.about(arg)
.."\n ";
end)));
print("");
local have_pposix, pposix = pcall(require, "util.pposix");
if have_pposix and pposix.uname then
print("# Operating system");
local uname, err = pposix.uname();
print(uname and uname.sysname .. " " .. uname.release or "Unknown POSIX", err or "");
print("");
end
print("# Lua environment");
print("Lua version: ", _G._VERSION);
print("");
@ -811,7 +818,7 @@ function commands.check(arg)
print("Checking config...");
local deprecated = set.new({
"bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption",
"vcard_compatibility",
"vcard_compatibility", "cross_domain_bosh", "cross_domain_websocket"
});
local known_global_options = set.new({
"pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
@ -1305,8 +1312,6 @@ local command_runner = async.runner(function ()
end
end
table.remove(arg, 1);
local module = modulemanager.get_module("*", module_name);
if not module then
show_message("Failed to load module '"..module_name.."': Unknown error");
@ -1370,7 +1375,7 @@ local command_runner = async.runner(function ()
os.exit(0);
end
os.exit(commands[command]({ select(2, unpack(arg)) }));
os.exit(commands[command](arg));
end, watchers);
command_runner:run(true);

2
spec/core_storagemanager_spec.lua
View file

@ -1,4 +1,4 @@
local unpack = table.unpack or unpack;
local unpack = table.unpack or unpack; -- luacheck: ignore 113
local server = require "net.server_select";
package.loaded["net.server"] = server;

58
spec/scansion/keep_full_sub_req.scs Normal file
View file

@ -0,0 +1,58 @@
# server MUST keep a record of the complete presence stanza comprising the subscription request (#689)
[Client] Alice
jid: pars-a@localhost
password: password
[Client] Bob
jid: pars-b@localhost
password: password
[Client] Bob's phone
jid: pars-b@localhost/phone
password: password
---------
Alice connects
Alice sends:
<presence to="${Bob's JID}" type="subscribe">
<preauth xmlns="urn:xmpp:pars:0" token="1tMFqYDdKhfe2pwp" />
</presence>
Alice disconnects
Bob connects
Bob sends:
<presence/>
Bob receives:
<presence from="${Bob's full JID}"/>
Bob receives:
<presence from="${Alice's JID}" type="subscribe">
<preauth xmlns="urn:xmpp:pars:0" token="1tMFqYDdKhfe2pwp" />
</presence>
Bob disconnects
# Works if they reconnect too
Bob's phone connects
Bob's phone sends:
<presence/>
Bob's phone receives:
<presence from="${Bob's phone's full JID}"/>
Bob's phone receives:
<presence from="${Alice's JID}" type="subscribe">
<preauth xmlns="urn:xmpp:pars:0" token="1tMFqYDdKhfe2pwp" />
</presence>
Bob's phone disconnects

129
spec/scansion/muc_subject_issue_667.scs Normal file
View file

@ -0,0 +1,129 @@
# #667 MUC message with subject and body SHALL NOT be interpreted as a subject change
[Client] Romeo
password: password
jid: romeo@localhost
-----
Romeo connects
# and creates a room
Romeo sends:
<presence to="issue667@conference.localhost/Romeo">
<x xmlns="http://jabber.org/protocol/muc"/>
</presence>
Romeo receives:
<presence from="issue667@conference.localhost/Romeo">
<x xmlns="http://jabber.org/protocol/muc#user">
<status code="201"/>
<item affiliation="owner" role="moderator" jid="${Romeo's full JID}"/>
<status code="110"/>
</x>
</presence>
# the default (empty) subject
Romeo receives:
<message type="groupchat" from="issue667@conference.localhost">
<subject/>
</message>
# this should be treated as a normal message
Romeo sends:
<message to="issue667@conference.localhost" type="groupchat">
<subject>Greetings</subject>
<body>Hello everyone</body>
</message>
Romeo receives:
<message type="groupchat" from="issue667@conference.localhost/Romeo">
<subject>Greetings</subject>
<body>Hello everyone</body>
</message>
# Resync
Romeo sends:
<presence to="issue667@conference.localhost/Romeo">
<x xmlns="http://jabber.org/protocol/muc"/>
</presence>
# Presences
Romeo receives:
<presence from="issue667@conference.localhost/Romeo">
<x xmlns="http://jabber.org/protocol/muc#user">
<item affiliation="owner" role="moderator" jid="${Romeo's full JID}"/>
<status code="110"/>
</x>
</presence>
Romeo receives:
<message type="groupchat" from="issue667@conference.localhost/Romeo">
<subject>Greetings</subject>
<body>Hello everyone</body>
</message>
# the still empty subject
Romeo receives:
<message type="groupchat" from="issue667@conference.localhost">
<subject/>
</message>
# this is a subject change
Romeo sends:
<message to="issue667@conference.localhost" type="groupchat">
<subject>Something to talk about</subject>
</message>
Romeo receives:
<message type="groupchat" from="issue667@conference.localhost/Romeo">
<subject>Something to talk about</subject>
</message>
# a message without <subject>
Romeo sends:
<message to="issue667@conference.localhost" type="groupchat">
<body>Lorem ipsum dolor sit amet</body>
</message>
Romeo receives:
<message type="groupchat" from="issue667@conference.localhost/Romeo">
<body>Lorem ipsum dolor sit amet</body>
</message>
# Resync
Romeo sends:
<presence to="issue667@conference.localhost/Romeo">
<x xmlns="http://jabber.org/protocol/muc"/>
</presence>
# Presences
Romeo receives:
<presence from="issue667@conference.localhost/Romeo">
<x xmlns="http://jabber.org/protocol/muc#user">
<item affiliation="owner" role="moderator" jid="${Romeo's full JID}"/>
<status code="110"/>
</x>
</presence>
# History
# These have delay tags but we ignore those for now
Romeo receives:
<message type="groupchat" from="issue667@conference.localhost/Romeo">
<subject>Greetings</subject>
<body>Hello everyone</body>
</message>
Romeo receives:
<message type="groupchat" from="issue667@conference.localhost/Romeo">
<body>Lorem ipsum dolor sit amet</body>
</message>
# Finally, the topic
Romeo receives:
<message type="groupchat" from="issue667@conference.localhost/Romeo">
<subject>Something to talk about</subject>
</message>
Romeo disconnects

10
spec/scansion/prosody.cfg.lua
View file

@ -14,10 +14,11 @@ modules_enabled = {
-- Not essential, but recommended
"carbons"; -- Keep multiple clients in sync
"pep"; -- Enables users to publish their mood, activity, playing music and more
"pep"; -- Enables users to publish their avatar, mood, activity, playing music and more
"private"; -- Private XML storage (for room bookmarks, etc.)
"blocklist"; -- Allow users to block communications with other users
"vcard"; -- Allow users to set vCards
"vcard4"; -- User profiles (stored in PEP)
"vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
-- Nice to have
"version"; -- Replies to server version requests
@ -26,6 +27,11 @@ modules_enabled = {
"ping"; -- Replies to XMPP pings with pongs
"register"; -- Allow users to register on this server using a client and change passwords
"mam"; -- Store messages in an archive and allow users to access it
--"csi_simple"; -- Simple Mobile optimizations
-- Admin interfaces
--"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
-- HTTP modules
--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"

5
spec/util_format_spec.lua
View file

@ -5,10 +5,15 @@ describe("util.format", function()
it("should work", function()
assert.equal("hello", format("%s", "hello"));
assert.equal("<nil>", format("%s"));
assert.equal("<nil>", format("%d"));
assert.equal("<nil>", format("%q"));
assert.equal(" [<nil>]", format("", nil));
assert.equal("true", format("%s", true));
assert.equal("[true]", format("%d", true));
assert.equal("% [true]", format("%%", true));
assert.equal("{ }", format("%q", { }));
assert.equal("[1.5]", format("%d", 1.5));
assert.equal("[7.3786976294838e+19]", format("%d", 73786976294838206464));
end);
end);
end);

37
spec/util_hashes_spec.lua Normal file
View file

@ -0,0 +1,37 @@
-- Test vectors from RFC 6070
local hashes = require "util.hashes";
local hex = require "util.hex";
-- Also see spec for util.hmac where HMAC test cases reside
describe("PBKDF2-SHA1", function ()
it("test vector 1", function ()
local P = "password"
local S = "salt"
local c = 1
local DK = "0c60c80f961f0e71f3a9b524af6012062fe037a6";
assert.equal(DK, hex.to(hashes.scram_Hi_sha1(P, S, c)));
end);
it("test vector 2", function ()
local P = "password"
local S = "salt"
local c = 2
local DK = "ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957";
assert.equal(DK, hex.to(hashes.scram_Hi_sha1(P, S, c)));
end);
it("test vector 3", function ()
local P = "password"
local S = "salt"
local c = 4096
local DK = "4b007901b765489abead49d926f721d065a429c1";
assert.equal(DK, hex.to(hashes.scram_Hi_sha1(P, S, c)));
end);
it("test vector 4 #SLOW", function ()
local P = "password"
local S = "salt"
local c = 16777216
local DK = "eefe3d61cd4da4e4e9945b3d6ba2158c2634e984";
assert.equal(DK, hex.to(hashes.scram_Hi_sha1(P, S, c)));
end);
end);

85
spec/util_hashring_spec.lua Normal file
View file

@ -0,0 +1,85 @@
local hashring = require "util.hashring";
describe("util.hashring", function ()
local sha256 = require "util.hashes".sha256;
local ring = hashring.new(128, sha256);
it("should fail to get a node that does not exist", function ()
assert.is_nil(ring:get_node("foo"))
end);
it("should support adding nodes", function ()
ring:add_node("node1");
end);
it("should return a single node for all keys if only one node exists", function ()
for i = 1, 100 do
assert.is_equal("node1", ring:get_node(tostring(i)))
end
end);
it("should support adding a second node", function ()
ring:add_node("node2");
end);
it("should fail to remove a non-existent node", function ()
assert.is_falsy(ring:remove_node("node3"));
end);
it("should succeed to remove a node", function ()
assert.is_truthy(ring:remove_node("node1"));
end);
it("should return the only node for all keys", function ()
for i = 1, 100 do
assert.is_equal("node2", ring:get_node(tostring(i)))
end
end);
it("should support adding multiple nodes", function ()
ring:add_nodes({ "node1", "node3", "node4", "node5" });
end);
it("should disrupt a minimal number of keys on node removal", function ()
local orig_ring = ring:clone();
local node_tallies = {};
local n = 1000;
for i = 1, n do
local key = tostring(i);
local node = ring:get_node(key);
node_tallies[node] = (node_tallies[node] or 0) + 1;
end
--[[
for node, key_count in pairs(node_tallies) do
print(node, key_count, ("%.2f%%"):format((key_count/n)*100));
end
]]
ring:remove_node("node5");
local disrupted_keys = 0;
for i = 1, n do
local key = tostring(i);
if orig_ring:get_node(key) ~= ring:get_node(key) then
disrupted_keys = disrupted_keys + 1;
end
end
assert.is_equal(node_tallies["node5"], disrupted_keys);
end);
it("should support removing multiple nodes", function ()
ring:remove_nodes({"node2", "node3", "node4", "node5"});
end);
it("should return a single node for all keys if only one node remains", function ()
for i = 1, 100 do
assert.is_equal("node1", ring:get_node(tostring(i)))
end
end);
end);

106
spec/util_hmac_spec.lua Normal file
View file

@ -0,0 +1,106 @@
-- Test cases from RFC 4231
-- Yes, the lines are long, it's annoying to split the long hex things.
-- luacheck: ignore 631
local hmac = require "util.hmac";
local hex = require "util.hex";
describe("Test case 1", function ()
local Key = hex.from("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b");
local Data = hex.from("4869205468657265");
describe("HMAC-SHA-256", function ()
it("works", function()
assert.equal("b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7", hmac.sha256(Key, Data, true))
end);
end);
describe("HMAC-SHA-512", function ()
it("works", function()
assert.equal("87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b30545e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f1702e696c203a126854", hmac.sha512(Key, Data, true))
end);
end);
end);
describe("Test case 2", function ()
local Key = hex.from("4a656665");
local Data = hex.from("7768617420646f2079612077616e7420666f72206e6f7468696e673f");
describe("HMAC-SHA-256", function ()
it("works", function()
assert.equal("5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843", hmac.sha256(Key, Data, true))
end);
end);
describe("HMAC-SHA-512", function ()
it("works", function()
assert.equal("164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737", hmac.sha512(Key, Data, true))
end);
end);
end);
describe("Test case 3", function ()
local Key = hex.from("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
local Data = hex.from("dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd");
describe("HMAC-SHA-256", function ()
it("works", function()
assert.equal("773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514ced565fe", hmac.sha256(Key, Data, true))
end);
end);
describe("HMAC-SHA-512", function ()
it("works", function()
assert.equal("fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33b2279d39bf3e848279a722c806b485a47e67c807b946a337bee8942674278859e13292fb", hmac.sha512(Key, Data, true))
end);
end);
end);
describe("Test case 4", function ()
local Key = hex.from("0102030405060708090a0b0c0d0e0f10111213141516171819");
local Data = hex.from("cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd");
describe("HMAC-SHA-256", function ()
it("works", function()
assert.equal("82558a389a443c0ea4cc819899f2083a85f0faa3e578f8077a2e3ff46729665b", hmac.sha256(Key, Data, true))
end);
end);
describe("HMAC-SHA-512", function ()
it("works", function()
assert.equal("b0ba465637458c6990e5a8c5f61d4af7e576d97ff94b872de76f8050361ee3dba91ca5c11aa25eb4d679275cc5788063a5f19741120c4f2de2adebeb10a298dd", hmac.sha512(Key, Data, true))
end);
end);
end);
describe("Test case 5", function ()
local Key = hex.from("0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c");
local Data = hex.from("546573742057697468205472756e636174696f6e");
describe("HMAC-SHA-256", function ()
it("works", function()
assert.equal("a3b6167473100ee06e0c796c2955552b", hmac.sha256(Key, Data, true):sub(1,128/4))
end);
end);
describe("HMAC-SHA-512", function ()
it("works", function()
assert.equal("415fad6271580a531d4179bc891d87a6", hmac.sha512(Key, Data, true):sub(1,128/4))
end);
end);
end);
describe("Test case 6", function ()
local Key = hex.from("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
local Data = hex.from("54657374205573696e67204c6172676572205468616e20426c6f636b2d53697a65204b6579202d2048617368204b6579204669727374");
describe("HMAC-SHA-256", function ()
it("works", function()
assert.equal("60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f0ee37f54", hmac.sha256(Key, Data, true))
end);
end);
describe("HMAC-SHA-512", function ()
it("works", function()
assert.equal("80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b013783f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec8b915a985d786598", hmac.sha512(Key, Data, true))
end);
end);
end);
describe("Test case 7", function ()
local Key = hex.from("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
local Data = hex.from("5468697320697320612074657374207573696e672061206c6172676572207468616e20626c6f636b2d73697a65206b657920616e642061206c6172676572207468616e20626c6f636b2d73697a6520646174612e20546865206b6579206e6565647320746f20626520686173686564206265666f7265206265696e6720757365642062792074686520484d414320616c676f726974686d2e");
describe("HMAC-SHA-256", function ()
it("works", function()
assert.equal("9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f51535c3a35e2", hmac.sha256(Key, Data, true))
end);
end);
describe("HMAC-SHA-512", function ()
it("works", function()
assert.equal("e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de0446065c97440fa8c6a58", hmac.sha512(Key, Data, true))
end);
end);
end);

5
spec/util_http_spec.lua
View file

@ -28,6 +28,11 @@ describe("util.http", function()
it("should decode important URL characters", function()
assert.are.equal("This & that = something", http.urldecode("This%20%26%20that%20%3d%20something"), "Important URL chars escaped");
end);
it("should decode both lower and uppercase", function ()
assert.are.equal("This & that = {something}.", http.urldecode("This%20%26%20that%20%3D%20%7Bsomething%7D%2E"), "Important URL chars escaped");
end);
end);
describe("#formencode()", function()

17
spec/util_interpolation_spec.lua Normal file
View file

@ -0,0 +1,17 @@
local template = [[
{greet!}, {name?world}!
]];
local expect1 = [[
Hello, WORLD!
]];
local expect2 = [[
Hello, world!
]];
describe("util.interpolation", function ()
it("renders", function ()
local render = require "util.interpolation".new("%b{}", string.upper);
assert.equal(expect1, render(template, { greet = "Hello", name = "world" }));
assert.equal(expect2, render(template, { greet = "Hello" }));
end);
end);

37
spec/util_queue_spec.lua
View file

@ -100,4 +100,41 @@ describe("util.queue", function()
end);
end);
describe("consume()", function ()
it("should work", function ()
local q = queue.new(10);
for i = 1, 5 do
q:push(i);
end
local c = 0;
for i in q:consume() do
assert(i == c + 1);
assert(q:count() == (5-i));
c = i;
end
end);
it("should work even if items are pushed in the loop", function ()
local q = queue.new(10);
for i = 1, 5 do
q:push(i);
end
local c = 0;
for i in q:consume() do
assert(i == c + 1);
if c < 3 then
assert(q:count() == (5-i));
else
assert(q:count() == (6-i));
end
c = i;
if c == 3 then
q:push(6);
end
end
assert.equal(c, 6);
end);
end);
end);

50
spec/util_stanza_spec.lua
View file

@ -95,19 +95,30 @@ describe("util.stanza", function()
describe("#iq()", function()
it("should create an iq stanza", function()
local i = st.iq({ id = "foo" });
local i = st.iq({ type = "get", id = "foo" });
assert.are.equal("iq", i.name);
assert.are.equal("foo", i.attr.id);
assert.are.equal("get", i.attr.type);
end);
it("should reject stanzas with no attributes", function ()
assert.has.error_match(function ()
st.iq();
end, "attributes");
end);
it("should reject stanzas with no id", function ()
assert.has.error_match(function ()
st.iq();
st.iq({ type = "get" });
end, "id attribute");
end);
it("should reject stanzas with no type", function ()
assert.has.error_match(function ()
st.iq({ foo = "bar" });
end, "id attribute");
st.iq({ id = "foo" });
end, "type attribute");
end);
end);
@ -370,4 +381,35 @@ describe("util.stanza", function()
end);
end);
end);
describe("top_tag", function ()
local xml_parse = require "util.xml".parse;
it("works", function ()
local s = st.message({type="chat"}, "Hello");
local top_tag = s:top_tag();
assert.is_string(top_tag);
assert.not_equal("/>", top_tag:sub(-2, -1));
assert.equal(">", top_tag:sub(-1, -1));
local s2 = xml_parse(top_tag.."</message>");
assert(st.is_stanza(s2));
assert.equal("message", s2.name);
assert.equal(0, #s2);
assert.equal(0, #s2.tags);
assert.equal("chat", s2.attr.type);
end);
it("works with namespaced attributes", function ()
local s = xml_parse[[<message foo:bar='true' xmlns:foo='my-awesome-ns'/>]];
local top_tag = s:top_tag();
assert.is_string(top_tag);
assert.not_equal("/>", top_tag:sub(-2, -1));
assert.equal(">", top_tag:sub(-1, -1));
local s2 = xml_parse(top_tag.."</message>");
assert(st.is_stanza(s2));
assert.equal("message", s2.name);
assert.equal(0, #s2);
assert.equal(0, #s2.tags);
assert.equal("true", s2.attr["my-awesome-ns\1bar"]);
end);
end);
end);

17
spec/util_table_spec.lua Normal file
View file

@ -0,0 +1,17 @@
local u_table = require "util.table";
describe("util.table", function ()
describe("create()", function ()
it("works", function ()
-- Can't test the allocated sizes of the table, so what you gonna do?
assert.is.table(u_table.create(1,1));
end);
end);
describe("pack()", function ()
it("works", function ()
assert.same({ "lorem", "ipsum", "dolor", "sit", "amet", n = 5 }, u_table.pack("lorem", "ipsum", "dolor", "sit", "amet"));
end);
end);
end);

2
spec/util_throttle_spec.lua
View file

@ -88,7 +88,7 @@ describe("util.throttle", function()
later(0.1);
a:update();
end
assert(math.abs(a.balance - 1) < 0.0001); -- incremental updates cause rouding errors
assert(math.abs(a.balance - 1) < 0.0001); -- incremental updates cause rounding errors
end);
end);

7
tools/migration/Makefile
View file

@ -12,16 +12,13 @@ INSTALLEDCONFIG = $(SYSCONFDIR)
INSTALLEDMODULES = $(LIBDIR)/prosody/modules
INSTALLEDDATA = $(DATADIR)
SOURCE_FILES = migrator/*.lua
all: prosody-migrator.install migrator.cfg.lua.install prosody-migrator.lua $(SOURCE_FILES)
all: prosody-migrator.install migrator.cfg.lua.install prosody-migrator.lua
install: prosody-migrator.install migrator.cfg.lua.install
install -d $(BIN) $(CONFIG) $(SOURCE) $(SOURCE)/migrator
install -d $(BIN) $(CONFIG) $(SOURCE)
install -d $(MAN)/man1
install -d $(SOURCE)/migrator
install -m755 ./prosody-migrator.install $(BIN)/prosody-migrator
install -m644 $(SOURCE_FILES) $(SOURCE)/migrator
test -e $(CONFIG)/migrator.cfg.lua || install -m644 migrator.cfg.lua.install $(CONFIG)/migrator.cfg.lua
clean:

34
tools/migration/migrator.cfg.lua
View file

@ -1,12 +1,38 @@
local data_path = "../../data";
local vhost = {
"accounts",
"account_details",
"roster",
"vcard",
"private",
"blocklist",
"privacy",
"archive-archive",
"offline-archive",
"pubsub_nodes",
-- "pubsub_*-archive",
"pep",
-- "pep_*-archive",
}
local muc = {
"persistent",
"config",
"state",
"muc_log-archive",
};
input {
type = "prosody_files";
hosts = {
["example.com"] = vhost;
["conference.example.com"] = muc;
};
type = "internal";
path = data_path;
}
output {
type = "prosody_sql";
type = "sql";
driver = "SQLite3";
database = data_path.."/prosody.sqlite";
}
@ -14,11 +40,11 @@ output {
--[[
input {
type = "prosody_files";
type = "internal";
path = data_path;
}
output {
type = "prosody_sql";
type = "sql";
driver = "SQLite3";
database = data_path.."/prosody.sqlite";
}

58
tools/migration/migrator/mtools.lua
View file

@ -1,58 +0,0 @@
local print = print;
local t_insert = table.insert;
local t_sort = table.sort;
local function sorted(params)
local reader = params.reader; -- iterator to get items from
local sorter = params.sorter; -- sorting function
local filter = params.filter; -- filter function
local cache = {};
for item in reader do
if filter then item = filter(item); end
if item then t_insert(cache, item); end
end
if sorter then
t_sort(cache, sorter);
end
local i = 0;
return function()
i = i + 1;
return cache[i];
end;
end
local function merged(reader, merger)
local item1 = reader();
local merged = { item1 };
return function()
while true do
if not item1 then return nil; end
local item2 = reader();
if not item2 then item1 = nil; return merged; end
if merger(item1, item2) then
--print("merged")
item1 = item2;
t_insert(merged, item1);
else
--print("unmerged", merged)
item1 = item2;
local tmp = merged;
merged = { item1 };
return tmp;
end
end
end;
end
return {
sorted = sorted;
merged = merged;
}

144
tools/migration/migrator/prosody_files.lua
View file

@ -1,144 +0,0 @@
local print = print;
local assert = assert;
local setmetatable = setmetatable;
local tonumber = tonumber;
local char = string.char;
local coroutine = coroutine;
local lfs = require "lfs";
local loadfile = loadfile;
local pcall = pcall;
local mtools = require "migrator.mtools";
local next = next;
local pairs = pairs;
local json = require "util.json";
local os_getenv = os.getenv;
local error = error;
prosody = {};
local dm = require "util.datamanager"
local function is_dir(path) return lfs.attributes(path, "mode") == "directory"; end
local function is_file(path) return lfs.attributes(path, "mode") == "file"; end
local function clean_path(path)
return path:gsub("\\", "/"):gsub("//+", "/"):gsub("^~", os_getenv("HOME") or "~");
end
local encode, decode; do
local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end });
decode = function (s) return s and (s:gsub("+", " "):gsub("%%([a-fA-F0-9][a-fA-F0-9])", urlcodes)); end
encode = function (s) return s and (s:gsub("%W", function (c) return format("%%%02x", c:byte()); end)); end
end
local function decode_dir(x)
if x:gsub("%%%x%x", ""):gsub("[a-zA-Z0-9]", "") == "" then
return decode(x);
end
end
local function decode_file(x)
if x:match(".%.dat$") and x:gsub("%.dat$", ""):gsub("%%%x%x", ""):gsub("[a-zA-Z0-9]", "") == "" then
return decode(x:gsub("%.dat$", ""));
end
end
local function prosody_dir(path, ondir, onfile, ...)
for x in lfs.dir(path) do
local xpath = path.."/"..x;
if decode_dir(x) and is_dir(xpath) then
ondir(xpath, x, ...);
elseif decode_file(x) and is_file(xpath) then
onfile(xpath, x, ...);
end
end
end
local function handle_root_file(path, name)
--print("root file: ", decode_file(name))
coroutine.yield { user = nil, host = nil, store = decode_file(name) };
end
local function handle_host_file(path, name, host)
--print("host file: ", decode_dir(host).."/"..decode_file(name))
coroutine.yield { user = nil, host = decode_dir(host), store = decode_file(name) };
end
local function handle_store_file(path, name, store, host)
--print("store file: ", decode_file(name).."@"..decode_dir(host).."/"..decode_dir(store))
coroutine.yield { user = decode_file(name), host = decode_dir(host), store = decode_dir(store) };
end
local function handle_host_store(path, name, host)
prosody_dir(path, function() end, handle_store_file, name, host);
end
local function handle_host_dir(path, name)
prosody_dir(path, handle_host_store, handle_host_file, name);
end
local function handle_root_dir(path)
prosody_dir(path, handle_host_dir, handle_root_file);
end
local function decode_user(item)
local userdata = {
user = item[1].user;
host = item[1].host;
stores = {};
};
for i=1,#item do -- loop over stores
local result = {};
local store = item[i];
userdata.stores[store.store] = store.data;
store.user = nil; store.host = nil; store.store = nil;
end
return userdata;
end
local function reader(input)
local path = clean_path(assert(input.path, "no input.path specified"));
assert(is_dir(path), "input.path is not a directory");
local iter = coroutine.wrap(function()handle_root_dir(path);end);
-- get per-user stores, sorted
local iter = mtools.sorted {
reader = function()
local x = iter();
while x do
dm.set_data_path(path);
local err;
x.data, err = dm.load(x.user, x.host, x.store);
if x.data == nil and err then
local p = dm.getpath(x.user, x.host, x.store);
print(("Error loading data at path %s for %s@%s (%s store): %s")
:format(p, x.user or "<nil>", x.host or "<nil>", x.store or "<nil>", err or "<nil>"));
else
return x;
end
x = iter();
end
end;
sorter = function(a, b)
local a_host, a_user, a_store = a.host or "", a.user or "", a.store or "";
local b_host, b_user, b_store = b.host or "", b.user or "", b.store or "";
return a_host > b_host or (a_host==b_host and a_user > b_user) or (a_host==b_host and a_user==b_user and a_store > b_store);
end;
};
-- merge stores to get users
iter = mtools.merged(iter, function(a, b)
return (a.host == b.host and a.user == b.user);
end);
return function()
local x = iter();
return x and decode_user(x);
end
end
local function writer(output)
local path = clean_path(assert(output.path, "no output.path specified"));
assert(is_dir(path), "output.path is not a directory");
return function(item)
if not item then return; end -- end of input
dm.set_data_path(path);
for store, data in pairs(item.stores) do
assert(dm.store(item.user, item.host, store, data));
end
end
end
return {
reader = reader;
writer = writer;
}

190
tools/migration/migrator/prosody_sql.lua
View file

@ -1,190 +0,0 @@
local assert = assert;
local have_DBI = pcall(require,"DBI");
local print = print;
local type = type;
local next = next;
local pairs = pairs;
local t_sort = table.sort;
local json = require "util.json";
local mtools = require "migrator.mtools";
local tostring = tostring;
local tonumber = tonumber;
if not have_DBI then
error("LuaDBI (required for SQL support) was not found, please see https://prosody.im/doc/depends#luadbi", 0);
end
local sql = require "util.sql";
local function create_table(engine, name) -- luacheck: ignore 431/engine
local Table, Column, Index = sql.Table, sql.Column, sql.Index;
local ProsodyTable = Table {
name= name or "prosody";
Column { name="host", type="TEXT", nullable=false };
Column { name="user", type="TEXT", nullable=false };
Column { name="store", type="TEXT", nullable=false };
Column { name="key", type="TEXT", nullable=false };
Column { name="type", type="TEXT", nullable=false };
Column { name="value", type="MEDIUMTEXT", nullable=false };
Index { name="prosody_index", "host", "user", "store", "key" };
};
engine:transaction(function()
ProsodyTable:create(engine);
end);
end
local function serialize(value)
local t = type(value);
if t == "string" or t == "boolean" or t == "number" then
return t, tostring(value);
elseif t == "table" then
local value,err = json.encode(value);
if value then return "json", value; end
return nil, err;
end
return nil, "Unhandled value type: "..t;
end
local function deserialize(t, value)
if t == "string" then return value;
elseif t == "boolean" then
if value == "true" then return true;
elseif value == "false" then return false; end
elseif t == "number" then return tonumber(value);
elseif t == "json" then
return json.decode(value);
end
end
local function decode_user(item)
local userdata = {
user = item[1][1].user;
host = item[1][1].host;
stores = {};
};
for i=1,#item do -- loop over stores
local result = {};
local store = item[i];
for i=1,#store do -- loop over store data
local row = store[i];
local k = row.key;
local v = deserialize(row.type, row.value);
if k and v then
if k ~= "" then result[k] = v; elseif type(v) == "table" then
for a,b in pairs(v) do
result[a] = b;
end
end
end
userdata.stores[store[1].store] = result;
end
end
return userdata;
end
local function needs_upgrade(engine, params)
if params.driver == "MySQL" then
local success = engine:transaction(function()
local result = engine:execute("SHOW COLUMNS FROM prosody WHERE Field='value' and Type='text'");
assert(result:rowcount() == 0);
-- COMPAT w/pre-0.10: Upgrade table to UTF-8 if not already
local check_encoding_query = [[
SELECT "COLUMN_NAME","COLUMN_TYPE","TABLE_NAME"
FROM "information_schema"."columns"
WHERE "TABLE_NAME" LIKE 'prosody%%' AND ( "CHARACTER_SET_NAME"!='%s' OR "COLLATION_NAME"!='%s_bin' );
]];
check_encoding_query = check_encoding_query:format(engine.charset, engine.charset);
local result = engine:execute(check_encoding_query);
assert(result:rowcount() == 0)
end);
if not success then
-- Upgrade required
return true;
end
end
return false;
end
local function reader(input)
local engine = assert(sql:create_engine(input, function (engine) -- luacheck: ignore 431/engine
if needs_upgrade(engine, input) then
error("Old database format detected. Please run: prosodyctl mod_storage_sql upgrade");
end
end));
local keys = {"host", "user", "store", "key", "type", "value"};
assert(engine:connect());
local f,s,val = assert(engine:select("SELECT \"host\", \"user\", \"store\", \"key\", \"type\", \"value\" FROM \"prosody\";"));
-- get SQL rows, sorted
local iter = mtools.sorted {
reader = function() val = f(s, val); return val; end;
filter = function(x)
for i=1,#keys do
x[ keys[i] ] = x[i];
end
if x.host == "" then x.host = nil; end
if x.user == "" then x.user = nil; end
if x.store == "" then x.store = nil; end
return x;
end;
sorter = function(a, b)
local a_host, a_user, a_store = a.host or "", a.user or "", a.store or "";
local b_host, b_user, b_store = b.host or "", b.user or "", b.store or "";
return a_host > b_host or (a_host==b_host and a_user > b_user) or (a_host==b_host and a_user==b_user and a_store > b_store);
end;
};
-- merge rows to get stores
iter = mtools.merged(iter, function(a, b)
return (a.host == b.host and a.user == b.user and a.store == b.store);
end);
-- merge stores to get users
iter = mtools.merged(iter, function(a, b)
return (a[1].host == b[1].host and a[1].user == b[1].user);
end);
return function()
local x = iter();
return x and decode_user(x);
end;
end
local function writer(output, iter)
local engine = assert(sql:create_engine(output, function (engine) -- luacheck: ignore 431/engine
if needs_upgrade(engine, output) then
error("Old database format detected. Please run: prosodyctl mod_storage_sql upgrade");
end
create_table(engine);
end));
assert(engine:connect());
assert(engine:delete("DELETE FROM \"prosody\""));
local insert_sql = "INSERT INTO \"prosody\" (\"host\",\"user\",\"store\",\"key\",\"type\",\"value\") VALUES (?,?,?,?,?,?)";
return function(item)
if not item then assert(engine.conn:commit()) return end -- end of input
local host = item.host or "";
local user = item.user or "";
for store, data in pairs(item.stores) do
-- TODO transactions
local extradata = {};
for key, value in pairs(data) do
if type(key) == "string" and key ~= "" then
local t, value = assert(serialize(value));
local ok, err = assert(engine:insert(insert_sql, host, user, store, key, t, value));
else
extradata[key] = value;
end
end
if next(extradata) ~= nil then
local t, extradata = assert(serialize(extradata));
local ok, err = assert(engine:insert(insert_sql, host, user, store, "", t, extradata));
end
end
end;
end
return {
reader = reader;
writer = writer;
}

154
tools/migration/prosody-migrator.lua
View file

@ -1,19 +1,43 @@
#!/usr/bin/env lua
CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
CFG_SOURCEDIR=CFG_SOURCEDIR or os.getenv("PROSODY_SRCDIR");
CFG_CONFIGDIR=CFG_CONFIGDIR or os.getenv("PROSODY_CFGDIR");
CFG_PLUGINDIR=CFG_PLUGINDIR or os.getenv("PROSODY_PLUGINDIR");
CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
-- Substitute ~ with path to home directory in paths
if CFG_CONFIGDIR then
CFG_CONFIGDIR = CFG_CONFIGDIR:gsub("^~", os.getenv("HOME"));
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
local function is_relative(path)
local path_sep = package.config:sub(1,1);
return ((path_sep == "/" and path:sub(1,1) ~= "/")
or (path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\")))
end
-- Tell Lua where to find our libraries
if CFG_SOURCEDIR then
CFG_SOURCEDIR = CFG_SOURCEDIR:gsub("^~", os.getenv("HOME"));
local function filter_relative_paths(path)
if is_relative(path) then return ""; end
end
local function sanitise_paths(paths)
return (paths:gsub("[^;]+;?", filter_relative_paths):gsub(";;+", ";"));
end
package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path);
package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath);
end
-- Substitute ~ with path to home directory in data path
if CFG_DATADIR then
if os.getenv("HOME") then
CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
end
end
local default_config = (CFG_CONFIGDIR or ".").."/migrator.cfg.lua";
local startup = require "util.startup";
startup.prosodyctl();
-- TODO startup.migrator ?
-- Command-line parsing
local options = {};
local i = 1;
@ -29,13 +53,6 @@ while arg[i] do
end
end
if CFG_SOURCEDIR then
package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
else
package.path = "../../?.lua;"..package.path
package.cpath = "../../?.so;"..package.cpath
end
local envloadfile = require "util.envload".envloadfile;
@ -69,24 +86,14 @@ if not config[to_store] then
print("Error: Output store '"..to_store.."' not found in the config file.");
end
function load_store_handler(name)
local store_type = config[name].type;
if not store_type then
print("Error: "..name.." store type not specified in the config file");
return false;
else
local ok, err = pcall(require, "migrator."..store_type);
if not ok then
print(("Error: Failed to initialize '%s' store:\n\t%s")
:format(name, err));
return false;
end
for store, conf in pairs(config) do -- COMPAT
if conf.type == "prosody_files" then
conf.type = "internal";
elseif conf.type == "prosody_sql" then
conf.type = "sql";
end
return true;
end
have_err = have_err or not(load_store_handler(from_store, "input") and load_store_handler(to_store, "output"));
if have_err then
print("");
print("Usage: "..arg[0].." FROM_STORE TO_STORE");
@ -101,17 +108,88 @@ if have_err then
os.exit(1);
end
local itype = config[from_store].type;
local otype = config[to_store].type;
local reader = require("migrator."..itype).reader(config[from_store]);
local writer = require("migrator."..otype).writer(config[to_store]);
local async = require "util.async";
local server = require "net.server";
local watchers = {
error = function (_, err)
error(err);
end;
waiting = function ()
server.loop();
end;
};
local json = require "util.json";
local cm = require "core.configmanager";
local hm = require "core.hostmanager";
local sm = require "core.storagemanager";
local um = require "core.usermanager";
local function users(store, host)
if store.users then
return store:users();
else
return um.users(host);
end
end
local function prepare_config(host, conf)
if conf.type == "internal" then
sm.olddm.set_data_path(conf.path or prosody.paths.data);
elseif conf.type == "sql" then
cm.set(host, "sql", conf);
end
end
local function get_driver(host, conf)
prepare_config(host, conf);
return assert(sm.load_driver(host, conf.type));
end
local migration_runner = async.runner(function (job)
for host, stores in pairs(job.input.hosts) do
prosody.hosts[host] = startup.make_host(host);
sm.initialize_host(host);
um.initialize_host(host);
local input_driver = get_driver(host, job.input);
local output_driver = get_driver(host, job.output);
for _, store in ipairs(stores) do
local p, typ = store:match("()%-(%w+)$");
if typ then store = store:sub(1, p-1); else typ = "keyval"; end
log("info", "Migrating host %s store %s (%s)", host, store, typ);
local origin = assert(input_driver:open(store, typ));
local destination = assert(output_driver:open(store, typ));
if typ == "keyval" then -- host data
local data, err = origin:get(nil);
assert(not err, err);
assert(destination:set(nil, data));
end
for user in users(origin, host) do
if typ == "keyval" then
local data, err = origin:get(user);
assert(not err, err);
assert(destination:set(user, data));
elseif typ == "archive" then
local iter, err = origin:find(user);
assert(iter, err);
for id, item, when, with in iter do
assert(destination:append(user, id, item, when, with));
end
else
error("Don't know how to migrate data of type '"..typ.."'.");
end
end
end
end
end, watchers);
io.stderr:write("Migrating...\n");
for x in reader do
--print(json.encode(x))
writer(x);
end
writer(nil); -- close
migration_runner:run({ input = config[from_store], output = config[to_store] });
io.stderr:write("Done!\n");

52
util-src/encodings.c
View file

@ -268,6 +268,7 @@ static const luaL_Reg Reg_utf8[] = {
#include <unicode/usprep.h>
#include <unicode/ustring.h>
#include <unicode/utrace.h>
#include <unicode/uspoof.h>
static int icu_stringprep_prep(lua_State *L, const UStringPrepProfile *profile) {
size_t input_len;
@ -321,15 +322,23 @@ UStringPrepProfile *icu_nameprep;
UStringPrepProfile *icu_nodeprep;
UStringPrepProfile *icu_resourceprep;
UStringPrepProfile *icu_saslprep;
USpoofChecker *icu_spoofcheck;
#if (U_ICU_VERSION_MAJOR_NUM < 58)
/* COMPAT */
#define USPOOF_CONFUSABLE (USPOOF_SINGLE_SCRIPT_CONFUSABLE | USPOOF_MIXED_SCRIPT_CONFUSABLE | USPOOF_WHOLE_SCRIPT_CONFUSABLE)
#endif
/* initialize global ICU stringprep profiles */
void init_icu() {
void init_icu(void) {
UErrorCode err = U_ZERO_ERROR;
utrace_setLevel(UTRACE_VERBOSE);
icu_nameprep = usprep_openByType(USPREP_RFC3491_NAMEPREP, &err);
icu_nodeprep = usprep_openByType(USPREP_RFC3920_NODEPREP, &err);
icu_resourceprep = usprep_openByType(USPREP_RFC3920_RESOURCEPREP, &err);
icu_saslprep = usprep_openByType(USPREP_RFC4013_SASLPREP, &err);
icu_spoofcheck = uspoof_open(&err);
uspoof_setChecks(icu_spoofcheck, USPOOF_CONFUSABLE, &err);
if(U_FAILURE(err)) {
fprintf(stderr, "[c] util.encodings: error: %s\n", u_errorName((UErrorCode)err));
@ -477,6 +486,40 @@ static int Lidna_to_unicode(lua_State *L) { /** idna.to_unicode(s) */
}
}
static int Lskeleton(lua_State *L) {
size_t len;
int32_t ulen, dest_len, output_len;
const char *s = luaL_checklstring(L, 1, &len);
UErrorCode err = U_ZERO_ERROR;
UChar ustr[1024];
UChar dest[1024];
char output[1024];
u_strFromUTF8(ustr, 1024, &ulen, s, len, &err);
if(U_FAILURE(err)) {
lua_pushnil(L);
return 1;
}
dest_len = uspoof_getSkeleton(icu_spoofcheck, 0, ustr, ulen, dest, 1024, &err);
if(U_FAILURE(err)) {
lua_pushnil(L);
return 1;
}
u_strToUTF8(output, 1024, &output_len, dest, dest_len, &err);
if(U_SUCCESS(err)) {
lua_pushlstring(L, output, output_len);
return 1;
}
lua_pushnil(L);
return 1;
}
#else /* USE_STRINGPREP_ICU */
/****************** libidn ********************/
@ -558,6 +601,13 @@ LUALIB_API int luaopen_util_encodings(lua_State *L) {
luaL_setfuncs(L, Reg_utf8, 0);
lua_setfield(L, -2, "utf8");
#ifdef USE_STRINGPREP_ICU
lua_newtable(L);
lua_pushcfunction(L, Lskeleton);
lua_setfield(L, -2, "skeleton");
lua_setfield(L, -2, "confusable");
#endif
lua_pushliteral(L, "-3.14");
lua_setfield(L, -2, "version");
return 1;

106
util-src/hashes.c
View file

@ -26,6 +26,7 @@ typedef unsigned __int32 uint32_t;
#include <openssl/sha.h>
#include <openssl/md5.h>
#include <openssl/hmac.h>
#include <openssl/evp.h>
#if (LUA_VERSION_NUM == 501)
#define luaL_setfuncs(L, R, N) luaL_register(L, NULL, R)
@ -75,44 +76,6 @@ struct hash_desc {
void *ctx, *ctxo;
};
static void hmac(struct hash_desc *desc, const char *key, size_t key_len,
const char *msg, size_t msg_len, unsigned char *result) {
union xory {
unsigned char bytes[64];
uint32_t quadbytes[16];
};
int i;
unsigned char hashedKey[64]; /* Maximum used digest length */
union xory k_ipad, k_opad;
if(key_len > 64) {
desc->Init(desc->ctx);
desc->Update(desc->ctx, key, key_len);
desc->Final(hashedKey, desc->ctx);
key = (const char *)hashedKey;
key_len = desc->digestLength;
}
memcpy(k_ipad.bytes, key, key_len);
memset(k_ipad.bytes + key_len, 0, 64 - key_len);
memcpy(k_opad.bytes, k_ipad.bytes, 64);
for(i = 0; i < 16; i++) {
k_ipad.quadbytes[i] ^= HMAC_IPAD;
k_opad.quadbytes[i] ^= HMAC_OPAD;
}
desc->Init(desc->ctx);
desc->Update(desc->ctx, k_ipad.bytes, 64);
desc->Init(desc->ctxo);
desc->Update(desc->ctxo, k_opad.bytes, 64);
desc->Update(desc->ctx, msg, msg_len);
desc->Final(result, desc->ctx);
desc->Update(desc->ctxo, result, desc->digestLength);
desc->Final(result, desc->ctxo);
}
#define MAKE_HMAC_FUNCTION(myFunc, evp, size, type) \
static int myFunc(lua_State *L) { \
unsigned char hash[size], result[2*size]; \
@ -136,56 +99,37 @@ MAKE_HMAC_FUNCTION(Lhmac_sha256, EVP_sha256, SHA256_DIGEST_LENGTH, SHA256_CTX)
MAKE_HMAC_FUNCTION(Lhmac_sha512, EVP_sha512, SHA512_DIGEST_LENGTH, SHA512_CTX)
MAKE_HMAC_FUNCTION(Lhmac_md5, EVP_md5, MD5_DIGEST_LENGTH, MD5_CTX)
static int LscramHi(lua_State *L) {
union xory {
unsigned char bytes[SHA_DIGEST_LENGTH];
uint32_t quadbytes[SHA_DIGEST_LENGTH / 4];
};
int i;
SHA_CTX ctx, ctxo;
unsigned char Ust[SHA_DIGEST_LENGTH];
union xory Und;
union xory res;
size_t str_len, salt_len;
struct hash_desc desc;
const char *str = luaL_checklstring(L, 1, &str_len);
const char *salt = luaL_checklstring(L, 2, &salt_len);
char *salt2;
static int Lpbkdf2_sha1(lua_State *L) {
unsigned char out[SHA_DIGEST_LENGTH];
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);
desc.Init = (int (*)(void *))SHA1_Init;
desc.Update = (int (*)(void *, const void *, size_t))SHA1_Update;
desc.Final = (int (*)(unsigned char *, void *))SHA1_Final;
desc.digestLength = SHA_DIGEST_LENGTH;
desc.ctx = &ctx;
desc.ctxo = &ctxo;
salt2 = malloc(salt_len + 4);
if(salt2 == NULL) {
return luaL_error(L, "Out of memory in scramHi");
if(PKCS5_PBKDF2_HMAC(pass, pass_len, salt, salt_len, iter, EVP_sha1(), SHA_DIGEST_LENGTH, out) == 0) {
return luaL_error(L, "PKCS5_PBKDF2_HMAC() failed");
}
memcpy(salt2, salt, salt_len);
memcpy(salt2 + salt_len, "\0\0\0\1", 4);
hmac(&desc, str, str_len, salt2, salt_len + 4, Ust);
free(salt2);
lua_pushlstring(L, (char *)out, SHA_DIGEST_LENGTH);
memcpy(res.bytes, Ust, sizeof(res));
return 1;
}
for(i = 1; i < iter; i++) {
int j;
hmac(&desc, str, str_len, (char *)Ust, sizeof(Ust), Und.bytes);
for(j = 0; j < SHA_DIGEST_LENGTH / 4; j++) {
res.quadbytes[j] ^= Und.quadbytes[j];
}
static int Lpbkdf2_sha256(lua_State *L) {
unsigned char out[SHA256_DIGEST_LENGTH];
memcpy(Ust, Und.bytes, sizeof(Ust));
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_sha256(), SHA256_DIGEST_LENGTH, out) == 0) {
return luaL_error(L, "PKCS5_PBKDF2_HMAC() failed");
}
lua_pushlstring(L, (char *)res.bytes, SHA_DIGEST_LENGTH);
lua_pushlstring(L, (char *)out, SHA_DIGEST_LENGTH);
return 1;
}
@ -200,7 +144,9 @@ static const luaL_Reg Reg[] = {
{ "hmac_sha256", Lhmac_sha256 },
{ "hmac_sha512", Lhmac_sha512 },
{ "hmac_md5", Lhmac_md5 },
{ "scram_Hi_sha1", LscramHi },
{ "scram_Hi_sha1", Lpbkdf2_sha1 }, /* COMPAT */
{ "pbkdf2_hmac_sha1", Lpbkdf2_sha1 },
{ "pbkdf2_hmac_sha256", Lpbkdf2_sha256 },
{ NULL, NULL }
};
@ -209,7 +155,7 @@ LUALIB_API int luaopen_util_hashes(lua_State *L) {
luaL_checkversion(L);
#endif
lua_newtable(L);
luaL_setfuncs(L, Reg, 0);;
luaL_setfuncs(L, Reg, 0);
lua_pushliteral(L, "-3.14");
lua_setfield(L, -2, "version");
return 1;

18
util-src/poll.c
View file

@ -59,7 +59,7 @@ typedef struct Lpoll_state {
/*
* Add an FD to be watched
*/
int Ladd(lua_State *L) {
static int Ladd(lua_State *L) {
struct Lpoll_state *state = luaL_checkudata(L, 1, STATE_MT);
int fd = luaL_checkinteger(L, 2);
@ -137,7 +137,7 @@ int Ladd(lua_State *L) {
/*
* Set events to watch for, readable and/or writable
*/
int Lset(lua_State *L) {
static int Lset(lua_State *L) {
struct Lpoll_state *state = luaL_checkudata(L, 1, STATE_MT);
int fd = luaL_checkinteger(L, 2);
@ -200,7 +200,7 @@ int Lset(lua_State *L) {
/*
* Remove FDs
*/
int Ldel(lua_State *L) {
static int Ldel(lua_State *L) {
struct Lpoll_state *state = luaL_checkudata(L, 1, STATE_MT);
int fd = luaL_checkinteger(L, 2);
@ -247,7 +247,7 @@ int Ldel(lua_State *L) {
/*
* Check previously manipulated event state for FDs ready for reading or writing
*/
int Lpushevent(lua_State *L, struct Lpoll_state *state) {
static int Lpushevent(lua_State *L, struct Lpoll_state *state) {
#ifdef USE_EPOLL
if(state->processed > 0) {
@ -281,7 +281,7 @@ int Lpushevent(lua_State *L, struct Lpoll_state *state) {
/*
* Wait for event
*/
int Lwait(lua_State *L) {
static int Lwait(lua_State *L) {
struct Lpoll_state *state = luaL_checkudata(L, 1, STATE_MT);
int ret = Lpushevent(L, state);
@ -344,7 +344,7 @@ int Lwait(lua_State *L) {
/*
* Return Epoll FD
*/
int Lgetfd(lua_State *L) {
static int Lgetfd(lua_State *L) {
struct Lpoll_state *state = luaL_checkudata(L, 1, STATE_MT);
lua_pushinteger(L, state->epoll_fd);
return 1;
@ -353,7 +353,7 @@ int Lgetfd(lua_State *L) {
/*
* Close epoll FD
*/
int Lgc(lua_State *L) {
static int Lgc(lua_State *L) {
struct Lpoll_state *state = luaL_checkudata(L, 1, STATE_MT);
if(state->epoll_fd == -1) {
@ -375,7 +375,7 @@ int Lgc(lua_State *L) {
/*
* String representation
*/
int Ltos(lua_State *L) {
static int Ltos(lua_State *L) {
struct Lpoll_state *state = luaL_checkudata(L, 1, STATE_MT);
lua_pushfstring(L, "%s: %p", STATE_MT, state);
return 1;
@ -384,7 +384,7 @@ int Ltos(lua_State *L) {
/*
* Create a new context
*/
int Lnew(lua_State *L) {
static int Lnew(lua_State *L) {
/* Allocate state */
Lpoll_state *state = lua_newuserdata(L, sizeof(Lpoll_state));
luaL_setmetatable(L, STATE_MT);

4
util-src/pposix.c
View file

@ -25,14 +25,18 @@
#define _DEFAULT_SOURCE
#endif
#endif
#if defined(__APPLE__)
#ifndef _DARWIN_C_SOURCE
#define _DARWIN_C_SOURCE
#endif
#endif
#if ! defined(__FreeBSD__)
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200809L
#endif
#endif
#include <stdlib.h>
#include <math.h>

2
util-src/time.c
View file

@ -1,5 +1,5 @@
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 199309L
#define _POSIX_C_SOURCE 200809L
#endif
#include <time.h>

2
util/datamanager.lua
View file

@ -24,7 +24,7 @@ local t_concat = table.concat;
local envloadfile = require"util.envload".envloadfile;
local serialize = require "util.serialization".serialize;
local lfs = require "lfs";
-- Extract directory seperator from package.config (an undocumented string that comes with lua)
-- Extract directory separator from package.config (an undocumented string that comes with lua)
local path_separator = assert ( package.config:match ( "^([^\n]+)" ) , "package.config not in standard form" )
local prosody = prosody;

2
util/dependencies.lua
View file

@ -140,7 +140,7 @@ local function check_dependencies()
end
local function log_warnings()
if _VERSION > "Lua 5.2" then
if _VERSION > "Lua 5.3" then
prosody.log("warn", "Support for %s is experimental, please report any issues", _VERSION);
end
local ssl = softreq"ssl";

52
util/error.lua Normal file
View file

@ -0,0 +1,52 @@
local error_mt = { __name = "error" };
function error_mt:__tostring()
return ("error<%s:%s:%s>"):format(self.type, self.condition, self.text);
end
local function is_err(e)
return getmetatable(e) == error_mt;
end
local function new(e, context, registry)
local template = (registry and registry[e]) or e or {};
return setmetatable({
type = template.type or "cancel";
condition = template.condition or "undefined-condition";
text = template.text;
context = context or template.context or { _error_id = e };
}, error_mt);
end
local function coerce(ok, err, ...)
if ok or is_err(err) then
return ok, err, ...;
end
local new_err = setmetatable({
native = err;
type = "cancel";
condition = "undefined-condition";
}, error_mt);
return ok, new_err, ...;
end
local function from_stanza(stanza, context)
local error_type, condition, text = stanza:get_error();
return setmetatable({
type = error_type or "cancel";
condition = condition or "undefined-condition";
text = text;
context = context or { stanza = stanza };
}, error_mt);
end
return {
new = new;
coerce = coerce;
is_err = is_err;
from_stanza = from_stanza;
}

27
util/format.lua
View file

@ -3,12 +3,20 @@
--
local tostring = tostring;
local select = select;
local unpack = table.unpack or unpack; -- luacheck: ignore 113/unpack
local pack = require "util.table".pack; -- TODO table.pack in 5.2+
local type = type;
local dump = require "util.serialization".new("debug");
local num_type = math.type or function (n)
return n % 1 == 0 and n <= 9007199254740992 and n >= -9007199254740992 and "integer" or "float";
end
-- In Lua 5.3+ these formats throw an error if given a float
local expects_integer = { c = true, d = true, i = true, o = true, u = true, X = true, x = true, };
local function format(formatstring, ...)
local args, args_length = { ... }, select('#', ...);
local args = pack(...);
local args_length = args.n;
-- format specifier spec:
-- 1. Start: '%%'
@ -28,17 +36,22 @@ local function format(formatstring, ...)
if spec ~= "%%" then
i = i + 1;
local arg = args[i];
if arg == nil then -- special handling for nil
arg = "<nil>"
args[i] = "<nil>";
end
local option = spec:sub(-1);
if option == "q" or option == "s" then -- arg should be string
if arg == nil then
args[i] = "nil";
spec = "<%s>";
elseif option == "q" then
args[i] = dump(arg);
spec = "%s";
elseif option == "s" then
args[i] = tostring(arg);
elseif type(arg) ~= "number" then -- arg isn't number as expected?
args[i] = tostring(arg);
spec = "[%s]";
elseif expects_integer[option] and num_type(arg) ~= "integer" then
args[i] = tostring(arg);
spec = "[%s]";
end
end
return spec;

88
util/hashring.lua Normal file
View file

@ -0,0 +1,88 @@
local function generate_ring(nodes, num_replicas, hash)
local new_ring = {};
for _, node_name in ipairs(nodes) do
for replica = 1, num_replicas do
local replica_hash = hash(node_name..":"..replica);
new_ring[replica_hash] = node_name;
table.insert(new_ring, replica_hash);
end
end
table.sort(new_ring);
return new_ring;
end
local hashring_methods = {};
local hashring_mt = {
__index = function (self, k)
-- Automatically build self.ring if it's missing
if k == "ring" then
local ring = generate_ring(self.nodes, self.num_replicas, self.hash);
rawset(self, "ring", ring);
return ring;
end
return rawget(hashring_methods, k);
end
};
local function new(num_replicas, hash_function)
return setmetatable({ nodes = {}, num_replicas = num_replicas, hash = hash_function }, hashring_mt);
end;
function hashring_methods:add_node(name)
self.ring = nil;
self.nodes[name] = true;
table.insert(self.nodes, name);
return true;
end
function hashring_methods:add_nodes(nodes)
self.ring = nil;
for _, node_name in ipairs(nodes) do
if not self.nodes[node_name] then
self.nodes[node_name] = true;
table.insert(self.nodes, node_name);
end
end
return true;
end
function hashring_methods:remove_node(node_name)
self.ring = nil;
if self.nodes[node_name] then
for i, stored_node_name in ipairs(self.nodes) do
if node_name == stored_node_name then
self.nodes[node_name] = nil;
table.remove(self.nodes, i);
return true;
end
end
end
return false;
end
function hashring_methods:remove_nodes(nodes)
self.ring = nil;
for _, node_name in ipairs(nodes) do
self:remove_node(node_name);
end
end
function hashring_methods:clone()
local clone_hashring = new(self.num_replicas, self.hash);
clone_hashring:add_nodes(self.nodes);
return clone_hashring;
end
function hashring_methods:get_node(key)
local key_hash = self.hash(key);
for _, replica_hash in ipairs(self.ring) do
if key_hash < replica_hash then
return self.ring[replica_hash];
end
end
return self.ring[self.ring[1]];
end
return {
new = new;
}

9
util/hmac.lua
View file

@ -10,6 +10,9 @@
local hashes = require "util.hashes"
return { md5 = hashes.hmac_md5,
sha1 = hashes.hmac_sha1,
sha256 = hashes.hmac_sha256 };
return {
md5 = hashes.hmac_md5,
sha1 = hashes.hmac_sha1,
sha256 = hashes.hmac_sha256,
sha512 = hashes.hmac_sha512,
};

22
util/http.lua
View file

@ -6,24 +6,26 @@
--
local format, char = string.format, string.char;
local pairs, ipairs, tonumber = pairs, ipairs, tonumber;
local pairs, ipairs = pairs, ipairs;
local t_insert, t_concat = table.insert, table.concat;
local url_codes = {};
for i = 0, 255 do
local c = char(i);
local u = format("%%%02x", i);
url_codes[c] = u;
url_codes[u] = c;
url_codes[u:upper()] = c;
end
local function urlencode(s)
return s and (s:gsub("[^a-zA-Z0-9.~_-]", function (c) return format("%%%02x", c:byte()); end));
return s and (s:gsub("[^a-zA-Z0-9.~_-]", url_codes));
end
local function urldecode(s)
return s and (s:gsub("%%(%x%x)", function (c) return char(tonumber(c,16)); end));
return s and (s:gsub("%%%x%x", url_codes));
end
local function _formencodepart(s)
return s and (s:gsub("%W", function (c)
if c ~= " " then
return format("%%%02x", c:byte());
else
return "+";
end
end));
return s and (urlencode(s):gsub("%%20", "+"));
end
local function formencode(form)

2
util/import.lua
View file

@ -8,7 +8,7 @@
local unpack = table.unpack or unpack; --luacheck: ignore 113 143
local unpack = table.unpack or unpack; --luacheck: ignore 113
local t_insert = table.insert;
function _G.import(module, ...)
local m = package.loaded[module] or require(module);

6
util/iterators.lua
View file

@ -11,9 +11,9 @@
local it = {};
local t_insert = table.insert;
local select, next = select, next;
local unpack = table.unpack or unpack; --luacheck: ignore 113 143
local pack = table.pack or function (...) return { n = select("#", ...), ... }; end -- luacheck: ignore 143
local next = next;
local unpack = table.unpack or unpack; --luacheck: ignore 113
local pack = table.pack or require "util.table".pack;
local type = type;
local table, setmetatable = table, setmetatable;

2
util/multitable.lua
View file

@ -9,7 +9,7 @@
local select = select;
local t_insert = table.insert;
local pairs, next, type = pairs, next, type;
local unpack = table.unpack or unpack; --luacheck: ignore 113 143
local unpack = table.unpack or unpack; --luacheck: ignore 113
local _ENV = nil;
-- luacheck: std none

Some files were not shown because too many files have changed in this diff Show more