prosody.git
14 years agomod_tls: Update for new server SSL syntax
Matthew Wild [Sun, 31 Jan 2010 15:39:04 +0000 (15:39 +0000)]
mod_tls: Update for new server SSL syntax

14 years agonet.server_select: Remove startssl parameter to the client/server creation functions...
Matthew Wild [Sun, 31 Jan 2010 15:37:08 +0000 (15:37 +0000)]
net.server_select: Remove startssl parameter to the client/server creation functions - passing a sslctx now indicates you want to use SSL from the start

14 years agoMUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role...
Matthew Wild [Sat, 30 Jan 2010 18:51:07 +0000 (18:51 +0000)]
MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo)

14 years agos2smanager: Fix syntax error)
Matthew Wild [Sat, 30 Jan 2010 18:45:46 +0000 (18:45 +0000)]
s2smanager: Fix syntax error)

14 years agos2smanager: require_s2s_encryption -> s2s_require_encryption
Matthew Wild [Sat, 30 Jan 2010 17:00:47 +0000 (17:00 +0000)]
s2smanager: require_s2s_encryption -> s2s_require_encryption

14 years agos2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild [Sat, 30 Jan 2010 16:42:27 +0000 (16:42 +0000)]
s2smanager: Make require_s2s_encryption do what it says on the tin

14 years agohostmanager: Trailing whitespace
Matthew Wild [Fri, 29 Jan 2010 17:09:20 +0000 (17:09 +0000)]
hostmanager: Trailing whitespace

14 years agonet.server_event: Trailing whitespace
Matthew Wild [Fri, 29 Jan 2010 16:49:43 +0000 (16:49 +0000)]
net.server_event: Trailing whitespace

14 years agonet.server_event: Support :setlistener() method on connections to work with port...
Matthew Wild [Fri, 29 Jan 2010 16:46:28 +0000 (16:46 +0000)]
net.server_event: Support :setlistener() method on connections to work with port multiplexing

14 years agoMerge with trunk.
Waqas Hussain [Fri, 29 Jan 2010 16:15:33 +0000 (21:15 +0500)]
Merge with trunk.

14 years agomod_presence: Quick fix to make probes from local users to local hosts work.
Waqas Hussain [Fri, 29 Jan 2010 16:08:18 +0000 (21:08 +0500)]
mod_presence: Quick fix to make probes from local users to local hosts work.

14 years agomod_presence: Added handler for presence subscriptions and probes to local hosts.
Waqas Hussain [Fri, 29 Jan 2010 16:06:51 +0000 (21:06 +0500)]
mod_presence: Added handler for presence subscriptions and probes to local hosts.

14 years agostanza_router: Added third parameter to core_post_stanza, to control pre-events.
Waqas Hussain [Fri, 29 Jan 2010 16:04:36 +0000 (21:04 +0500)]
stanza_router: Added third parameter to core_post_stanza, to control pre-events.

14 years agoMUC: Fixes and refactoring for the previous commit to work in all cases, text of...
Matthew Wild [Fri, 29 Jan 2010 15:13:06 +0000 (15:13 +0000)]
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast

14 years agoMUC: Show error message texts when participants are kicked for stanza errors
Matthew Wild [Fri, 29 Jan 2010 14:40:37 +0000 (14:40 +0000)]
MUC: Show error message texts when participants are kicked for stanza errors

14 years agoMUC: Have get_error_condition() use the new stanza:get_error() (muc.lib.lua 11 lines...
Matthew Wild [Fri, 29 Jan 2010 14:26:54 +0000 (14:26 +0000)]
MUC: Have get_error_condition() use the new stanza:get_error() (muc.lib.lua 11 lines shorter \o/)

14 years agoutil.stanza: Add stanza:get_error() to return type, condition and text of a stanza...
Matthew Wild [Fri, 29 Jan 2010 14:22:03 +0000 (14:22 +0000)]
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error

14 years agomod_presence: Respond with an unavailable presence when subscribers probe and no...
Waqas Hussain [Fri, 29 Jan 2010 13:16:39 +0000 (18:16 +0500)]
mod_presence: Respond with an unavailable presence when subscribers probe and no resources are available.

14 years agomod_privacy: A handful of logging fixes
Matthew Wild [Fri, 29 Jan 2010 13:02:06 +0000 (13:02 +0000)]
mod_privacy: A handful of logging fixes

14 years agomod_privacy: Remove the giant if/end block that was really causing problems - skippin...
Matthew Wild [Fri, 29 Jan 2010 03:21:18 +0000 (03:21 +0000)]
mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.

14 years agoMerge backed out changeset
Matthew Wild [Fri, 29 Jan 2010 03:07:30 +0000 (03:07 +0000)]
Merge backed out changeset

14 years agoBacked out changeset c4240df1b412 (or this)
Matthew Wild [Fri, 29 Jan 2010 03:07:08 +0000 (03:07 +0000)]
Backed out changeset c4240df1b412 (or this)

14 years agoBacked out changeset a4f9ed3f912e (you didn't see this)
Matthew Wild [Fri, 29 Jan 2010 03:06:37 +0000 (03:06 +0000)]
Backed out changeset a4f9ed3f912e (you didn't see this)

14 years agomod_privacy: ...and no 'to' for presence implies an outgoing broadcast
Matthew Wild [Fri, 29 Jan 2010 02:49:34 +0000 (02:49 +0000)]
mod_privacy: ...and no 'to' for presence implies an outgoing broadcast

14 years agomod_privacy: Mmph, no 'from' == from local
Matthew Wild [Fri, 29 Jan 2010 02:41:36 +0000 (02:41 +0000)]
mod_privacy: Mmph, no 'from' == from local

14 years agomod_privacy: Fix repeated presence-in (should be presence-out) - this stops the block...
Matthew Wild [Fri, 29 Jan 2010 02:24:36 +0000 (02:24 +0000)]
mod_privacy: Fix repeated presence-in (should be presence-out) - this stops the blocking of legitimate inbound presence, and inbound/outbound iqs and messages in Gajim's invisible mode (maybe I can sleep now)

14 years agomod_privacy: Trailing whitespace (I can't sleep)
Matthew Wild [Fri, 29 Jan 2010 02:16:43 +0000 (02:16 +0000)]
mod_privacy: Trailing whitespace (I can't sleep)

14 years agoprosodyctl: Don't load luarocks as util.dependencies now does this
Matthew Wild [Thu, 28 Jan 2010 18:11:24 +0000 (18:11 +0000)]
prosodyctl: Don't load luarocks as util.dependencies now does this

14 years agoprosody: Check dependencies (and load LuaRocks) earlier on in the startup process
Matthew Wild [Thu, 28 Jan 2010 18:11:03 +0000 (18:11 +0000)]
prosody: Check dependencies (and load LuaRocks) earlier on in the startup process

14 years agoutil.dependencies: Load luarocks.loader/luarocks.require
Matthew Wild [Thu, 28 Jan 2010 18:10:20 +0000 (18:10 +0000)]
util.dependencies: Load luarocks.loader/luarocks.require

14 years agomod_console: Update !! shortcut for new connection API
Matthew Wild [Thu, 28 Jan 2010 15:17:55 +0000 (15:17 +0000)]
mod_console: Update !! shortcut for new connection API

14 years agoprosodyctl: Don't display message about failing to start Prosody is daemonizing is...
Matthew Wild [Thu, 28 Jan 2010 15:05:30 +0000 (15:05 +0000)]
prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running)

14 years agoutil.dependencies, prosody, prosodyctl: Give util.dependencies a check_dependencies...
Matthew Wild [Thu, 28 Jan 2010 14:56:47 +0000 (14:56 +0000)]
util.dependencies, prosody, prosodyctl: Give util.dependencies a check_dependencies() function so the caller can decide what to do when dependencies aren't met - update prosody/prosodyctl for this change

14 years agos2smanager: Whitespace
Matthew Wild [Thu, 28 Jan 2010 13:39:23 +0000 (13:39 +0000)]
s2smanager: Whitespace

14 years agoxep227toprosody: Fixed some global accesses.
Waqas Hussain [Wed, 27 Jan 2010 18:11:06 +0000 (23:11 +0500)]
xep227toprosody: Fixed some global accesses.

14 years agoxep227toprosody: Initial commit (thanks stefan).
Waqas Hussain [Wed, 27 Jan 2010 18:04:13 +0000 (23:04 +0500)]
xep227toprosody: Initial commit (thanks stefan).

14 years agoxmlhandlers: Removed unused variables.
Waqas Hussain [Mon, 25 Jan 2010 22:39:53 +0000 (03:39 +0500)]
xmlhandlers: Removed unused variables.

14 years agoxmlhandlers: A little optimization.
Waqas Hussain [Mon, 25 Jan 2010 22:39:24 +0000 (03:39 +0500)]
xmlhandlers: A little optimization.

14 years agoMUC: Removed old commented code.
Waqas Hussain [Mon, 25 Jan 2010 21:30:56 +0000 (02:30 +0500)]
MUC: Removed old commented code.

14 years agoMUC: Converted some local functions into methods.
Waqas Hussain [Mon, 25 Jan 2010 21:29:32 +0000 (02:29 +0500)]
MUC: Converted some local functions into methods.

14 years agomod_privacy: Removed a useless 'require' within a function.
Waqas Hussain [Mon, 25 Jan 2010 21:11:50 +0000 (02:11 +0500)]
mod_privacy: Removed a useless 'require' within a function.

14 years agoMerge with trunk.
Waqas Hussain [Mon, 25 Jan 2010 21:10:25 +0000 (02:10 +0500)]
Merge with trunk.

14 years agomod_privacy: Cleaned up code.
Waqas Hussain [Mon, 25 Jan 2010 21:07:13 +0000 (02:07 +0500)]
mod_privacy: Cleaned up code.

14 years agoprosodyctl: Require util.dependencies to run dependency checks, not only for when...
Matthew Wild [Mon, 25 Jan 2010 20:58:15 +0000 (20:58 +0000)]
prosodyctl: Require util.dependencies to run dependency checks, not only for when starting Prosody directly (thanks Joe)

14 years agomod_privacy: Reduced a function.
Waqas Hussain [Mon, 25 Jan 2010 20:49:45 +0000 (01:49 +0500)]
mod_privacy: Reduced a function.

14 years agomod_privacy: Fixed global access.
Waqas Hussain [Mon, 25 Jan 2010 20:47:21 +0000 (01:47 +0500)]
mod_privacy: Fixed global access.

14 years agomod_privacy: Imported from prosody-modules.
Waqas Hussain [Mon, 25 Jan 2010 20:32:39 +0000 (01:32 +0500)]
mod_privacy: Imported from prosody-modules.

14 years agomod_component: Cleaned up unused variables.
Waqas Hussain [Sun, 24 Jan 2010 00:36:25 +0000 (05:36 +0500)]
mod_component: Cleaned up unused variables.

14 years agoprosody: Listen for component connections on port 5347 by default.
Waqas Hussain [Sun, 24 Jan 2010 00:35:21 +0000 (05:35 +0500)]
prosody: Listen for component connections on port 5347 by default.

14 years agoxmlhandlers: Rearranged a little code.
Waqas Hussain [Sat, 23 Jan 2010 13:41:20 +0000 (18:41 +0500)]
xmlhandlers: Rearranged a little code.

14 years agoxmlhandlers: Fixed indentation and added some semicolons.
Waqas Hussain [Sat, 23 Jan 2010 13:33:39 +0000 (18:33 +0500)]
xmlhandlers: Fixed indentation and added some semicolons.

14 years agomod_disco: Added option 'disco_items' to allow appending items to a host's disco...
Waqas Hussain [Sat, 23 Jan 2010 13:16:10 +0000 (18:16 +0500)]
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.

14 years agomod_component: Fix name of config option in error message (thanks nulani!)
Matthew Wild [Sat, 23 Jan 2010 02:53:44 +0000 (02:53 +0000)]
mod_component: Fix name of config option in error message (thanks nulani!)

14 years agoxmppcomponent_listener: Update for new connection API
Matthew Wild [Fri, 22 Jan 2010 16:36:11 +0000 (16:36 +0000)]
xmppcomponent_listener: Update for new connection API

14 years agoutil.dataforms: Add optional type parameters (defaults to 'form')
Matthew Wild [Fri, 22 Jan 2010 14:58:31 +0000 (14:58 +0000)]
util.dataforms: Add optional type parameters (defaults to 'form')

14 years agomod_xmlrpc: Obsolete, remove
Matthew Wild [Fri, 22 Jan 2010 14:48:30 +0000 (14:48 +0000)]
mod_xmlrpc: Obsolete, remove

14 years agomod_bosh: I == fail.
Matthew Wild [Fri, 22 Jan 2010 03:36:03 +0000 (03:36 +0000)]
mod_bosh: I == fail.

14 years agomod_bosh: Simplify cross-domain support, and make it work - default is for cross...
Matthew Wild [Fri, 22 Jan 2010 03:18:55 +0000 (03:18 +0000)]
mod_bosh: Simplify cross-domain support, and make it work - default is for cross-domain to be disallowed

14 years agomod_bosh: Support for cross-domain access control using CORS
Matthew Wild [Thu, 21 Jan 2010 15:07:52 +0000 (15:07 +0000)]
mod_bosh: Support for cross-domain access control using CORS

14 years agonet.httpserver: More robust handling of headers split across multiple packets
Matthew Wild [Thu, 21 Jan 2010 14:53:01 +0000 (14:53 +0000)]
net.httpserver: More robust handling of headers split across multiple packets

14 years agoutil.stanza: Trailing whitespace
Matthew Wild [Thu, 21 Jan 2010 13:22:41 +0000 (13:22 +0000)]
util.stanza: Trailing whitespace

14 years agonet.httpserver: Make it possible to return responses with no body
Matthew Wild [Thu, 21 Jan 2010 13:14:52 +0000 (13:14 +0000)]
net.httpserver: Make it possible to return responses with no body

14 years agonet.httpserver: Close connection on invalid HTTP status line
Matthew Wild [Thu, 21 Jan 2010 13:10:13 +0000 (13:10 +0000)]
net.httpserver: Close connection on invalid HTTP status line

14 years agomodulemanager: Remove obsolete actions code
Matthew Wild [Thu, 21 Jan 2010 12:57:12 +0000 (12:57 +0000)]
modulemanager: Remove obsolete actions code

14 years agonet.server_{select,event}: Fail gracefully if socket doesn't have a setoption method...
Matthew Wild [Thu, 21 Jan 2010 12:56:08 +0000 (12:56 +0000)]
net.server_{select,event}: Fail gracefully if socket doesn't have a setoption method (LuaSec issue I think)

14 years agonet.server_event: Replace all calls to _start_ssl() to its bigger brother starttls...
Matthew Wild [Thu, 21 Jan 2010 12:23:13 +0000 (12:23 +0000)]
net.server_event: Replace all calls to _start_ssl() to its bigger brother starttls() - fixes 5223 w/ libevent

14 years agoobjectmanager: Obsolete, remove
Matthew Wild [Thu, 21 Jan 2010 01:08:50 +0000 (01:08 +0000)]
objectmanager: Obsolete, remove

14 years agoactions: Obsolete, remove
Matthew Wild [Thu, 21 Jan 2010 01:07:17 +0000 (01:07 +0000)]
actions: Obsolete, remove

14 years agomod_actions_http: Obsolete, remove
Matthew Wild [Thu, 21 Jan 2010 01:06:30 +0000 (01:06 +0000)]
mod_actions_http: Obsolete, remove

14 years agomod_bosh: Trailing whitespace
Matthew Wild [Thu, 21 Jan 2010 00:35:07 +0000 (00:35 +0000)]
mod_bosh: Trailing whitespace

14 years agos2smanager: Log error and fail gracefully if we can't open a socket for an outgoing...
Matthew Wild [Tue, 19 Jan 2010 19:58:02 +0000 (19:58 +0000)]
s2smanager: Log error and fail gracefully if we can't open a socket for an outgoing s2s connection (thanks foucault)

14 years agonet.xmppserver_listener: Handle stream-error errors from xmlhandlers, and close sessi...
Matthew Wild [Tue, 19 Jan 2010 04:38:43 +0000 (04:38 +0000)]
net.xmppserver_listener: Handle stream-error errors from xmlhandlers, and close session in response

14 years agonet.xmppserver_listener: Extend session:close() with a remote_reason parameter
Matthew Wild [Tue, 19 Jan 2010 04:37:28 +0000 (04:37 +0000)]
net.xmppserver_listener: Extend session:close() with a remote_reason parameter

14 years agos2smanager: No-one noticed that Prosody stopped sending to/from on stream headers...
Matthew Wild [Tue, 19 Jan 2010 04:35:10 +0000 (04:35 +0000)]
s2smanager: No-one noticed that Prosody stopped sending to/from on stream headers recently? :)

14 years agoxmlhandlers: Move stream-error detection to somewhere more appropriate (it was never...
Matthew Wild [Tue, 19 Jan 2010 03:58:20 +0000 (03:58 +0000)]
xmlhandlers: Move stream-error detection to somewhere more appropriate (it was never reached) - s2s stream errors now reported properly

14 years agomod_bosh: Update for new xmlhandlers syntax
Matthew Wild [Tue, 19 Jan 2010 03:57:19 +0000 (03:57 +0000)]
mod_bosh: Update for new xmlhandlers syntax

14 years agonet.xmpp{client,server,component}: Update for new xmlhandlers syntax
Matthew Wild [Tue, 19 Jan 2010 03:56:44 +0000 (03:56 +0000)]
net.xmpp{client,server,component}: Update for new xmlhandlers syntax

14 years agonet.xmppserver_listener: Pass reason for session disconnection to disconnect handler...
Matthew Wild [Tue, 19 Jan 2010 03:55:19 +0000 (03:55 +0000)]
net.xmppserver_listener: Pass reason for session disconnection to disconnect handler, if known

14 years agoxmlhandlers: More refactoring, split up stream_ns and stream_tag, add stream_error_ta...
Matthew Wild [Tue, 19 Jan 2010 03:52:41 +0000 (03:52 +0000)]
xmlhandlers: More refactoring, split up stream_ns and stream_tag, add stream_error_tag so that callers don't need to be so worried about the separator we use

14 years agoxmlhandlers: Define ns_separator and ns_pattern to save repeating it in literal form...
Matthew Wild [Mon, 18 Jan 2010 19:00:18 +0000 (19:00 +0000)]
xmlhandlers: Define ns_separator and ns_pattern to save repeating it in literal form throughout the file

14 years agonet.server_event: Remove access to starttls method when starttls is negotiated -...
Matthew Wild [Mon, 18 Jan 2010 18:20:03 +0000 (18:20 +0000)]
net.server_event: Remove access to starttls method when starttls is negotiated - fixes offering starttls to client who are already using it (thanks darkrain and Adium)

14 years agomod_presence: Automatically deny presence requests for hosts, fixes traceback in...
Matthew Wild [Mon, 18 Jan 2010 17:14:41 +0000 (17:14 +0000)]
mod_presence: Automatically deny presence requests for hosts, fixes traceback in #153

14 years agostanza_router: Log the name of unhandled stanzas (thanks bear)
Matthew Wild [Mon, 18 Jan 2010 16:31:57 +0000 (16:31 +0000)]
stanza_router: Log the name of unhandled stanzas (thanks bear)

14 years agoutil.signal: Using stdlib.h instead of malloc.h.
Tobias Markmann [Fri, 15 Jan 2010 17:30:33 +0000 (18:30 +0100)]
util.signal: Using stdlib.h instead of malloc.h.

14 years agomod_muc: Remove unused history_length declaration
Matthew Wild [Wed, 13 Jan 2010 00:05:07 +0000 (00:05 +0000)]
mod_muc: Remove unused history_length declaration

14 years agoprosodyctl: Use mode r+ for opening the file so 1) it fails if the file doesn't exist...
Matthew Wild [Wed, 13 Jan 2010 00:04:38 +0000 (00:04 +0000)]
prosodyctl: Use mode r+ for opening the file so 1) it fails if the file doesn't exist 2) we have write access to  lock it

14 years agomod_posix: Adjust file open mode depending on whether file exists (take that fopen...
Matthew Wild [Wed, 13 Jan 2010 00:03:22 +0000 (00:03 +0000)]
mod_posix: Adjust file open mode depending on whether file exists (take that fopen designers!!!)

14 years agoutil.pposix, mod_posix, prosodyctl: Bump pposix version to 0.3.3 for mkdir
Matthew Wild [Tue, 12 Jan 2010 15:35:36 +0000 (15:35 +0000)]
util.pposix, mod_posix, prosodyctl: Bump pposix version to 0.3.3 for mkdir

14 years agoxmppclient_listener: Allow the tcp_keepalives option in the config to control whether...
Matthew Wild [Tue, 12 Jan 2010 15:17:08 +0000 (15:17 +0000)]
xmppclient_listener: Allow the tcp_keepalives option in the config to control whether keepalives are used

14 years agonet.server_event: Add conn:setoption() to set options on the socket
Matthew Wild [Tue, 12 Jan 2010 15:16:22 +0000 (15:16 +0000)]
net.server_event: Add conn:setoption() to set options on the socket

14 years agonet.server_select: Add conn:setoption() to set options on the socket
Matthew Wild [Tue, 12 Jan 2010 15:15:49 +0000 (15:15 +0000)]
net.server_select: Add conn:setoption() to set options on the socket

14 years agomod_saslauth: Fixed some indentation and added some semi-colons.
Waqas Hussain [Mon, 11 Jan 2010 14:17:26 +0000 (19:17 +0500)]
mod_saslauth: Fixed some indentation and added some semi-colons.

14 years agomod_saslauth: Made some variables local to avoid unnecessary global access.
Waqas Hussain [Mon, 11 Jan 2010 14:05:08 +0000 (19:05 +0500)]
mod_saslauth: Made some variables local to avoid unnecessary global access.

14 years agosessionmanager: Added resource prepping, and invalid resource checking to the bind_re...
Waqas Hussain [Mon, 11 Jan 2010 13:59:06 +0000 (18:59 +0500)]
sessionmanager: Added resource prepping, and invalid resource checking to the bind_resource function.

14 years agomod_register: Return a <not-acceptable/> error on empty usernames (thanks Neustradamus).
Waqas Hussain [Mon, 11 Jan 2010 12:52:28 +0000 (17:52 +0500)]
mod_register: Return a <not-acceptable/> error on empty usernames (thanks Neustradamus).

14 years agocomponentmanager: Add dialback_secret to components to allow s2s to work (thanks...
Matthew Wild [Mon, 11 Jan 2010 10:13:02 +0000 (10:13 +0000)]
componentmanager: Add dialback_secret to components to allow s2s to work (thanks Flo)

14 years agoutil.prosodyctl: Report Prosody as not running if the pidfile isn't locked
Matthew Wild [Mon, 11 Jan 2010 00:14:33 +0000 (00:14 +0000)]
util.prosodyctl: Report Prosody as not running if the pidfile isn't locked

14 years agomod_posix: Lock pidfile when in use, shut down if we can't write or lock the pidfile
Matthew Wild [Sun, 10 Jan 2010 23:49:38 +0000 (23:49 +0000)]
mod_posix: Lock pidfile when in use, shut down if we can't write or lock the pidfile

14 years agoutil.datamanager: Use pposix.mkdir if available
Matthew Wild [Sun, 10 Jan 2010 23:13:30 +0000 (23:13 +0000)]
util.datamanager: Use pposix.mkdir if available

14 years agoutil.pposix: Add mkdir(path)
Matthew Wild [Sun, 10 Jan 2010 23:12:22 +0000 (23:12 +0000)]
util.pposix: Add mkdir(path)