prosody.git
14 years agotests: Have fake module() set _M to satisfy some modules
Matthew Wild [Fri, 16 Oct 2009 21:30:59 +0000 (22:30 +0100)]
tests: Have fake module() set _M to satisfy some modules

14 years agos2smanager: Fix access of 'config' global without requiring configmanager
Matthew Wild [Fri, 16 Oct 2009 21:19:20 +0000 (22:19 +0100)]
s2smanager: Fix access of 'config' global without requiring configmanager

14 years agotests: Add tests for new modulemanager load_modules_for_host code
Matthew Wild [Fri, 16 Oct 2009 21:13:54 +0000 (22:13 +0100)]
tests: Add tests for new modulemanager load_modules_for_host code

14 years agomodulemanager: Re-organise module loading to still work when no global modules_enable...
Matthew Wild [Fri, 16 Oct 2009 21:12:46 +0000 (22:12 +0100)]
modulemanager: Re-organise module loading to still work when no global modules_enabled is defined in the config (thanks hoelzro for accidentally discovering this one)

14 years agoutil.helpers: Add get_upvalue(function, name) helper
Matthew Wild [Fri, 16 Oct 2009 21:03:32 +0000 (22:03 +0100)]
util.helpers: Add get_upvalue(function, name) helper

14 years agoutil.dataforms: Incorporate slightly modified patch for list-single type from Florob
Matthew Wild [Fri, 16 Oct 2009 18:52:09 +0000 (19:52 +0100)]
util.dataforms: Incorporate slightly modified patch for list-single type from Florob

14 years agomod_vcard: Hide me from the trailing-whitespace police
Matthew Wild [Thu, 15 Oct 2009 23:11:55 +0000 (00:11 +0100)]
mod_vcard: Hide me from the trailing-whitespace police

14 years agomod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full...
Matthew Wild [Thu, 15 Oct 2009 22:21:55 +0000 (23:21 +0100)]
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms

14 years agoMerge with 0.5
Matthew Wild [Thu, 15 Oct 2009 13:20:08 +0000 (14:20 +0100)]
Merge with 0.5

14 years agoxmppserver_listener: Fix typo (thanks Jorj)
Matthew Wild [Thu, 15 Oct 2009 13:16:22 +0000 (14:16 +0100)]
xmppserver_listener: Fix typo (thanks Jorj)

14 years agoMerge with 0.5
Matthew Wild [Wed, 14 Oct 2009 13:12:14 +0000 (14:12 +0100)]
Merge with 0.5

14 years agonet.server: Better handling of closing sockets during send
Matthew Wild [Wed, 14 Oct 2009 13:09:51 +0000 (14:09 +0100)]
net.server: Better handling of closing sockets during send

14 years agoxmppserver_listener: More forcefully close s2s connections (fixes fd leak)
Matthew Wild [Wed, 14 Oct 2009 13:07:50 +0000 (14:07 +0100)]
xmppserver_listener: More forcefully close s2s connections (fixes fd leak)

14 years agoMerge with 0.5
Matthew Wild [Tue, 13 Oct 2009 10:13:52 +0000 (11:13 +0100)]
Merge with 0.5

14 years agonet.dns: Remove sockets from socketset when closing them, fixes a leak
Matthew Wild [Tue, 13 Oct 2009 10:12:49 +0000 (11:12 +0100)]
net.dns: Remove sockets from socketset when closing them, fixes a leak

14 years agoMerge with 0.5
Waqas Hussain [Tue, 13 Oct 2009 10:00:59 +0000 (15:00 +0500)]
Merge with 0.5

14 years agomodulemanager: Changed api:get_host_items to include items from the global host in...
Waqas Hussain [Tue, 13 Oct 2009 09:58:45 +0000 (14:58 +0500)]
modulemanager: Changed api:get_host_items to include items from the global host in its result.

14 years agorostermanager: Fixed a traceback on roster save.
Waqas Hussain [Tue, 13 Oct 2009 09:54:07 +0000 (14:54 +0500)]
rostermanager: Fixed a traceback on roster save.

14 years agoutil.dataforms: Small fix to allow generating forms without specifying any input...
Matthew Wild [Sat, 10 Oct 2009 02:09:15 +0000 (03:09 +0100)]
util.dataforms: Small fix to allow generating forms without specifying any input data

14 years agoutil.dataforms: Support for jid-single field type especially for Florob :)
Matthew Wild [Sat, 10 Oct 2009 01:21:25 +0000 (02:21 +0100)]
util.dataforms: Support for jid-single field type especially for Florob :)

14 years agomod_tls: Don't try to start TLS if we can't actually do it (thanks Florob)
Matthew Wild [Fri, 9 Oct 2009 16:48:45 +0000 (17:48 +0100)]
mod_tls: Don't try to start TLS if we can't actually do it (thanks Florob)

14 years agocomponentmanager: Auto-load mod_tls for components #hack
Matthew Wild [Thu, 8 Oct 2009 23:22:33 +0000 (00:22 +0100)]
componentmanager: Auto-load mod_tls for components #hack

14 years agocomponentmanager: Remove FIXME
Matthew Wild [Thu, 8 Oct 2009 23:19:46 +0000 (00:19 +0100)]
componentmanager: Remove FIXME

14 years agocomponentmanager: Fix oops in pattern for matching subdomain
Matthew Wild [Thu, 8 Oct 2009 23:15:39 +0000 (00:15 +0100)]
componentmanager: Fix oops in pattern for matching subdomain

14 years agocomponentmanager: Use ssl_ctx of 'parent' host (should fix TLS for components)
Matthew Wild [Thu, 8 Oct 2009 22:51:55 +0000 (23:51 +0100)]
componentmanager: Use ssl_ctx of 'parent' host (should fix TLS for components)

14 years agomod_tls: Catch s2s-stream-features and add starttls feature if possible
Matthew Wild [Thu, 8 Oct 2009 22:41:59 +0000 (23:41 +0100)]
mod_tls: Catch s2s-stream-features and add starttls feature if possible

14 years agomod_dialback: Catch s2s-stream-features and add dialback feature
Matthew Wild [Thu, 8 Oct 2009 22:41:29 +0000 (23:41 +0100)]
mod_dialback: Catch s2s-stream-features and add dialback feature

14 years agos2smanager: Make s2s-stream-features a per-host event
Matthew Wild [Thu, 8 Oct 2009 22:40:54 +0000 (23:40 +0100)]
s2smanager: Make s2s-stream-features a per-host event

14 years agoutil.stanza: Remove silly dependency on util.logger
Matthew Wild [Thu, 8 Oct 2009 19:06:07 +0000 (20:06 +0100)]
util.stanza: Remove silly dependency on util.logger

14 years agoutil.array: Oh no it isn't!
Matthew Wild [Thu, 8 Oct 2009 17:41:30 +0000 (18:41 +0100)]
util.array: Oh no it isn't!

14 years agomodulemanager: Bump log level of unhandled non-default-namespace elements, and log...
Matthew Wild [Tue, 6 Oct 2009 22:14:01 +0000 (23:14 +0100)]
modulemanager: Bump log level of unhandled non-default-namespace elements, and log their full XML

14 years agoutil.stanza: Soften dependency on util.termcolours
Matthew Wild [Tue, 6 Oct 2009 18:17:28 +0000 (19:17 +0100)]
util.stanza: Soften dependency on util.termcolours

14 years agoutil.stanza: Make xml_escape publicly accessible
Matthew Wild [Tue, 6 Oct 2009 17:05:31 +0000 (18:05 +0100)]
util.stanza: Make xml_escape publicly accessible

14 years agos2smanager: Don't send version=1.0 in reply to incoming stream tag if they didn't...
Matthew Wild [Tue, 6 Oct 2009 14:02:16 +0000 (15:02 +0100)]
s2smanager: Don't send version=1.0 in reply to incoming stream tag if they didn't advertise 1.0 (makes happy some old ejabberd versions)

14 years agosessionmanager: Mark client streams as opened sooner to avoid wrapping errors in...
Paul Aurich [Tue, 6 Oct 2009 10:15:55 +0000 (11:15 +0100)]
sessionmanager: Mark client streams as opened sooner to avoid wrapping errors in unnecessary stream tags

14 years agos2smanager: Improve log message on missing to/from in stream header
Matthew Wild [Tue, 6 Oct 2009 10:02:33 +0000 (11:02 +0100)]
s2smanager: Improve log message on missing to/from in stream header

14 years agomod_console: Add a space before '(encrypted)' in s2s:show()
Matthew Wild [Tue, 6 Oct 2009 09:42:53 +0000 (10:42 +0100)]
mod_console: Add a space before '(encrypted)' in s2s:show()

14 years agomod_tls: Mark sessions as not secure when negotiating outward TLS, so they get marked...
Matthew Wild [Tue, 6 Oct 2009 09:34:13 +0000 (10:34 +0100)]
mod_tls: Mark sessions as not secure when negotiating outward TLS, so they get marked secure later. Fixes missing (encrypted) for outgoing sessions in s2s:show(). Thanks albert, McKael :)

14 years agohostmanager: Only initialse SSL contexts if SSL library available
Matthew Wild [Mon, 5 Oct 2009 21:15:32 +0000 (22:15 +0100)]
hostmanager: Only initialse SSL contexts if SSL library available

14 years agomod_console: Also search piggy-backed, er, multiplexed domains when passing a filter...
Matthew Wild [Mon, 5 Oct 2009 17:47:01 +0000 (18:47 +0100)]
mod_console: Also search piggy-backed, er, multiplexed domains when passing a filter to s2s:show()

14 years agoMerge with 0.5
Matthew Wild [Mon, 5 Oct 2009 17:42:42 +0000 (18:42 +0100)]
Merge with 0.5

14 years agoutil.array: Small logic fix for array:filter()
Matthew Wild [Mon, 5 Oct 2009 17:39:28 +0000 (18:39 +0100)]
util.array: Small logic fix for array:filter()

14 years agoMerge with 0.5
Matthew Wild [Mon, 5 Oct 2009 16:57:59 +0000 (17:57 +0100)]
Merge with 0.5

14 years agoutil.array: Fix for array:filter() (in-place filtering)
Matthew Wild [Mon, 5 Oct 2009 16:56:31 +0000 (17:56 +0100)]
util.array: Fix for array:filter() (in-place filtering)

14 years agoutil.array: Fix for array:filter() (in-place filtering)
Matthew Wild [Mon, 5 Oct 2009 16:56:31 +0000 (17:56 +0100)]
util.array: Fix for array:filter() (in-place filtering)

14 years agomod_console: s2s:show(): Indicate when a connection is encrypted
Matthew Wild [Mon, 5 Oct 2009 14:16:34 +0000 (15:16 +0100)]
mod_console: s2s:show(): Indicate when a connection is encrypted

14 years agomod_tls: require_s2s_encryption -> s2s_require_encryption
Matthew Wild [Mon, 5 Oct 2009 14:00:05 +0000 (15:00 +0100)]
mod_tls: require_s2s_encryption -> s2s_require_encryption

14 years agorequire_encryption deprecated, use c2s_require_encryption instead
Matthew Wild [Mon, 5 Oct 2009 13:59:30 +0000 (14:59 +0100)]
require_encryption deprecated, use c2s_require_encryption instead

14 years agomod_tls: Mark starttls feature as <required/> if require_s2s_encryption is enabled
Matthew Wild [Mon, 5 Oct 2009 13:52:30 +0000 (14:52 +0100)]
mod_tls: Mark starttls feature as <required/> if require_s2s_encryption is enabled

14 years agomod_tls: Mark session as not secure before negotiating TLS
Matthew Wild [Mon, 5 Oct 2009 13:51:53 +0000 (14:51 +0100)]
mod_tls: Mark session as not secure before negotiating TLS

14 years agos2smanager: Mark session as secure if it was negotiating TLS and opens a new stream
Matthew Wild [Mon, 5 Oct 2009 13:50:27 +0000 (14:50 +0100)]
s2smanager: Mark session as secure if it was negotiating TLS and opens a new stream

14 years agoMerge with 0.5
Matthew Wild [Mon, 5 Oct 2009 13:42:56 +0000 (14:42 +0100)]
Merge with 0.5

14 years agomod_console: Add module:list() to help
Matthew Wild [Mon, 5 Oct 2009 13:42:23 +0000 (14:42 +0100)]
mod_console: Add module:list() to help

14 years agomod_console: Add module:list() to help
Matthew Wild [Mon, 5 Oct 2009 13:42:23 +0000 (14:42 +0100)]
mod_console: Add module:list() to help

14 years agomod_console: Add module:list() command to show modules loaded on a host
Matthew Wild [Mon, 5 Oct 2009 13:40:01 +0000 (14:40 +0100)]
mod_console: Add module:list() command to show modules loaded on a host

14 years agomod_console: Add module:list() command to show modules loaded on a host
Matthew Wild [Mon, 5 Oct 2009 13:40:01 +0000 (14:40 +0100)]
mod_console: Add module:list() command to show modules loaded on a host

14 years agoutil.array: Per-array methods now always mutate the array, array.* return a mutated...
Matthew Wild [Mon, 5 Oct 2009 13:38:04 +0000 (14:38 +0100)]
util.array: Per-array methods now always mutate the array, array.* return a mutated copy, and most methods (e.g. sort) now return the array

14 years agoutil.array: Per-array methods now always mutate the array, array.* return a mutated...
Matthew Wild [Mon, 5 Oct 2009 13:38:04 +0000 (14:38 +0100)]
util.array: Per-array methods now always mutate the array, array.* return a mutated copy, and most methods (e.g. sort) now return the array

14 years agomodulemanager: Add host.modules to contain a table of modules for a host
Matthew Wild [Mon, 5 Oct 2009 09:42:36 +0000 (10:42 +0100)]
modulemanager: Add host.modules to contain a table of modules for a host

14 years agomodulemanager: Add host.modules to contain a table of modules for a host
Matthew Wild [Mon, 5 Oct 2009 09:42:36 +0000 (10:42 +0100)]
modulemanager: Add host.modules to contain a table of modules for a host

14 years agomod_tls: Only advertise TLS if the server told us which host they are connecting to
Matthew Wild [Mon, 5 Oct 2009 09:10:53 +0000 (10:10 +0100)]
mod_tls: Only advertise TLS if the server told us which host they are connecting to

14 years agoxmppserver_listener: Lower log-level of debug message to, er, 'debug'
Matthew Wild [Mon, 5 Oct 2009 09:07:06 +0000 (10:07 +0100)]
xmppserver_listener: Lower log-level of debug message to, er, 'debug'

14 years agonet.adns: Bump log-level of DNS handler errors to, er, 'error'
Matthew Wild [Mon, 5 Oct 2009 08:56:08 +0000 (09:56 +0100)]
net.adns: Bump log-level of DNS handler errors to, er, 'error'

14 years agoMerge with 0.5
Waqas Hussain [Sun, 4 Oct 2009 17:12:12 +0000 (22:12 +0500)]
Merge with 0.5

14 years agostanza_router: Reply to IQ requests with missing 'id' attribute with a bad-request...
Waqas Hussain [Sun, 4 Oct 2009 16:46:35 +0000 (21:46 +0500)]
stanza_router: Reply to IQ requests with missing 'id' attribute with a bad-request error.

14 years agorostermanager: Fixed: Roster version was not being properly updated in some edge...
Waqas Hussain [Sun, 4 Oct 2009 16:34:17 +0000 (21:34 +0500)]
rostermanager: Fixed: Roster version was not being properly updated in some edge cases.

14 years agorostermanager: Added support for saving rosters of offline users to the save_roster...
Waqas Hussain [Sun, 4 Oct 2009 16:25:59 +0000 (21:25 +0500)]
rostermanager: Added support for saving rosters of offline users to the save_roster function.

14 years agomod_tls: :up() out of the starttls tag in stream:features
Matthew Wild [Sun, 4 Oct 2009 12:24:04 +0000 (13:24 +0100)]
mod_tls: :up() out of the starttls tag in stream:features

14 years agoSpecify XMPP version on response stream to incoming s2s connection.
Paul Aurich [Sun, 4 Oct 2009 06:23:00 +0000 (23:23 -0700)]
Specify XMPP version on response stream to incoming s2s connection.

14 years agoMinor changes; outgoing TLS works.
Paul Aurich [Sun, 4 Oct 2009 02:20:20 +0000 (19:20 -0700)]
Minor changes; outgoing TLS works.

14 years agohostmanager: Create ssl context for each host (fixes #30 for outgoing s2s connections)
Matthew Wild [Sun, 4 Oct 2009 15:50:22 +0000 (16:50 +0100)]
hostmanager: Create ssl context for each host (fixes #30 for outgoing s2s connections)

14 years agologgingmanager: Whitespace fix
Matthew Wild [Sun, 4 Oct 2009 15:41:33 +0000 (16:41 +0100)]
loggingmanager: Whitespace fix

14 years agos2smanager: Small comment
Matthew Wild [Sun, 4 Oct 2009 15:40:24 +0000 (16:40 +0100)]
s2smanager: Small comment

14 years agos2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild [Sun, 4 Oct 2009 15:39:57 +0000 (16:39 +0100)]
s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts

14 years agos2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0
Matthew Wild [Sun, 4 Oct 2009 15:38:33 +0000 (16:38 +0100)]
s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0

14 years agos2smanager: Give outgoing sessions a host field (the local one)
Matthew Wild [Sun, 4 Oct 2009 15:34:17 +0000 (16:34 +0100)]
s2smanager: Give outgoing sessions a host field (the local one)

14 years agostanza_router: Add COMPAT comment for Pidgin workaround
Matthew Wild [Sun, 4 Oct 2009 15:31:27 +0000 (16:31 +0100)]
stanza_router: Add COMPAT comment for Pidgin workaround

14 years agonet.server: Small logging improvements
Matthew Wild [Sun, 4 Oct 2009 15:05:11 +0000 (16:05 +0100)]
net.server: Small logging improvements

14 years agonet.server: Pass current time to timer callbacks
Matthew Wild [Sun, 4 Oct 2009 15:04:33 +0000 (16:04 +0100)]
net.server: Pass current time to timer callbacks

14 years agonet.server: Increase SSL handshake round-trip limit, and make it configurable
Matthew Wild [Sun, 4 Oct 2009 15:03:53 +0000 (16:03 +0100)]
net.server: Increase SSL handshake round-trip limit, and make it configurable

14 years agonet.server: Call handler's status() to notify it of ssl handshake success
Matthew Wild [Sun, 4 Oct 2009 14:58:21 +0000 (15:58 +0100)]
net.server: Call handler's status() to notify it of ssl handshake success

14 years agonet.server: Provide a way to get sslctx of a client connection
Matthew Wild [Sun, 4 Oct 2009 14:56:55 +0000 (15:56 +0100)]
net.server: Provide a way to get sslctx of a client connection

14 years agonet.server: Provide a way to get sslctx of a server
Matthew Wild [Sun, 4 Oct 2009 14:56:27 +0000 (15:56 +0100)]
net.server: Provide a way to get sslctx of a server

14 years agoxmppserver_listener: Add status() function to signal when a connection completes...
Matthew Wild [Sun, 4 Oct 2009 13:35:39 +0000 (14:35 +0100)]
xmppserver_listener: Add status() function to signal when a connection completes its SSL handshake

14 years agoxmppserver_listener: Add logger to s2s sessions
Matthew Wild [Sun, 4 Oct 2009 13:24:55 +0000 (14:24 +0100)]
xmppserver_listener: Add logger to s2s sessions

14 years agoxmppserver_listener: Small whitespace fix
Matthew Wild [Sun, 4 Oct 2009 13:17:54 +0000 (14:17 +0100)]
xmppserver_listener: Small whitespace fix

14 years agoxmppserver_listener: Better log messages on invalid XML
Matthew Wild [Sun, 4 Oct 2009 13:15:36 +0000 (14:15 +0100)]
xmppserver_listener: Better log messages on invalid XML

14 years agomod_dialback: Initiate dialback on incoming stream:features
Matthew Wild [Sun, 4 Oct 2009 13:10:24 +0000 (14:10 +0100)]
mod_dialback: Initiate dialback on incoming stream:features

14 years agomod_tls: Advertise and handle TLS for s2s connections
Matthew Wild [Sun, 4 Oct 2009 13:06:45 +0000 (14:06 +0100)]
mod_tls: Advertise and handle TLS for s2s connections

14 years agoutil.stanza: Add __type to metatable
Matthew Wild [Sun, 4 Oct 2009 13:03:08 +0000 (14:03 +0100)]
util.stanza: Add __type to metatable

14 years agosessionmanager: Use UUID for stream ids to clients, no math.random anymore :)
Matthew Wild [Sat, 3 Oct 2009 17:40:47 +0000 (18:40 +0100)]
sessionmanager: Use UUID for stream ids to clients, no math.random anymore :)

14 years agosessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild [Sat, 3 Oct 2009 01:41:28 +0000 (02:41 +0100)]
sessionmanager: Add c2s_timeout option for unauthenticated client connections

14 years agoutil.timer: Pass current_time to timer callbacks
Matthew Wild [Sat, 3 Oct 2009 01:33:33 +0000 (02:33 +0100)]
util.timer: Pass current_time to timer callbacks

14 years agomod_httpserver: Update to use new httpserver.new_from_config syntax
Matthew Wild [Fri, 2 Oct 2009 23:57:26 +0000 (00:57 +0100)]
mod_httpserver: Update to use new httpserver.new_from_config syntax

14 years agomod_bosh: Update to use new httpserver.new_from_config syntax
Matthew Wild [Fri, 2 Oct 2009 23:56:45 +0000 (00:56 +0100)]
mod_bosh: Update to use new httpserver.new_from_config syntax

14 years agonet.httpserver: Allow modules registering to provide more than just a default path...
Matthew Wild [Fri, 2 Oct 2009 23:54:58 +0000 (00:54 +0100)]
net.httpserver: Allow modules registering to provide more than just a default path when using httpserver.new_from_config

14 years agoMerge with 0.5
Matthew Wild [Fri, 2 Oct 2009 21:37:44 +0000 (22:37 +0100)]
Merge with 0.5

14 years agoutil.muc: Fix location of <x> element on error replies
Matthew Wild [Fri, 2 Oct 2009 21:37:03 +0000 (22:37 +0100)]
util.muc: Fix location of <x> element on error replies

14 years agoMerge with 0.5
Matthew Wild [Fri, 2 Oct 2009 20:24:16 +0000 (21:24 +0100)]
Merge with 0.5

14 years agomod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the...
Matthew Wild [Fri, 2 Oct 2009 20:23:32 +0000 (21:23 +0100)]
mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time