aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/array.lua80
-rw-r--r--util/dataforms.lua82
-rw-r--r--util/datamanager.lua4
-rw-r--r--util/discohelper.lua89
-rw-r--r--util/helpers.lua17
-rw-r--r--util/iterators.lua33
-rw-r--r--util/muc.lua418
-rw-r--r--util/sasl.lua2
-rw-r--r--util/sasl/anonymous.lua35
-rw-r--r--util/sasl/digest-md5.lua8
-rw-r--r--util/stanza.lua46
-rw-r--r--util/timer.lua2
12 files changed, 239 insertions, 577 deletions
diff --git a/util/array.lua b/util/array.lua
index ce5ce077..686f55b1 100644
--- a/util/array.lua
+++ b/util/array.lua
@@ -6,9 +6,14 @@
-- COPYING file in the source package for more information.
--
+local t_insert, t_sort, t_remove, t_concat
+ = table.insert, table.sort, table.remove, table.concat;
+
local array = {};
+local array_base = {};
+local array_methods = {};
+local array_mt = { __index = array_methods, __tostring = function (array) return array:concat(", "); end };
-local array_mt = { __index = array, __tostring = function (array) return array:concat(", "); end };
local function new_array(_, t)
return setmetatable(t or {}, array_mt);
end
@@ -20,36 +25,47 @@ end
setmetatable(array, { __call = new_array });
-function array:map(func, t2)
- local t2 = t2 or array{};
- for k,v in ipairs(self) do
- t2[k] = func(v);
+function array_base.map(outa, ina, func)
+ for k,v in ipairs(ina) do
+ outa[k] = func(v);
end
- return t2;
+ return outa;
end
-function array:filter(func, t2)
- local t2 = t2 or array{};
- for k,v in ipairs(self) do
+function array_base.filter(outa, ina, func)
+ local inplace, start_length = ina == outa, #ina;
+ local write = 1;
+ for read=1,start_length do
+ local v = ina[read];
if func(v) then
- t2:push(v);
+ outa[write] = v;
+ write = write + 1;
+ end
+ end
+
+ if inplace and write <= start_length then
+ for i=write,start_length do
+ outa[i] = nil;
end
end
- return t2;
+
+ return outa;
end
+function array_base.sort(outa, ina, ...)
+ if ina ~= outa then
+ outa:append(ina);
+ end
+ t_sort(outa, ...);
+ return outa;
+end
-array.push = table.insert;
-array.pop = table.remove;
-array.sort = table.sort;
-array.concat = table.concat;
-array.length = function (t) return #t; end
-
-function array:random()
+--- These methods only mutate
+function array_methods:random()
return self[math.random(1,#self)];
end
-function array:shuffle()
+function array_methods:shuffle(outa, ina)
local len = #self;
for i=1,#self do
local r = math.random(i,len);
@@ -58,7 +74,7 @@ function array:shuffle()
return self;
end
-function array:reverse()
+function array_methods:reverse()
local len = #self-1;
for i=len,1,-1 do
self:push(self[i]);
@@ -67,7 +83,7 @@ function array:reverse()
return self;
end
-function array:append(array)
+function array_methods:append(array)
local len,len2 = #self, #array;
for i=1,len2 do
self[len+i] = array[i];
@@ -75,6 +91,12 @@ function array:append(array)
return self;
end
+array_methods.push = table.insert;
+array_methods.pop = table.remove;
+array_methods.concat = table.concat;
+array_methods.length = function (t) return #t; end
+
+--- These methods always create a new array
function array.collect(f, s, var)
local t, var = {};
while true do
@@ -85,6 +107,22 @@ function array.collect(f, s, var)
return setmetatable(t, array_mt);
end
+---
+
+-- Setup methods from array_base
+for method, f in pairs(array_base) do
+ local base_method = f;
+ -- Setup global array method which makes new array
+ array[method] = function (old_a, ...)
+ local a = new_array();
+ return base_method(a, old_a, ...);
+ end
+ -- Setup per-array (mutating) method
+ array_methods[method] = function (self, ...)
+ return base_method(self, self, ...);
+ end
+end
+
_G.array = array;
module("array");
diff --git a/util/dataforms.lua b/util/dataforms.lua
index ed62f9b1..5626172e 100644
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -10,7 +10,6 @@ local setmetatable = setmetatable;
local pairs, ipairs = pairs, ipairs;
local tostring, type = tostring, type;
local t_concat = table.concat;
-
local st = require "util.stanza";
module "dataforms"
@@ -37,34 +36,44 @@ function form_t.form(layout, data)
-- Add field tag
form:tag("field", { type = field_type, var = field.name, label = field.label });
- local value = data[field.name] or field.value;
+ local value = (data and data[field.name]) or field.value;
- -- Add value, depending on type
- if field_type == "hidden" then
- if type(value) == "table" then
- -- Assume an XML snippet
- form:tag("value")
- :add_child(value)
- :up();
- elseif value then
- form:tag("value"):text(tostring(value)):up();
- end
- elseif field_type == "boolean" then
- form:tag("value"):text((value and "1") or "0"):up();
- elseif field_type == "fixed" then
-
- elseif field_type == "jid-multi" then
- for _, jid in ipairs(value) do
- form:tag("value"):text(jid):up();
- end
- elseif field_type == "jid-single" then
- form:tag("value"):text(value):up();
- elseif field_type == "text-single" or field_type == "text-private" then
- form:tag("value"):text(value):up();
- elseif field_type == "text-multi" then
- -- Split into multiple <value> tags, one for each line
- for line in value:gmatch("([^\r\n]+)\r?\n*") do
- form:tag("value"):text(line):up();
+ if value then
+ -- Add value, depending on type
+ if field_type == "hidden" then
+ if type(value) == "table" then
+ -- Assume an XML snippet
+ form:tag("value")
+ :add_child(value)
+ :up();
+ else
+ form:tag("value"):text(tostring(value)):up();
+ end
+ elseif field_type == "boolean" then
+ form:tag("value"):text((value and "1") or "0"):up();
+ elseif field_type == "fixed" then
+
+ elseif field_type == "jid-multi" then
+ for _, jid in ipairs(value) do
+ form:tag("value"):text(jid):up();
+ end
+ elseif field_type == "jid-single" then
+ form:tag("value"):text(value):up();
+ elseif field_type == "text-single" or field_type == "text-private" then
+ form:tag("value"):text(value):up();
+ elseif field_type == "text-multi" then
+ -- Split into multiple <value> tags, one for each line
+ for line in value:gmatch("([^\r\n]+)\r?\n*") do
+ form:tag("value"):text(line):up();
+ end
+ elseif field_type == "list-single" then
+ for _, val in ipairs(value) do
+ if type(val) == "table" then
+ form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up();
+ else
+ form:tag("option", { label= val }):tag("value"):text(tostring(val)):up():up();
+ end
+ end
end
end
@@ -106,6 +115,20 @@ field_readers["text-single"] =
field_readers["text-private"] =
field_readers["text-single"];
+field_readers["jid-single"] =
+ field_readers["text-single"];
+
+field_readers["jid-multi"] =
+ function (field_tag)
+ local result = {};
+ for value_tag in field_tag:childtags() do
+ if value_tag.name == "value" then
+ result[#result+1] = value_tag[1];
+ end
+ end
+ return result;
+ end
+
field_readers["text-multi"] =
function (field_tag)
local result = {};
@@ -117,6 +140,9 @@ field_readers["text-multi"] =
return t_concat(result, "\n");
end
+field_readers["list-single"] =
+ field_readers["text-single"];
+
field_readers["boolean"] =
function (field_tag)
local value = field_tag:child_with_name("value");
diff --git a/util/datamanager.lua b/util/datamanager.lua
index dcc35bb5..4d07d6cc 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -137,7 +137,7 @@ function store(username, host, datastore, data)
append(f, data);
f:close();
if next(data) == nil then -- try to delete empty datastore
- log("debug", "Removing empty %s datastore for user %s@%s", datastore, username, host);
+ log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
os_remove(getpath(username, host, datastore));
end
-- we write data even when we are deleting because lua doesn't have a
@@ -179,7 +179,7 @@ function list_store(username, host, datastore, data)
end
f:close();
if next(data) == nil then -- try to delete empty datastore
- log("debug", "Removing empty %s datastore for user %s@%s", datastore, username, host);
+ log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
os_remove(getpath(username, host, datastore, "list"));
end
-- we write data even when we are deleting because lua doesn't have a
diff --git a/util/discohelper.lua b/util/discohelper.lua
deleted file mode 100644
index 5d9bf287..00000000
--- a/util/discohelper.lua
+++ /dev/null
@@ -1,89 +0,0 @@
--- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
---
--- This project is MIT/X11 licensed. Please see the
--- COPYING file in the source package for more information.
---
-
-
-
-local t_insert = table.insert;
-local jid_split = require "util.jid".split;
-local ipairs = ipairs;
-local st = require "util.stanza";
-
-module "discohelper";
-
-local function addDiscoItemsHandler(self, jid, func)
- if self.item_handlers[jid] then
- t_insert(self.item_handlers[jid], func);
- else
- self.item_handlers[jid] = {func};
- end
-end
-
-local function addDiscoInfoHandler(self, jid, func)
- if self.info_handlers[jid] then
- t_insert(self.info_handlers[jid], func);
- else
- self.info_handlers[jid] = {func};
- end
-end
-
-local function handle(self, stanza)
- if stanza.name == "iq" and stanza.tags[1].name == "query" then
- local query = stanza.tags[1];
- local to = stanza.attr.to;
- local from = stanza.attr.from
- local node = query.attr.node or "";
- local to_node, to_host = jid_split(to);
-
- local reply = st.reply(stanza):query(query.attr.xmlns);
- local handlers;
- if query.attr.xmlns == "http://jabber.org/protocol/disco#info" then -- select handler set
- handlers = self.info_handlers;
- elseif query.attr.xmlns == "http://jabber.org/protocol/disco#items" then
- handlers = self.item_handlers;
- end
- local handler;
- local found; -- to keep track of any handlers found
- if to_node then -- handlers which get called always
- handler = handlers["*node"];
- else
- handler = handlers["*host"];
- end
- if handler then -- call always called handler
- for _, h in ipairs(handler) do
- if h(reply, to, from, node) then found = true; end
- end
- end
- handler = handlers[to]; -- get the handler
- if not handler then -- if not found then use default handler
- if to_node then
- handler = handlers["*defaultnode"];
- else
- handler = handlers["*defaulthost"];
- end
- end
- if handler then
- for _, h in ipairs(handler) do
- if h(reply, to, from, node) then found = true; end
- end
- end
- if found then return reply; end -- return the reply if there was one
- return st.error_reply(stanza, "cancel", "service-unavailable");
- end
-end
-
-function new()
- return {
- item_handlers = {};
- info_handlers = {};
- addDiscoItemsHandler = addDiscoItemsHandler;
- addDiscoInfoHandler = addDiscoInfoHandler;
- handle = handle;
- };
-end
-
-return _M;
diff --git a/util/helpers.lua b/util/helpers.lua
index 80f72b3b..e69f1d98 100644
--- a/util/helpers.lua
+++ b/util/helpers.lua
@@ -1,3 +1,10 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
module("helpers", package.seeall);
@@ -14,6 +21,7 @@ function log_events(events, name, logger)
name = name or tostring(events);
function events.fire_event(event, ...)
logger("debug", "%s firing event: %s", name, event);
+ return f(event, ...);
end
events[events.fire_event] = f;
return events;
@@ -23,4 +31,13 @@ function revert_log_events(events)
events.fire_event, events[events.fire_event] = events[events.fire_event], nil; -- :)
end
+function get_upvalue(f, get_name)
+ local i, name, value = 0;
+ repeat
+ i = i + 1;
+ name, value = debug.getupvalue(f, i);
+ until name == get_name or name == nil;
+ return value;
+end
+
return _M;
diff --git a/util/iterators.lua b/util/iterators.lua
index 08bb729c..ba33bc80 100644
--- a/util/iterators.lua
+++ b/util/iterators.lua
@@ -78,6 +78,39 @@ function count(f, s, var)
return x;
end
+-- Return the first n items an iterator returns
+function head(n, f, s, var)
+ local c = 0;
+ return function (s, var)
+ if c >= n then
+ return nil;
+ end
+ c = c + 1;
+ return f(s, var);
+ end, s;
+end
+
+function tail(n, f, s, var)
+ local results, count = {}, 0;
+ while true do
+ local ret = { f(s, var) };
+ var = ret[1];
+ if var == nil then break; end
+ results[(count%n)+1] = ret;
+ count = count + 1;
+ end
+
+ if n > count then n = count; end
+
+ local pos = 0;
+ return function ()
+ pos = pos + 1;
+ if pos > n then return nil; end
+ return unpack(results[((count-1+pos)%n)+1]);
+ end
+ --return reverse(head(n, reverse(f, s, var)));
+end
+
-- Convert the values returned by an iterator to an array
function it2array(f, s, var)
local t, var = {};
diff --git a/util/muc.lua b/util/muc.lua
deleted file mode 100644
index badcffce..00000000
--- a/util/muc.lua
+++ /dev/null
@@ -1,418 +0,0 @@
--- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
---
--- This project is MIT/X11 licensed. Please see the
--- COPYING file in the source package for more information.
---
-
-local datamanager = require "util.datamanager";
-local datetime = require "util.datetime";
-
-local jid_split = require "util.jid".split;
-local jid_bare = require "util.jid".bare;
-local st = require "util.stanza";
-local log = require "util.logger".init("mod_muc");
-local multitable_new = require "util.multitable".new;
-local t_insert, t_remove = table.insert, table.remove;
-
-local muc_domain = nil; --module:get_host();
-local history_length = 20;
-
-------------
-local function filter_xmlns_from_array(array, filters)
- local count = 0;
- for i=#array,1,-1 do
- local attr = array[i].attr;
- if filters[attr and attr.xmlns] then
- t_remove(array, i);
- count = count + 1;
- end
- end
- return count;
-end
-local function filter_xmlns_from_stanza(stanza, filters)
- if filters then
- if filter_xmlns_from_array(stanza.tags, filters) ~= 0 then
- return stanza, filter_xmlns_from_array(stanza, filters);
- end
- end
- return stanza, 0;
-end
-local presence_filters = {["http://jabber.org/protocol/muc"]=true;["http://jabber.org/protocol/muc#user"]=true};
-local function get_filtered_presence(stanza)
- return filter_xmlns_from_stanza(st.clone(stanza), presence_filters);
-end
-local kickable_error_conditions = {
- ["gone"] = true;
- ["internal-server-error"] = true;
- ["item-not-found"] = true;
- ["jid-malformed"] = true;
- ["recipient-unavailable"] = true;
- ["redirect"] = true;
- ["remote-server-not-found"] = true;
- ["remote-server-timeout"] = true;
- ["service-unavailable"] = true;
-};
-local function get_kickable_error(stanza)
- for _, tag in ipairs(stanza.tags) do
- if tag.name == "error" and tag.attr.xmlns == "jabber:client" then
- for _, cond in ipairs(tag.tags) do
- if cond.attr.xmlns == "urn:ietf:params:xml:ns:xmpp-stanzas" then
- return kickable_error_conditions[cond.name] and cond.name;
- end
- end
- return true; -- malformed error message
- end
- end
- return true; -- malformed error message
-end
-local function getUsingPath(stanza, path, getText)
- local tag = stanza;
- for _, name in ipairs(path) do
- if type(tag) ~= 'table' then return; end
- tag = tag:child_with_name(name);
- end
- if tag and getText then tag = table.concat(tag); end
- return tag;
-end
-local function getTag(stanza, path) return getUsingPath(stanza, path); end
-local function getText(stanza, path) return getUsingPath(stanza, path, true); end
------------
-
---[[function get_room_disco_info(room, stanza)
- return st.iq({type='result', id=stanza.attr.id, from=stanza.attr.to, to=stanza.attr.from}):query("http://jabber.org/protocol/disco#info")
- :tag("identity", {category='conference', type='text', name=room._data["name"]):up()
- :tag("feature", {var="http://jabber.org/protocol/muc"}); -- TODO cache disco reply
-end
-function get_room_disco_items(room, stanza)
- return st.iq({type='result', id=stanza.attr.id, from=stanza.attr.to, to=stanza.attr.from}):query("http://jabber.org/protocol/disco#items");
-end -- TODO allow non-private rooms]]
-
---
-
-local function room_broadcast_presence(room, stanza, code, nick)
- stanza = get_filtered_presence(stanza);
- local data = room._participants[stanza.attr.from];
- stanza:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
- :tag("item", {affiliation=data.affiliation, role=data.role, nick=nick}):up();
- if code then
- stanza:tag("status", {code=code}):up();
- end
- local me;
- for occupant, o_data in pairs(room._participants) do
- if occupant ~= stanza.attr.from then
- for jid in pairs(o_data.sessions) do
- stanza.attr.to = jid;
- room:route_stanza(stanza);
- end
- else
- me = o_data;
- end
- end
- if me then
- stanza:tag("status", {code='110'});
- for jid in pairs(me.sessions) do
- stanza.attr.to = jid;
- room:route_stanza(stanza);
- end
- end
-end
-local function room_broadcast_message(room, stanza, historic)
- for occupant, o_data in pairs(room._participants) do
- for jid in pairs(o_data.sessions) do
- stanza.attr.to = jid;
- room:route_stanza(stanza);
- end
- end
- if historic then -- add to history
- local history = room._data['history'];
- if not history then history = {}; room._data['history'] = history; end
- -- stanza = st.clone(stanza);
- stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = muc_domain, stamp = datetime.datetime()}):up(); -- XEP-0203
- stanza:tag("x", {xmlns = "jabber:x:delay", from = muc_domain, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated)
- t_insert(history, st.clone(st.preserialize(stanza)));
- while #history > history_length do t_remove(history, 1) end
- end
-end
-
-
-local function room_send_occupant_list(room, to)
- local current_nick = room._jid_nick[to];
- for occupant, o_data in pairs(room._participants) do
- if occupant ~= current_nick then
- local pres = get_filtered_presence(o_data.sessions[o_data.jid]);
- pres.attr.to, pres.attr.from = to, occupant;
- pres:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
- :tag("item", {affiliation=o_data.affiliation, role=o_data.role}):up();
- room:route_stanza(pres);
- end
- end
-end
-local function room_send_history(room, to)
- local history = room._data['history']; -- send discussion history
- if history then
- for _, msg in ipairs(history) do
- msg = st.deserialize(msg);
- msg.attr.to=to;
- room:route_stanza(msg);
- end
- end
- if room._data['subject'] then
- room:route_stanza(st.message({type='groupchat', from=room.jid, to=to}):tag("subject"):text(room._data['subject']));
- end
-end
-
-local function room_get_disco_info(self, stanza) end
-local function room_get_disco_items(self, stanza) end
-local function room_set_subject(room, current_nick, subject)
- -- TODO check nick's authority
- if subject == "" then subject = nil; end
- room._data['subject'] = subject;
- local msg = st.message({type='groupchat', from=current_nick})
- :tag('subject'):text(subject):up();
- room_broadcast_message(room, msg, false);
- return true;
-end
-
-local function room_handle_to_occupant(self, origin, stanza) -- PM, vCards, etc
- local from, to = stanza.attr.from, stanza.attr.to;
- local room = jid_bare(to);
- local current_nick = self._jid_nick[from];
- local type = stanza.attr.type;
- log("debug", "room: %s, current_nick: %s, stanza: %s", room or "nil", current_nick or "nil", stanza:top_tag());
- if (select(2, jid_split(from)) == muc_domain) then error("Presence from the MUC itself!!!"); end
- if stanza.name == "presence" then
- local pr = get_filtered_presence(stanza);
- pr.attr.from = current_nick;
- if type == "error" then -- error, kick em out!
- if current_nick then
- log("debug", "kicking %s from %s", current_nick, room);
- room_handle_to_occupant(self, origin, st.presence({type='unavailable', from=from, to=to}):tag('status'):text('This participant is kicked from the room because he sent an error presence')); -- send unavailable
- end
- elseif type == "unavailable" then -- unavailable
- if current_nick then
- log("debug", "%s leaving %s", current_nick, room);
- local data = self._participants[current_nick];
- data.role = 'none';
- room_broadcast_presence(self, pr);
- self._participants[current_nick] = nil;
- self._jid_nick[from] = nil;
- end
- elseif not type then -- available
- if current_nick then
- --if #pr == #stanza or current_nick ~= to then -- commented because google keeps resending directed presence
- if current_nick == to then -- simple presence
- log("debug", "%s broadcasted presence", current_nick);
- self._participants[current_nick].sessions[from] = pr;
- room_broadcast_presence(self, pr);
- else -- change nick
- if self._participants[to] then
- log("debug", "%s couldn't change nick", current_nick);
- origin.send(st.error_reply(stanza, "cancel", "conflict"):tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
- else
- local data = self._participants[current_nick];
- local to_nick = select(3, jid_split(to));
- if to_nick then
- log("debug", "%s (%s) changing nick to %s", current_nick, data.jid, to);
- local p = st.presence({type='unavailable', from=current_nick});
- room_broadcast_presence(self, p, '303', to_nick);
- self._participants[current_nick] = nil;
- self._participants[to] = data;
- self._jid_nick[from] = to;
- pr.attr.from = to;
- self._participants[to].sessions[from] = pr;
- room_broadcast_presence(self, pr);
- else
- --TODO malformed-jid
- end
- end
- end
- --else -- possible rejoin
- -- log("debug", "%s had connection replaced", current_nick);
- -- handle_to_occupant(origin, st.presence({type='unavailable', from=from, to=to}):tag('status'):text('Replaced by new connection'):up()); -- send unavailable
- -- handle_to_occupant(origin, stanza); -- resend available
- --end
- else -- enter room
- local new_nick = to;
- if self._participants[to] then
- new_nick = nil;
- end
- if not new_nick then
- log("debug", "%s couldn't join due to nick conflict: %s", from, to);
- origin.send(st.error_reply(stanza, "cancel", "conflict"):tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
- else
- log("debug", "%s joining as %s", from, to);
- local data;
--- if not rooms:get(room) and not rooms_info:get(room) then -- new room
--- rooms_info:set(room, 'name', (jid_split(room)));
--- data = {affiliation='owner', role='moderator', jid=from, sessions={[from]=get_filtered_presence(stanza)}};
--- end
- if not data then -- new occupant
- data = {affiliation='none', role='participant', jid=from, sessions={[from]=get_filtered_presence(stanza)}};
- end
- self._participants[to] = data;
- self._jid_nick[from] = to;
- room_send_occupant_list(self, from);
- pr.attr.from = to;
- room_broadcast_presence(self, pr);
- room_send_history(self, from);
- end
- end
- elseif type ~= 'result' then -- bad type
- origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error?
- end
- elseif not current_nick and type ~= "error" and type ~= "result" then -- not in room
- origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
- elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM
- origin.send(st.error_reply(stanza, "modify", "bad-request"));
- elseif stanza.name == "message" and type == "error" and get_kickable_error(stanza) then
- log("debug", "%s kicked from %s for sending an error message", current_nick, room);
- room_handle_to_occupant(self, origin, st.presence({type='unavailable', from=from, to=to}):tag('status'):text('This participant is kicked from the room because he sent an error message to another occupant')); -- send unavailable
- else -- private stanza
- local o_data = self._participants[to];
- if o_data then
- log("debug", "%s sent private stanza to %s (%s)", from, to, o_data.jid);
- local jid = o_data.jid;
- -- TODO if stanza.name=='iq' and type=='get' and stanza.tags[1].attr.xmlns == 'vcard-temp' then jid = jid_bare(jid); end
- stanza.attr.to, stanza.attr.from = jid, current_nick;
- self:route_stanza(stanza);
- elseif type ~= "error" and type ~= "result" then -- recipient not in room
- origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room"));
- end
- end
-end
-
-local function room_handle_to_room(self, origin, stanza) -- presence changes and groupchat messages, along with disco/etc
- local type = stanza.attr.type;
- if stanza.name == "iq" and type == "get" then -- disco requests
- local xmlns = stanza.tags[1].attr.xmlns;
- if xmlns == "http://jabber.org/protocol/disco#info" then
- origin.send(room_get_disco_info(self, stanza));
- elseif xmlns == "http://jabber.org/protocol/disco#items" then
- origin.send(room_get_disco_items(self, stanza));
- else
- origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
- end
- elseif stanza.name == "message" and type == "groupchat" then
- local from, to = stanza.attr.from, stanza.attr.to;
- local room = jid_bare(to);
- local current_nick = self._jid_nick[from];
- if not current_nick then -- not in room
- origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
- else
- local from = stanza.attr.from;
- stanza.attr.from = current_nick;
- local subject = getText(stanza, {"subject"});
- if subject then
- self:set_subject(current_nick, subject); -- TODO use broadcast_message_stanza
- else
- room_broadcast_message(self, stanza, true);
- end
- end
- elseif stanza.name == "presence" then -- hack - some buggy clients send presence updates to the room rather than their nick
- local to = stanza.attr.to;
- local current_nick = self._jid_nick[stanza.attr.from];
- if current_nick then
- stanza.attr.to = current_nick;
- room_handle_to_occupant(self, origin, stanza);
- stanza.attr.to = to;
- elseif type ~= "error" and type ~= "result" then
- origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
- end
- elseif stanza.name == "message" and not stanza.attr.type and #stanza.tags == 1 and self._jid_nick[stanza.attr.from]
- and stanza.tags[1].name == "x" and stanza.tags[1].attr.xmlns == "http://jabber.org/protocol/muc#user" and #stanza.tags[1].tags == 1
- and stanza.tags[1].tags[1].name == "invite" and stanza.tags[1].tags[1].attr.to then
- local _from, _to = stanza.attr.from, stanza.attr.to;
- local _invitee = stanza.tags[1].tags[1].attr.to;
- stanza.attr.from, stanza.attr.to = _to, _invitee;
- stanza.tags[1].tags[1].attr.from, stanza.tags[1].tags[1].attr.to = _from, nil;
- self:route_stanza(stanza);
- stanza.tags[1].tags[1].attr.from, stanza.tags[1].tags[1].attr.to = nil, _invitee;
- stanza.attr.from, stanza.attr.to = _from, _to;
- else
- if type == "error" or type == "result" then return; end
- origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
- end
-end
-
-local function room_handle_stanza(self, origin, stanza)
- local to_node, to_host, to_resource = jid_split(stanza.attr.to);
- if to_resource then
- room_handle_to_occupant(self, origin, stanza);
- else
- room_handle_to_room(self, origin, stanza);
- end
-end
-
-module "muc"
-
-function new_room(jid)
- return {
- jid = jid;
- handle_stanza = room_handle_stanza;
- set_subject = room_set_subject;
- route_stanza = function(room, stanza) end; -- Replace with a routing function, e.g., function(room, stanza) core_route_stanza(origin, stanza); end
- _jid_nick = {};
- _participants = {};
- _data = {};
- }
-end
-
-return _M;
-
---[[function get_disco_info(stanza)
- return st.iq({type='result', id=stanza.attr.id, from=muc_domain, to=stanza.attr.from}):query("http://jabber.org/protocol/disco#info")
- :tag("identity", {category='conference', type='text', name=muc_name}):up()
- :tag("feature", {var="http://jabber.org/protocol/muc"}); -- TODO cache disco reply
-end
-function get_disco_items(stanza)
- local reply = st.iq({type='result', id=stanza.attr.id, from=muc_domain, to=stanza.attr.from}):query("http://jabber.org/protocol/disco#items");
- for room in pairs(rooms_info:get()) do
- reply:tag("item", {jid=room, name=rooms_info:get(room, "name")}):up();
- end
- return reply; -- TODO cache disco reply
-end]]
-
---[[function handle_to_domain(origin, stanza)
- local type = stanza.attr.type;
- if type == "error" or type == "result" then return; end
- if stanza.name == "iq" and type == "get" then
- local xmlns = stanza.tags[1].attr.xmlns;
- if xmlns == "http://jabber.org/protocol/disco#info" then
- origin.send(get_disco_info(stanza));
- elseif xmlns == "http://jabber.org/protocol/disco#items" then
- origin.send(get_disco_items(stanza));
- else
- origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- TODO disco/etc
- end
- else
- origin.send(st.error_reply(stanza, "cancel", "service-unavailable", "The muc server doesn't deal with messages and presence directed at it"));
- end
-end
-
-register_component(muc_domain, function(origin, stanza)
- local to_node, to_host, to_resource = jid_split(stanza.attr.to);
- if to_resource and not to_node then
- if type == "error" or type == "result" then return; end
- origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- host/resource
- elseif to_resource then
- handle_to_occupant(origin, stanza);
- elseif to_node then
- handle_to_room(origin, stanza)
- else -- to the main muc domain
- if type == "error" or type == "result" then return; end
- handle_to_domain(origin, stanza);
- end
-end);]]
-
---[[module.unload = function()
- deregister_component(muc_domain);
-end
-module.save = function()
- return {rooms = rooms.data; jid_nick = jid_nick.data; rooms_info = rooms_info.data; persist_list = persist_list};
-end
-module.restore = function(data)
- rooms.data, jid_nick.data, rooms_info.data, persist_list =
- data.rooms or {}, data.jid_nick or {}, data.rooms_info or {}, data.persist_list or {};
-end]]
diff --git a/util/sasl.lua b/util/sasl.lua
index c7aa050b..c8aa16a2 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -125,7 +125,7 @@ function method:process(message)
end
-- load the mechanisms
-load_mechs = {"plain", "digest-md5"}
+load_mechs = {"plain", "digest-md5", "anonymous"}
for _, mech in ipairs(load_mechs) do
local name = "util.sasl."..mech;
local m = require(name);
diff --git a/util/sasl/anonymous.lua b/util/sasl/anonymous.lua
new file mode 100644
index 00000000..8f2a7708
--- /dev/null
+++ b/util/sasl/anonymous.lua
@@ -0,0 +1,35 @@
+-- sasl.lua v0.4
+-- Copyright (C) 2008-2009 Tobias Markmann
+--
+-- All rights reserved.
+--
+-- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+--
+-- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+-- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+-- * Neither the name of Tobias Markmann nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+--
+-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+local s_match = string.match;
+
+local log = require "util.logger".init("sasl");
+
+module "anonymous"
+
+--=========================
+--SASL ANONYMOUS according to RFC 4505
+local function anonymous(self, message)
+ local username;
+ repeat
+ username = generate_uuid();
+ until self.profile.anonymous(username, self.realm);
+ self["username"] = username;
+ return "success"
+end
+
+function init(registerMechanism)
+ registerMechanism("ANONYMOUS", {"anonymous"}, anonymous);
+end
+
+return _M; \ No newline at end of file
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index ba042933..a4a4f811 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -175,7 +175,7 @@ local function digest(self, message)
elseif state == false then return "failure", "account-disabled" end
Y = md5(response["username"]..":"..response["realm"]..":"..password);
elseif self.profile["digest-md5"] then
- local Y, state = self.profile["digest-md5"](response["username"], self.realm, response["realm"] response["charset"])
+ local Y, state = self.profile["digest-md5"](response["username"], self.realm, response["realm"], response["charset"])
if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end
elseif self.profile["digest-md5-test"] then
@@ -186,12 +186,12 @@ local function digest(self, message)
--elseif Y == false then return "failure", "account-disabled" end
local A1 = "";
if response.authzid then
- if response.authzid == self.username.."@"..self.realm then
+ if response.authzid == self.username or response.authzid == self.username.."@"..self.realm then
-- COMPAT
- log("warn", "Client is violating XMPP RFC. See section 6.1 of RFC 3920.");
+ log("warn", "Client is violating RFC 3920 (section 6.1, point 7).");
A1 = Y..":"..response["nonce"]..":"..response["cnonce"]..":"..response.authzid;
else
- A1 = "?";
+ return "failure", "invalid-authzid";
end
else
A1 = Y..":"..response["nonce"]..":"..response["cnonce"];
diff --git a/util/stanza.lua b/util/stanza.lua
index e02136f2..d295d5cc 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -28,13 +28,19 @@ local s_find = string.find;
local os = os;
local do_pretty_printing = not os.getenv("WINDIR");
-local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
-
-local log = require "util.logger".init("stanza");
+local getstyle, getstring;
+if do_pretty_printing then
+ local ok, termcolours = pcall(require, "util.termcolours");
+ if ok then
+ getstyle, getstring = termcolours.getstyle, termcolours.getstring;
+ else
+ do_pretty_printing = nil;
+ end
+end
module "stanza"
-stanza_mt = {};
+stanza_mt = { __type = "stanza" };
stanza_mt.__index = stanza_mt;
function stanza(name, attr)
@@ -118,20 +124,23 @@ function stanza_mt:childtags()
end
-local xml_escape = (function()
+local xml_escape
+do
local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
- return function(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
-end)();
-local function _dostring(t, buf, self, xml_escape)
+ function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
+ _M.xml_escape = xml_escape;
+end
+
+local function _dostring(t, buf, self, xml_escape, parentns)
local nsid = 0;
local name = t.name
t_insert(buf, "<"..name);
for k, v in pairs(t.attr) do
- if s_find(k, "|", 1, true) then
- local ns, attrk = s_match(k, "^([^|]+)|(.+)$");
+ if s_find(k, "\1", 1, true) then
+ local ns, attrk = s_match(k, "^([^\1]*)\1?(.*)$");
nsid = nsid + 1;
t_insert(buf, " xmlns:ns"..nsid.."='"..xml_escape(ns).."' ".."ns"..nsid..":"..attrk.."='"..xml_escape(v).."'");
- else
+ elseif not(k == "xmlns" and v == parentns) then
t_insert(buf, " "..k.."='"..xml_escape(v).."'");
end
end
@@ -143,7 +152,7 @@ local function _dostring(t, buf, self, xml_escape)
for n=1,len do
local child = t[n];
if child.name then
- self(child, buf, self, xml_escape);
+ self(child, buf, self, xml_escape, t.attr.xmlns);
else
t_insert(buf, xml_escape(child));
end
@@ -153,7 +162,7 @@ local function _dostring(t, buf, self, xml_escape)
end
function stanza_mt.__tostring(t)
local buf = {};
- _dostring(t, buf, _dostring, xml_escape);
+ _dostring(t, buf, _dostring, xml_escape, nil);
return t_concat(buf);
end
@@ -201,6 +210,17 @@ function deserialize(stanza)
if stanza then
local attr = stanza.attr;
for i=1,#attr do attr[i] = nil; end
+ local attrx = {};
+ for att in pairs(attr) do
+ if s_find(att, "|", 1, true) and not s_find(k, "\1", 1, true) then
+ local ns,na = s_match(k, "^([^|]+)|(.+)$");
+ attrx[ns.."\1"..na] = attr[att];
+ attr[att] = nil;
+ end
+ end
+ for a,v in pairs(attrx) do
+ attr[x] = v;
+ end
setmetatable(stanza, stanza_mt);
for _, child in ipairs(stanza) do
if type(child) == "table" then
diff --git a/util/timer.lua b/util/timer.lua
index 819016de..c0c7f25a 100644
--- a/util/timer.lua
+++ b/util/timer.lua
@@ -42,7 +42,7 @@ ns_addtimer(function()
local t, func = d[1], d[2];
if t <= current_time then
data[i] = nil;
- local r = func();
+ local r = func(current_time);
if type(r) == "number" then _add_task(r, func); end
end
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 12:57:06 +0000