prosody.git
14 years agoMakefile: Fix to install new util/sasl directory
Matthew Wild [Thu, 26 Nov 2009 01:09:10 +0000 (01:09 +0000)]
Makefile: Fix to install new util/sasl directory

14 years agoMerge with 0.6
Matthew Wild [Wed, 25 Nov 2009 23:46:58 +0000 (23:46 +0000)]
Merge with 0.6

14 years agoutil.serialization: Correctly serialize tables with 'false' as a key, fixes an issue...
Matthew Wild [Wed, 25 Nov 2009 23:45:45 +0000 (23:45 +0000)]
util.serialization: Correctly serialize tables with 'false' as a key, fixes an issue with rosters not saving (thanks mathias, Tobias)

14 years agoMerge with trunk
Matthew Wild [Wed, 25 Nov 2009 19:59:16 +0000 (19:59 +0000)]
Merge with trunk

14 years agoMerge with 0.6
Matthew Wild [Wed, 25 Nov 2009 19:58:58 +0000 (19:58 +0000)]
Merge with 0.6

14 years agoutil.dataforms: Don't require type when parsing form XML
Florian Zeitz [Wed, 25 Nov 2009 19:58:19 +0000 (19:58 +0000)]
util.dataforms: Don't require type when parsing form XML

14 years agoMerge with trunk.
Waqas Hussain [Wed, 25 Nov 2009 19:05:18 +0000 (00:05 +0500)]
Merge with trunk.

14 years agoMUC: Added support for the room-destroy owner use case.
Waqas Hussain [Wed, 25 Nov 2009 19:03:16 +0000 (00:03 +0500)]
MUC: Added support for the room-destroy owner use case.

14 years agoSASL: Using locally mapped s_gmatch instead of unavailable gmatch.
Tobias Markmann [Wed, 25 Nov 2009 18:46:22 +0000 (19:46 +0100)]
SASL: Using locally mapped s_gmatch instead of unavailable gmatch.

14 years agoMerge with trunk
Matthew Wild [Wed, 25 Nov 2009 17:40:24 +0000 (17:40 +0000)]
Merge with trunk

14 years agoMerge with Tobias's SASL redesign branch
Matthew Wild [Wed, 25 Nov 2009 17:39:23 +0000 (17:39 +0000)]
Merge with Tobias's SASL redesign branch

14 years agoMUC: Slightly refactored form processing.
Waqas Hussain [Wed, 25 Nov 2009 17:26:06 +0000 (22:26 +0500)]
MUC: Slightly refactored form processing.

14 years agoMUC: Only allow moderators to change the room subject.
Waqas Hussain [Wed, 25 Nov 2009 17:00:33 +0000 (22:00 +0500)]
MUC: Only allow moderators to change the room subject.

14 years agoMUC: Prevent visitors from broadcasting messages.
Waqas Hussain [Wed, 25 Nov 2009 16:42:05 +0000 (21:42 +0500)]
MUC: Prevent visitors from broadcasting messages.

14 years agoMUC: Improved handling of incoming groupchat messages (state preserved for possible...
Waqas Hussain [Wed, 25 Nov 2009 16:40:44 +0000 (21:40 +0500)]
MUC: Improved handling of incoming groupchat messages (state preserved for possible later use).

14 years agoRemoved some legacy doc/ files.
Waqas Hussain [Wed, 25 Nov 2009 16:30:41 +0000 (21:30 +0500)]
Removed some legacy doc/ files.

14 years agoMerge with 0.6
Matthew Wild [Wed, 25 Nov 2009 15:41:04 +0000 (15:41 +0000)]
Merge with 0.6

14 years agoutil.dependencies: Log an error if the current version of LuaSec installed contains...
Matthew Wild [Wed, 25 Nov 2009 15:40:33 +0000 (15:40 +0000)]
util.dependencies: Log an error if the current version of LuaSec installed contains The Bug (thanks Remko)

14 years agoMerge with 0.6 on prosody.im
Matthew Wild [Wed, 25 Nov 2009 05:11:10 +0000 (05:11 +0000)]
Merge with 0.6 on prosody.im

14 years agoMerge with 0.6
Matthew Wild [Wed, 25 Nov 2009 03:30:41 +0000 (03:30 +0000)]
Merge with 0.6

14 years agos2smanager: Log warning when trying to send a stanza from a host we don't serve,...
Matthew Wild [Wed, 25 Nov 2009 03:30:00 +0000 (03:30 +0000)]
s2smanager: Log warning when trying to send a stanza from a host we don't serve, instead of a traceback (thanks stpeter)

14 years agoMerge with trunk
Matthew Wild [Tue, 24 Nov 2009 20:35:18 +0000 (20:35 +0000)]
Merge with trunk

14 years agocore.sessionmanager, net.*_listener: Remove the evil collectgarbage() calls
Matthew Wild [Tue, 24 Nov 2009 20:34:22 +0000 (20:34 +0000)]
core.sessionmanager, net.*_listener: Remove the evil collectgarbage() calls

14 years agoxmppclient_listener: Escape control characters when logging invalid XML.
Waqas Hussain [Tue, 24 Nov 2009 17:42:08 +0000 (22:42 +0500)]
xmppclient_listener: Escape control characters when logging invalid XML.

14 years agonet.server: Log an error when libevent is requested, but luaevent is unavailable...
Waqas Hussain [Tue, 24 Nov 2009 09:37:14 +0000 (14:37 +0500)]
net.server: Log an error when libevent is requested, but luaevent is unavailable, and don't load luaevent when not requested.

14 years agoMerge with trunk
Matthew Wild [Mon, 23 Nov 2009 20:22:37 +0000 (20:22 +0000)]
Merge with trunk

14 years agoMerge with 0.6
Matthew Wild [Mon, 23 Nov 2009 20:21:20 +0000 (20:21 +0000)]
Merge with 0.6

14 years agoutil.datamanager: Replace popen(mkdir) with lfs.mkdir, keeping the just-in-time creat...
Matthew Wild [Mon, 23 Nov 2009 20:18:04 +0000 (20:18 +0000)]
util.datamanager: Replace popen(mkdir) with lfs.mkdir, keeping the just-in-time creation until we have the new datamanager API

14 years agoutil.dependencies: Missed a Debian/
Matthew Wild [Mon, 23 Nov 2009 19:59:32 +0000 (19:59 +0000)]
util.dependencies: Missed a Debian/

14 years agoutil.dependencies: Clearer message, add homepages, etc.
Matthew Wild [Mon, 23 Nov 2009 18:51:54 +0000 (18:51 +0000)]
util.dependencies: Clearer message, add homepages, etc.

14 years agoutil.dependencies: Add LuaFileSystem as a hard dependency
Matthew Wild [Mon, 23 Nov 2009 17:31:49 +0000 (17:31 +0000)]
util.dependencies: Add LuaFileSystem as a hard dependency

14 years agoMerged with 0.6.
Waqas Hussain [Mon, 23 Nov 2009 16:49:20 +0000 (21:49 +0500)]
Merged with 0.6.

14 years agoprosody: Added support for command line argument '--config'.
Waqas Hussain [Mon, 23 Nov 2009 16:46:37 +0000 (21:46 +0500)]
prosody: Added support for command line argument '--config'.

14 years agoMerge with trunk
Matthew Wild [Mon, 23 Nov 2009 16:30:34 +0000 (16:30 +0000)]
Merge with trunk

14 years agotests/modulemanager_option_conversion.lua: Add standalone test script for the new...
Matthew Wild [Mon, 23 Nov 2009 16:09:44 +0000 (16:09 +0000)]
tests/modulemanager_option_conversion.lua: Add standalone test script for the new modulemanager config option API

14 years agomodulemanager: New module API methods for getting config options with type conversion...
Matthew Wild [Mon, 23 Nov 2009 16:07:33 +0000 (16:07 +0000)]
modulemanager: New module API methods for getting config options with type conversion, get_option_string, get_option_number, get_option_boolean, get_option_array, get_option_set

14 years agoMerged with 0.6.
Waqas Hussain [Mon, 23 Nov 2009 16:02:06 +0000 (21:02 +0500)]
Merged with 0.6.

14 years agoutil.serialization: Replaced commas with semi-colons between table fields.
Waqas Hussain [Mon, 23 Nov 2009 14:50:04 +0000 (19:50 +0500)]
util.serialization: Replaced commas with semi-colons between table fields.

14 years agoutil.serialization: Concise output for empty tables.
Waqas Hussain [Mon, 23 Nov 2009 14:35:24 +0000 (19:35 +0500)]
util.serialization: Concise output for empty tables.

14 years agoMainfile: Fixed some comments.
Waqas Hussain [Mon, 23 Nov 2009 03:55:27 +0000 (08:55 +0500)]
Mainfile: Fixed some comments.

14 years agoutil.dependencies: Make the commands line up properly in the "missing dependency...
Matthew Wild [Mon, 23 Nov 2009 02:58:42 +0000 (02:58 +0000)]
util.dependencies: Make the commands line up properly in the "missing dependency" output. Yes, this was the commit you didn't know you were waiting for!

14 years agomod_console: Update for new net.server API
Matthew Wild [Sun, 22 Nov 2009 21:09:25 +0000 (21:09 +0000)]
mod_console: Update for new net.server API

14 years agoMerged with 0.6.
Waqas Hussain [Sun, 22 Nov 2009 16:55:58 +0000 (21:55 +0500)]
Merged with 0.6.

14 years agomod_presence: Route incoming presence subscription stanzas (types unsubscribe, subscr...
Waqas Hussain [Sun, 22 Nov 2009 16:47:54 +0000 (21:47 +0500)]
mod_presence: Route incoming presence subscription stanzas (types unsubscribe, subscribed and unsubscribed) to the user before roster pushes.

14 years agomod_presence: Acknowledge subscription requests by responding with an unavailable...
Waqas Hussain [Sun, 22 Nov 2009 16:45:31 +0000 (21:45 +0500)]
mod_presence: Acknowledge subscription requests by responding with an unavailable presence.

14 years agosessionmanager: Added function send_to_interested_resources().
Waqas Hussain [Sun, 22 Nov 2009 16:41:09 +0000 (21:41 +0500)]
sessionmanager: Added function send_to_interested_resources().

14 years agosessionmanager: Fixed and cleaned function send_to_available_resources(). The 'to...
Waqas Hussain [Sun, 22 Nov 2009 16:40:01 +0000 (21:40 +0500)]
sessionmanager: Fixed and cleaned function send_to_available_resources(). The 'to' attribute for presence subscription stanzas is now preserved.

14 years agologgingmanager: Explicitly flush log messages if the __FLUSH_LOG environment variable...
Waqas Hussain [Sun, 22 Nov 2009 16:33:41 +0000 (21:33 +0500)]
loggingmanager: Explicitly flush log messages if the __FLUSH_LOG environment variable is defined (workaround for MSVCRT buffering piped output).

14 years agomod_proxy65: Update for new net.server API, untested
Matthew Wild [Sun, 22 Nov 2009 15:06:30 +0000 (15:06 +0000)]
mod_proxy65: Update for new net.server API, untested

14 years agomod_proxy65: Import from prosody-modules, thanks Ephraim :)
Matthew Wild [Sun, 22 Nov 2009 14:58:09 +0000 (14:58 +0000)]
mod_proxy65: Import from prosody-modules, thanks Ephraim :)

14 years agonet.server: Add some comments to explain to waqas how it all works :)
Matthew Wild [Sun, 22 Nov 2009 14:42:56 +0000 (14:42 +0000)]
net.server: Add some comments to explain to waqas how it all works :)

14 years agoxmppcomponent_listener: Use new API for writing to components, fixes traceback (thank...
Matthew Wild [Sun, 22 Nov 2009 13:47:24 +0000 (13:47 +0000)]
xmppcomponent_listener: Use new API for writing to components, fixes traceback (thanks Tobias)

14 years agos2smanager: Fix syntax error introduced in merge
Matthew Wild [Sun, 22 Nov 2009 04:53:02 +0000 (04:53 +0000)]
s2smanager: Fix syntax error introduced in merge

14 years agoMerge with trunk
Matthew Wild [Sun, 22 Nov 2009 04:50:42 +0000 (04:50 +0000)]
Merge with trunk

14 years agostanza_router: Don't log full stanzas destined for s2s
Matthew Wild [Sun, 22 Nov 2009 04:46:48 +0000 (04:46 +0000)]
stanza_router: Don't log full stanzas destined for s2s

14 years agonet.server_select: Bring up to date to new common connection API
Matthew Wild [Sun, 22 Nov 2009 04:45:13 +0000 (04:45 +0000)]
net.server_select: Bring up to date to new common connection API

14 years agonet.httpserver, net.http: Update for new net.server API (untested)
Matthew Wild [Sun, 22 Nov 2009 04:44:26 +0000 (04:44 +0000)]
net.httpserver, net.http: Update for new net.server API (untested)

14 years ago*_listener: Update for new net.server API, specifically .listener -> .onincoming...
Matthew Wild [Sun, 22 Nov 2009 04:43:46 +0000 (04:43 +0000)]
*_listener: Update for new net.server API, specifically .listener -> .onincoming, .disconnect -> .ondisconnect

14 years agonet.adns: Update for new net.server API (doesn't work with libevent yet)
Matthew Wild [Sun, 22 Nov 2009 04:42:47 +0000 (04:42 +0000)]
net.adns: Update for new net.server API (doesn't work with libevent yet)

14 years agos2smanager: Update for new net.server API (s2s still doesn't work with libevent for...
Matthew Wild [Sun, 22 Nov 2009 04:42:03 +0000 (04:42 +0000)]
s2smanager: Update for new net.server API (s2s still doesn't work with libevent for other reasons)

14 years agonet.server_event: Comment accidentally uncommented vdebug()
Matthew Wild [Sun, 22 Nov 2009 04:09:57 +0000 (04:09 +0000)]
net.server_event: Comment accidentally uncommented vdebug()

14 years agonet.server_event: Handle and ignore 'wantread' error from receive(), treat as a timeout
Matthew Wild [Sun, 22 Nov 2009 04:08:11 +0000 (04:08 +0000)]
net.server_event: Handle and ignore 'wantread' error from receive(), treat as a timeout

14 years agonet.server_event: Remove premature non-optimisation
Matthew Wild [Sun, 22 Nov 2009 04:06:40 +0000 (04:06 +0000)]
net.server_event: Remove premature non-optimisation

14 years agonet.server_event: Fix moved line caused by Mercurial's crecord and my selective commits
Matthew Wild [Sun, 22 Nov 2009 04:06:00 +0000 (04:06 +0000)]
net.server_event: Fix moved line caused by Mercurial's crecord and my selective commits

14 years agonet.server_event: Obey nowriting/nointerface for locks in interface methods
Matthew Wild [Sun, 22 Nov 2009 04:04:04 +0000 (04:04 +0000)]
net.server_event: Obey nowriting/nointerface for locks in interface methods

14 years agonet.server_event: Use conn property for send/receive instead of caching, fixes trying...
Matthew Wild [Sun, 22 Nov 2009 03:58:37 +0000 (03:58 +0000)]
net.server_event: Use conn property for send/receive instead of caching, fixes trying to use original socket after SSL-wrapping

14 years agonet.server_event: Set startsslcallback property to nil when we're done handshaking...
Matthew Wild [Sun, 22 Nov 2009 03:55:48 +0000 (03:55 +0000)]
net.server_event: Set startsslcallback property to nil when we're done handshaking, otherwise we keep trying to repeat the handshake

14 years agonet.server_event: Add set_sslctx() method to connections
Matthew Wild [Sun, 22 Nov 2009 03:53:44 +0000 (03:53 +0000)]
net.server_event: Add set_sslctx() method to connections

14 years agonet.server_event: conn.usingssl -> conn._usingssl
Matthew Wild [Sun, 22 Nov 2009 03:53:07 +0000 (03:53 +0000)]
net.server_event: conn.usingssl -> conn._usingssl

14 years agonet.server_event: Use correct listener callbacks
Matthew Wild [Sun, 22 Nov 2009 03:51:31 +0000 (03:51 +0000)]
net.server_event: Use correct listener callbacks

14 years agonet.server_event: Small whitespace fixes
Matthew Wild [Sun, 22 Nov 2009 03:49:47 +0000 (03:49 +0000)]
net.server_event: Small whitespace fixes

14 years agonet.server_event: Correct a few instances of .sslctx to ._sslctx
Matthew Wild [Sun, 22 Nov 2009 03:48:04 +0000 (03:48 +0000)]
net.server_event: Correct a few instances of .sslctx to ._sslctx

14 years agonet.server_event: Call connection's onconnect, no need to pass closures around now
Matthew Wild [Sun, 22 Nov 2009 03:44:15 +0000 (03:44 +0000)]
net.server_event: Call connection's onconnect, no need to pass closures around now

14 years agonet.server_event: Use connection id in all relevant logging
Matthew Wild [Sun, 22 Nov 2009 03:42:45 +0000 (03:42 +0000)]
net.server_event: Use connection id in all relevant logging

14 years agonet.server_event: Define id property for connection objects, to aid logging
Matthew Wild [Sun, 22 Nov 2009 03:20:35 +0000 (03:20 +0000)]
net.server_event: Define id property for connection objects, to aid logging

14 years agonet.server_event: Define vdebug function for convenience
Matthew Wild [Sun, 22 Nov 2009 03:14:32 +0000 (03:14 +0000)]
net.server_event: Define vdebug function for convenience

14 years agoobjectmanager: Convert to unix line-endings
Matthew Wild [Sat, 21 Nov 2009 23:04:26 +0000 (23:04 +0000)]
objectmanager: Convert to unix line-endings

14 years agonet.server_event: Change to new standard addserver() syntax
Matthew Wild [Sat, 21 Nov 2009 17:23:51 +0000 (17:23 +0000)]
net.server_event: Change to new standard addserver() syntax

14 years agonet.server_select: Change addserver() parameters to be compatible with new standard...
Matthew Wild [Sat, 21 Nov 2009 17:19:57 +0000 (17:19 +0000)]
net.server_select: Change addserver() parameters to be compatible with new standard syntax

14 years agomod_tls: Switch to : syntax for connection methods
Matthew Wild [Sat, 21 Nov 2009 17:16:46 +0000 (17:16 +0000)]
mod_tls: Switch to : syntax for connection methods

14 years agoxmppclient_listener: Use : syntax for connection methods, to be compatible with new...
Matthew Wild [Sat, 21 Nov 2009 17:15:59 +0000 (17:15 +0000)]
xmppclient_listener: Use : syntax for connection methods, to be compatible with new server.lua

14 years agoxmppclient_listener: Switch to .onincoming listener method, to be compatible with...
Matthew Wild [Sat, 21 Nov 2009 17:14:59 +0000 (17:14 +0000)]
xmppclient_listener: Switch to .onincoming listener method, to be compatible with new server_event.lua

14 years agonet.server: Small fix for addtimer() compatibility code
Matthew Wild [Sat, 21 Nov 2009 17:13:21 +0000 (17:13 +0000)]
net.server: Small fix for addtimer() compatibility code

14 years agonet.connlisteners: Standardise on new syntax for addserver(), and clean up a bit
Matthew Wild [Sat, 21 Nov 2009 17:11:59 +0000 (17:11 +0000)]
net.connlisteners: Standardise on new syntax for addserver(), and clean up a bit

14 years agosessionmanager: Use : syntax for calling connection methods
Matthew Wild [Sat, 21 Nov 2009 17:07:22 +0000 (17:07 +0000)]
sessionmanager: Use : syntax for calling connection methods

14 years agos2smanager: Don't log full stanza when sending outwards
Matthew Wild [Sat, 21 Nov 2009 13:49:48 +0000 (13:49 +0000)]
s2smanager: Don't log full stanza when sending outwards

14 years agos2smanager: Don't tostring() the data before sending, sends2s already does this.
Matthew Wild [Sat, 21 Nov 2009 13:47:45 +0000 (13:47 +0000)]
s2smanager: Don't tostring() the data before sending, sends2s already does this.

14 years agomod_bosh: Don't log response XML
Matthew Wild [Sat, 21 Nov 2009 13:15:46 +0000 (13:15 +0000)]
mod_bosh: Don't log response XML

14 years agoutil.timer: Fix libevent timers (event.base doesn't exist...)
Matthew Wild [Sat, 21 Nov 2009 03:16:14 +0000 (03:16 +0000)]
util.timer: Fix libevent timers (event.base doesn't exist...)

14 years agonet.server_event: Export base as event_base
Matthew Wild [Sat, 21 Nov 2009 03:15:59 +0000 (03:15 +0000)]
net.server_event: Export base as event_base

14 years agonet.server_event: Comment overly verbose log message
Matthew Wild [Sat, 21 Nov 2009 02:41:09 +0000 (02:41 +0000)]
net.server_event: Comment overly verbose log message

14 years agoutil.timer: Use libevent for lightweight timers if available and configured (use_libe...
Matthew Wild [Sat, 21 Nov 2009 02:40:21 +0000 (02:40 +0000)]
util.timer: Use libevent for lightweight timers if available and configured (use_libevent option)

14 years agonet.server: New net.server to choose the appropriate library from server_select/serve...
Matthew Wild [Sat, 21 Nov 2009 02:39:08 +0000 (02:39 +0000)]
net.server: New net.server to choose the appropriate library from server_select/server_event based on the availability of luaevent and the use_libevent config option

14 years agonet.server: Rename to net.server_select
Matthew Wild [Sat, 21 Nov 2009 02:36:35 +0000 (02:36 +0000)]
net.server: Rename to net.server_select

14 years agonet.server_event: Remove redundant getid() function
Matthew Wild [Fri, 20 Nov 2009 23:24:41 +0000 (23:24 +0000)]
net.server_event: Remove redundant getid() function

14 years agonet.server_event: Initial commit of server_event.lua. Don't get too excited, it's...
Matthew Wild [Fri, 20 Nov 2009 22:58:56 +0000 (22:58 +0000)]
net.server_event: Initial commit of server_event.lua. Don't get too excited, it's not used at all yet, and is still incomplete :)

14 years agos2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii...
Matthew Wild [Fri, 20 Nov 2009 15:07:39 +0000 (15:07 +0000)]
s2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii(), thanks Flo + waqas

14 years agos2smanager: Queue db:verify unless we already sent a db:result (if we had then it...
Matthew Wild [Fri, 20 Nov 2009 04:39:54 +0000 (04:39 +0000)]
s2smanager: Queue db:verify unless we already sent a db:result (if we had then it can could a dialback deadlock). Also remove some redundant code which could cause a db:result to be sent while still negotiating features (e.g. TLS) and break things. Collectively these fix a 'random' s2s failure (usually with ejabberd for some reason) - resulting in an 'unbound prefix' XML error, or 'ssl handshake failure'. Was this commit message long enough? I think so.

14 years agoMerge with trunk.
Tobias Markmann [Thu, 19 Nov 2009 16:53:52 +0000 (17:53 +0100)]
Merge with trunk.

14 years agoReduce needed roundtrips during DIGEST-MD5 login.
Tobias Markmann [Thu, 19 Nov 2009 16:20:38 +0000 (17:20 +0100)]
Reduce needed roundtrips during DIGEST-MD5 login.