Software / code / prosody
Annotate
core/modulemanager.lua @ 398:79f84fc3e9ae
Check to prevent error on IQs from completely unhandled origins
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Sun, 23 Nov 2008 10:39:13 +0500 |
| parent | 391:79bd7a3e906c |
| child | 400:068a813b6454 |
| rev | line source |
|---|---|
| 30 | 1 |
| 2 local log = require "util.logger".init("modulemanager") | |
| 3 | |
| 4 local loadfile, pcall = loadfile, pcall; | |
| 5 local setmetatable, setfenv, getfenv = setmetatable, setfenv, getfenv; | |
| 6 local pairs, ipairs = pairs, ipairs; | |
|
39
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
7 local t_insert = table.insert; |
| 30 | 8 local type = type; |
| 9 | |
| 10 local tostring, print = tostring, print; | |
| 11 | |
| 12 local _G = _G; | |
|
300
0ebf2ef5124e
If iq child element has no xmlns, use parent's
Matthew Wild <mwild1@gmail.com>
parents:
229
diff
changeset
|
13 local debug = debug; |
| 30 | 14 |
| 15 module "modulemanager" | |
| 16 | |
| 17 local handler_info = {}; | |
| 18 local handlers = {}; | |
| 19 | |
| 20 local modulehelpers = setmetatable({}, { __index = _G }); | |
| 21 | |
|
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
22 local function _add_iq_handler(module, origin_type, xmlns, handler) |
| 30 | 23 handlers[origin_type] = handlers[origin_type] or {}; |
| 24 handlers[origin_type].iq = handlers[origin_type].iq or {}; | |
| 25 if not handlers[origin_type].iq[xmlns] then | |
| 26 handlers[origin_type].iq[xmlns]= handler; | |
|
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
27 handler_info[handler] = module; |
|
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
28 log("debug", "mod_%s now handles tag 'iq' with query namespace '%s'", module.name, xmlns); |
| 30 | 29 else |
|
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
30 log("warning", "mod_%s wants to handle tag 'iq' with query namespace '%s' but mod_%s already handles that", module.name, xmlns, handler_info[handlers[origin_type].iq[xmlns]].module.name); |
| 30 | 31 end |
| 32 end | |
| 33 | |
|
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
34 function modulehelpers.add_iq_handler(origin_type, xmlns, handler) |
|
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
35 if not (origin_type and handler and xmlns) then return false; end |
|
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
36 if type(origin_type) == "table" then |
|
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
37 for _, origin_type in ipairs(origin_type) do |
|
198
e4755408d40b
Fix for previous commit (again)
Matthew Wild <mwild1@gmail.com>
parents:
197
diff
changeset
|
38 _add_iq_handler(getfenv(2).module, origin_type, xmlns, handler); |
|
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
39 end |
|
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
40 return; |
|
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
41 end |
| 197 | 42 _add_iq_handler(getfenv(2).module, origin_type, xmlns, handler); |
|
196
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
43 end |
|
ebe23269b377
Fix for add_iq_handler to allow multiple origin types too
Matthew Wild <mwild1@gmail.com>
parents:
191
diff
changeset
|
44 |
| 191 | 45 local function _add_handler(module, origin_type, tag, xmlns, handler) |
| 38 | 46 handlers[origin_type] = handlers[origin_type] or {}; |
| 47 if not handlers[origin_type][tag] then | |
|
47
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
48 handlers[origin_type][tag] = handlers[origin_type][tag] or {}; |
|
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
49 handlers[origin_type][tag][xmlns]= handler; |
| 191 | 50 handler_info[handler] = module; |
| 51 log("debug", "mod_%s now handles tag '%s'", module.name, tag); | |
| 38 | 52 elseif handler_info[handlers[origin_type][tag]] then |
| 191 | 53 log("warning", "mod_%s wants to handle tag '%s' but mod_%s already handles that", module.name, tag, handler_info[handlers[origin_type][tag]].module.name); |
| 38 | 54 end |
| 30 | 55 end |
|
47
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
56 |
| 191 | 57 function modulehelpers.add_handler(origin_type, tag, xmlns, handler) |
| 58 if not (origin_type and tag and xmlns and handler) then return false; end | |
| 59 if type(origin_type) == "table" then | |
| 60 for _, origin_type in ipairs(origin_type) do | |
| 61 _add_handler(getfenv(2).module, origin_type, tag, xmlns, handler); | |
| 62 end | |
| 63 return; | |
| 64 end | |
| 65 _add_handler(getfenv(2).module, origin_type, tag, xmlns, handler); | |
| 66 end | |
| 67 | |
| 30 | 68 function load(name) |
| 69 local mod, err = loadfile("plugins/mod_"..name..".lua"); | |
| 70 if not mod then | |
| 71 log("error", "Unable to load module '%s': %s", name or "nil", err or "nil"); | |
|
229
01bd24ea488d
We now fail if modules fail to load at startup.
Waqas Hussain <waqas20@gmail.com>
parents:
218
diff
changeset
|
72 return nil, err; |
| 30 | 73 end |
| 74 | |
| 75 local pluginenv = setmetatable({ module = { name = name } }, { __index = modulehelpers }); | |
| 76 | |
| 77 setfenv(mod, pluginenv); | |
| 78 local success, ret = pcall(mod); | |
| 79 if not success then | |
| 80 log("error", "Error initialising module '%s': %s", name or "nil", ret or "nil"); | |
|
391
79bd7a3e906c
Typo prevented modulemanager.load() from returning the error if load failed.
Matthew Wild <mwild1@gmail.com>
parents:
385
diff
changeset
|
81 return nil, ret; |
| 30 | 82 end |
|
229
01bd24ea488d
We now fail if modules fail to load at startup.
Waqas Hussain <waqas20@gmail.com>
parents:
218
diff
changeset
|
83 return true; |
| 30 | 84 end |
| 85 | |
| 86 function handle_stanza(origin, stanza) | |
| 38 | 87 local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns, origin.type; |
| 30 | 88 |
| 38 | 89 if name == "iq" and xmlns == "jabber:client" and handlers[origin_type] then |
| 30 | 90 log("debug", "Stanza is an <iq/>"); |
| 91 local child = stanza.tags[1]; | |
| 92 if child then | |
|
300
0ebf2ef5124e
If iq child element has no xmlns, use parent's
Matthew Wild <mwild1@gmail.com>
parents:
229
diff
changeset
|
93 local xmlns = child.attr.xmlns or xmlns; |
|
0ebf2ef5124e
If iq child element has no xmlns, use parent's
Matthew Wild <mwild1@gmail.com>
parents:
229
diff
changeset
|
94 log("debug", "Stanza of type %s from %s has xmlns: %s", name, origin_type, xmlns); |
|
398
79f84fc3e9ae
Check to prevent error on IQs from completely unhandled origins
Waqas Hussain <waqas20@gmail.com>
parents:
391
diff
changeset
|
95 local handler = handlers[origin_type][name] and handlers[origin_type][name][xmlns]; |
|
79f84fc3e9ae
Check to prevent error on IQs from completely unhandled origins
Waqas Hussain <waqas20@gmail.com>
parents:
391
diff
changeset
|
96 if handler then |
| 30 | 97 log("debug", "Passing stanza to mod_%s", handler_info[handler].name); |
| 98 return handler(origin, stanza) or true; | |
| 99 end | |
| 100 end | |
| 38 | 101 elseif handlers[origin_type] then |
| 102 local handler = handlers[origin_type][name]; | |
|
391
79bd7a3e906c
Typo prevented modulemanager.load() from returning the error if load failed.
Matthew Wild <mwild1@gmail.com>
parents:
385
diff
changeset
|
103 if handler then |
|
47
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
104 handler = handler[xmlns]; |
|
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
105 if handler then |
|
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
106 log("debug", "Passing stanza to mod_%s", handler_info[handler].name); |
|
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
107 return handler(origin, stanza) or true; |
|
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
108 end |
| 38 | 109 end |
| 30 | 110 end |
|
47
33ed4c6ac249
Fix stanza handlers to use xmlns also for matching
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
111 log("debug", "Stanza unhandled by any modules, xmlns: %s", stanza.attr.xmlns); |
| 30 | 112 return false; -- we didn't handle it |
| 113 end | |
|
39
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
114 |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
115 do |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
116 local event_handlers = {}; |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
117 |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
118 function modulehelpers.add_event_hook(name, handler) |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
119 if not event_handlers[name] then |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
120 event_handlers[name] = {}; |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
121 end |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
122 t_insert(event_handlers[name] , handler); |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
123 end |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
124 |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
125 function fire_event(name, ...) |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
126 local event_handlers = event_handlers[name]; |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
127 if event_handlers then |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
128 for name, handler in ipairs(event_handlers) do |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
129 handler(...); |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
130 end |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
131 end |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
132 end |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
133 end |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
134 |
|
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
135 return _M; |
