prosody.git
11 years agoAUTHORS: A small update...
Matthew Wild [Sun, 31 Mar 2013 12:43:12 +0000 (13:43 +0100)]
AUTHORS: A small update...

11 years agotools/migration/Makefile: Apply Lua runtime override (see 53f741a5a73a)
Kim Alvefur [Sun, 31 Mar 2013 18:09:14 +0000 (20:09 +0200)]
tools/migration/Makefile: Apply Lua runtime override (see 53f741a5a73a)

11 years agoconfigure: Set to run with lua5.1 in the debian preset
Kim Alvefur [Sun, 31 Mar 2013 18:04:09 +0000 (20:04 +0200)]
configure: Set to run with lua5.1 in the debian preset

11 years agoportmanager: Log error and fail to bind when port is invalid (not a number)
Matthew Wild [Sun, 31 Mar 2013 11:27:28 +0000 (12:27 +0100)]
portmanager: Log error and fail to bind when port is invalid (not a number)

11 years agomod_muc/muc.lib: Don't add messages without a body (such as chat state notifications...
Matthew Wild [Thu, 28 Mar 2013 13:50:21 +0000 (09:50 -0400)]
mod_muc/muc.lib: Don't add messages without a body (such as chat state notifications) to the room history (thanks louiz?, Link Mauve, poezio and all its users)

11 years agoutil.json: Add json.encode_array() (thanks B)
Matthew Wild [Thu, 28 Mar 2013 13:31:07 +0000 (09:31 -0400)]
util.json: Add json.encode_array() (thanks B)

11 years agomod_privacy: Drop stanzas of type groupchat, so users aren't kicked from their chatro...
Tobias Markmann [Thu, 28 Mar 2013 11:49:19 +0000 (12:49 +0100)]
mod_privacy: Drop stanzas of type groupchat, so users aren't kicked from their chatrooms when blocking specific MUC occupants.

11 years agoportmanager: Add use_ipv4 option, default to true.
Kim Alvefur [Wed, 27 Mar 2013 22:48:39 +0000 (23:48 +0100)]
portmanager: Add use_ipv4 option, default to true.

11 years agoportmanager: use_ipv6 defaults to true if luasocket has ipv6 support
Kim Alvefur [Wed, 27 Mar 2013 22:32:34 +0000 (23:32 +0100)]
portmanager: use_ipv6 defaults to true if luasocket has ipv6 support

11 years agomod_s2s: Prevent s2s to and from hosts we serve locally
Kim Alvefur [Wed, 27 Mar 2013 22:09:47 +0000 (23:09 +0100)]
mod_s2s: Prevent s2s to and from hosts we serve locally

11 years agomod_s2s: Prevent traceback when replying to incoming connection to a host we don...
Kim Alvefur [Tue, 26 Mar 2013 08:25:20 +0000 (09:25 +0100)]
mod_s2s: Prevent traceback when replying to incoming connection to a host we don't serve

11 years agomod_s2s: Reset secure flag on new connection attempt
Kim Alvefur [Mon, 25 Mar 2013 18:08:15 +0000 (19:08 +0100)]
mod_s2s: Reset secure flag on new connection attempt

11 years agomod_s2s: session.from_host does not allways exist on incoming connections, true and...
Kim Alvefur [Mon, 25 Mar 2013 07:18:49 +0000 (08:18 +0100)]
mod_s2s: session.from_host does not allways exist on incoming connections, true and nil or "our hostname" does not evaluate to what we want here

11 years agomod_s2s: Keep the dns answer object around a while so plugins can look at it
Kim Alvefur [Sat, 23 Mar 2013 22:30:13 +0000 (23:30 +0100)]
mod_s2s: Keep the dns answer object around a while so plugins can look at it

11 years agonet.server, _select: Reorganise configuration of server_select to be more like server...
Kim Alvefur [Sat, 23 Mar 2013 19:06:02 +0000 (20:06 +0100)]
net.server, _select: Reorganise configuration of server_select to be more like server_event

11 years agoprosody, prosodyctl: Remove last trace of "core" \o/
Kim Alvefur [Sat, 23 Mar 2013 14:00:49 +0000 (15:00 +0100)]
prosody, prosodyctl: Remove last trace of "core" \o/

11 years agonet.server: No sections in config anymore
Kim Alvefur [Sat, 23 Mar 2013 14:00:22 +0000 (15:00 +0100)]
net.server: No sections in config anymore

11 years agoconfigmanager: Fix so unset variables are searched for in the global section
Kim Alvefur [Sat, 23 Mar 2013 03:14:52 +0000 (04:14 +0100)]
configmanager: Fix so unset variables are searched for in the global section

11 years agoutil.{prosodyctl,openssl}: More use of config sections removed
Kim Alvefur [Sat, 23 Mar 2013 01:38:30 +0000 (02:38 +0100)]
util.{prosodyctl,openssl}: More use of config sections removed

11 years agomod_tls: More use of config sections removed
Kim Alvefur [Sat, 23 Mar 2013 01:35:50 +0000 (02:35 +0100)]
mod_tls: More use of config sections removed

11 years agocore.*: Complete removal of all traces of the "core" section and section-related...
Kim Alvefur [Sat, 23 Mar 2013 01:33:15 +0000 (02:33 +0100)]
core.*: Complete removal of all traces of the "core" section and section-related code.

11 years agoMUC: Access prosody.hosts instead of the old global hosts
Kim Alvefur [Sat, 23 Mar 2013 01:24:11 +0000 (02:24 +0100)]
MUC: Access prosody.hosts instead of the old global hosts

11 years agomod_proxy65: Fix typo in comment
Kim Alvefur [Sat, 23 Mar 2013 00:42:48 +0000 (01:42 +0100)]
mod_proxy65: Fix typo in comment

11 years agomod_http: Import portmanager
Kim Alvefur [Sat, 23 Mar 2013 00:42:27 +0000 (01:42 +0100)]
mod_http: Import portmanager

11 years agomod_groups: Use module API for reading config
Kim Alvefur [Sat, 23 Mar 2013 00:39:56 +0000 (01:39 +0100)]
mod_groups: Use module API for reading config

11 years agomod_roster: Remove unused variable
Kim Alvefur [Sat, 23 Mar 2013 00:35:52 +0000 (01:35 +0100)]
mod_roster: Remove unused variable

11 years agomod_motd, mod_register, mod_private, mod_http_errors, mod_admin_adhoc: Remove unused...
Kim Alvefur [Sat, 23 Mar 2013 00:27:38 +0000 (01:27 +0100)]
mod_motd, mod_register, mod_private, mod_http_errors, mod_admin_adhoc: Remove unused imports

11 years agomod_announce, mod_auth_anonymous, mod_c2s, mod_c2s, mod_component, mod_iq, mod_messag...
Kim Alvefur [Sat, 23 Mar 2013 00:27:16 +0000 (01:27 +0100)]
mod_announce, mod_auth_anonymous, mod_c2s, mod_c2s, mod_component, mod_iq, mod_message, mod_presence, mod_tls: Access prosody.{hosts,bare_sessions,full_sessions} instead of the old globals

11 years agoMerge 0.9->trunk
Matthew Wild [Fri, 22 Mar 2013 15:16:43 +0000 (15:16 +0000)]
Merge 0.9->trunk

11 years agomod_s2s: Fix variable usage in check_auth_policy (thanks Florob)
Matthew Wild [Fri, 22 Mar 2013 15:16:22 +0000 (15:16 +0000)]
mod_s2s: Fix variable usage in check_auth_policy (thanks Florob)

11 years agos2smanager: Remove unused function parameter
Matthew Wild [Fri, 22 Mar 2013 14:50:43 +0000 (14:50 +0000)]
s2smanager: Remove unused function parameter

11 years agos2smanager: Access prosody.hosts instead of hosts global directly
Matthew Wild [Fri, 22 Mar 2013 14:50:29 +0000 (14:50 +0000)]
s2smanager: Access prosody.hosts instead of hosts global directly

11 years agomod_s2s: Remove unused variable
Matthew Wild [Fri, 22 Mar 2013 14:31:14 +0000 (14:31 +0000)]
mod_s2s: Remove unused variable

11 years agoMerge 0.9->trunk
Matthew Wild [Fri, 22 Mar 2013 14:22:46 +0000 (14:22 +0000)]
Merge 0.9->trunk

11 years agomod_s2s: Add controls for certificate validation via the s2s_secure_auth option....
Matthew Wild [Fri, 22 Mar 2013 14:21:02 +0000 (14:21 +0000)]
mod_s2s: Add controls for certificate validation via the s2s_secure_auth option. Plugins can now return false from handling s2s-check-certificate to prevent connection establishment (s2sin+s2sout)

11 years agos2smanager, mod_s2s, mod_dialback, mod_saslauth: Move s2smanager.make_authenticated...
Matthew Wild [Fri, 22 Mar 2013 14:18:23 +0000 (14:18 +0000)]
s2smanager, mod_s2s, mod_dialback, mod_saslauth: Move s2smanager.make_authenticated() to mod_s2s, and plugins now signal authentication via the s2s-authenticated event

11 years agohostmanager: Use rawget to check for activated hosts to prevent recursion in dynamic...
Matthew Wild [Fri, 22 Mar 2013 11:24:54 +0000 (11:24 +0000)]
hostmanager: Use rawget to check for activated hosts to prevent recursion in dynamic host loaders

11 years agohostmanager: Use prosody.hosts instead of 'hosts' global
Matthew Wild [Fri, 22 Mar 2013 11:24:13 +0000 (11:24 +0000)]
hostmanager: Use prosody.hosts instead of 'hosts' global

11 years agoutil.pposix: Allow fetching RLIMIT_NICE when available
Matthew Wild [Fri, 22 Mar 2013 11:23:40 +0000 (11:23 +0000)]
util.pposix: Allow fetching RLIMIT_NICE when available

11 years agoprosody: Add COMPAT note about globals
Matthew Wild [Fri, 22 Mar 2013 11:22:50 +0000 (11:22 +0000)]
prosody: Add COMPAT note about globals

11 years agoconfigmanager, hostmanager, prosody: Almost complete removal of section-related code...
Matthew Wild [Fri, 22 Mar 2013 11:21:24 +0000 (11:21 +0000)]
configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users.

11 years agoMerge...
Matthew Wild [Wed, 20 Mar 2013 20:35:59 +0000 (20:35 +0000)]
Merge...

11 years agoMerge 0.9->trunk
Matthew Wild [Wed, 20 Mar 2013 20:34:38 +0000 (20:34 +0000)]
Merge 0.9->trunk

11 years agonet.http: Disable SSLv2 support for HTTPS connections
Matthew Wild [Wed, 20 Mar 2013 20:31:52 +0000 (20:31 +0000)]
net.http: Disable SSLv2 support for HTTPS connections

11 years agonet.http: Allow passing an SSL context or options table to be used for HTTPS requests...
Matthew Wild [Wed, 20 Mar 2013 20:31:02 +0000 (20:31 +0000)]
net.http: Allow passing an SSL context or options table to be used for HTTPS requests (thanks daurnimator)

11 years agoMerge 0.9->trunk
Kim Alvefur [Sat, 16 Mar 2013 17:49:14 +0000 (18:49 +0100)]
Merge 0.9->trunk

11 years agomod_s2s, mod_saslauth, mod_compression: Refactor to have common code for opening...
Kim Alvefur [Sat, 16 Mar 2013 16:46:43 +0000 (17:46 +0100)]
mod_s2s, mod_saslauth, mod_compression: Refactor to have common code for opening streams

11 years agocerts/openssl.cnf: Update XMPP-Core references to reflect RFC publication
Kim Alvefur [Fri, 15 Mar 2013 08:51:43 +0000 (09:51 +0100)]
certs/openssl.cnf: Update XMPP-Core references to reflect RFC publication

11 years agos2smanager: Use unused local, reduce table indexing
Kim Alvefur [Wed, 13 Mar 2013 06:33:36 +0000 (07:33 +0100)]
s2smanager: Use unused local, reduce table indexing

11 years agorostermanager: Remove unused imports
Kim Alvefur [Wed, 13 Mar 2013 06:03:34 +0000 (07:03 +0100)]
rostermanager: Remove unused imports

11 years agohostmanager: Import core_post_stanza from the global prosody table
Kim Alvefur [Wed, 13 Mar 2013 06:01:57 +0000 (07:01 +0100)]
hostmanager: Import core_post_stanza from the global prosody table

11 years agoMerge 0.9->trunk
Matthew Wild [Tue, 12 Mar 2013 12:30:35 +0000 (12:30 +0000)]
Merge 0.9->trunk

11 years agomod_s2s: Do not include xmlns:db declaration in stream header if mod_dialback is...
Matthew Wild [Tue, 12 Mar 2013 12:30:08 +0000 (12:30 +0000)]
mod_s2s: Do not include xmlns:db declaration in stream header if mod_dialback is not loaded

11 years agomod_s2s: Make sure host variable is reachable
Kim Alvefur [Mon, 11 Mar 2013 20:39:15 +0000 (21:39 +0100)]
mod_s2s: Make sure host variable is reachable

11 years agomod_s2s: Fire s2s-check-certificate event after validating a certificate, to allow...
Matthew Wild [Sun, 10 Mar 2013 17:49:07 +0000 (17:49 +0000)]
mod_s2s: Fire s2s-check-certificate event after validating a certificate, to allow plugins to override standard procedure

11 years agoMerge 0.9->trunk
Matthew Wild [Sun, 10 Mar 2013 11:29:47 +0000 (11:29 +0000)]
Merge 0.9->trunk

11 years agomod_s2s, mod_dialback: Rename s2s-authenticate-legacy event to s2sout-authenticate...
Matthew Wild [Sun, 10 Mar 2013 11:25:05 +0000 (11:25 +0000)]
mod_s2s, mod_dialback: Rename s2s-authenticate-legacy event to s2sout-authenticate-legacy for clarity. Also, hello!

11 years agonet.dns: Make sure argument to math.randomseed does not overflow a 32 bit unsigned...
Kim Alvefur [Tue, 5 Mar 2013 09:04:31 +0000 (10:04 +0100)]
net.dns: Make sure argument to math.randomseed does not overflow a 32 bit unsigned int. Closes #320

11 years agonet.server_event: Remove unused local
Kim Alvefur [Fri, 1 Mar 2013 13:15:38 +0000 (14:15 +0100)]
net.server_event: Remove unused local

11 years agonet.server_select: Optimization, clean bufferqueue when it makes sense.
Kim Alvefur [Fri, 1 Mar 2013 10:41:26 +0000 (11:41 +0100)]
net.server_select: Optimization, clean bufferqueue when it makes sense.

11 years agonet.server_select: Use # operator instead of string.len
Kim Alvefur [Fri, 1 Mar 2013 10:11:05 +0000 (11:11 +0100)]
net.server_select: Use # operator instead of string.len

11 years agomod_proxy65: Only handle service discovery requests when no node is present in the...
Waqas Hussain [Tue, 26 Feb 2013 18:57:44 +0000 (23:57 +0500)]
mod_proxy65: Only handle service discovery requests when no node is present in the request.

11 years agoMUC: Always return <service-unavailable/> when a node is present in service discovery...
Waqas Hussain [Tue, 26 Feb 2013 18:56:44 +0000 (23:56 +0500)]
MUC: Always return <service-unavailable/> when a node is present in service discovery requests.

11 years agoMUC: Fix affiliation check for admins, and bring it in line with the spec (thanks...
Waqas Hussain [Tue, 26 Feb 2013 15:31:41 +0000 (20:31 +0500)]
MUC: Fix affiliation check for admins, and bring it in line with the spec (thanks Maranda).

11 years agonet.http.server: Ensure HTTP callbacks are never called recursively for pipelined...
Waqas Hussain [Tue, 26 Feb 2013 14:41:52 +0000 (19:41 +0500)]
net.http.server: Ensure HTTP callbacks are never called recursively for pipelined requests.

11 years agomod_http: Expand $host in http_paths
Kim Alvefur [Mon, 18 Feb 2013 12:12:14 +0000 (13:12 +0100)]
mod_http: Expand $host in http_paths

11 years agonet.server_select: Limit global number of sockets passed to select.
Kim Alvefur [Tue, 12 Feb 2013 02:24:41 +0000 (03:24 +0100)]
net.server_select: Limit global number of sockets passed to select.

11 years agonet.server_select: Be less aggressive about server pause
Kim Alvefur [Tue, 12 Feb 2013 02:24:30 +0000 (03:24 +0100)]
net.server_select: Be less aggressive about server pause

11 years agomod_admin_adhoc: Fix 'Shut down service' command
Florian Zeitz [Thu, 7 Feb 2013 21:11:35 +0000 (22:11 +0100)]
mod_admin_adhoc: Fix 'Shut down service' command

11 years agomod_admin_adhoc: Implement global module unloading
Florian Zeitz [Thu, 7 Feb 2013 20:14:01 +0000 (21:14 +0100)]
mod_admin_adhoc: Implement global module unloading

11 years agomod_admin_adhoc: Implement global module reloading
Florian Zeitz [Wed, 6 Feb 2013 23:40:00 +0000 (00:40 +0100)]
mod_admin_adhoc: Implement global module reloading

11 years agomod_admin_adhoc: Fix info message for module reload/unload
Florian Zeitz [Tue, 5 Feb 2013 23:53:49 +0000 (00:53 +0100)]
mod_admin_adhoc: Fix info message for module reload/unload

11 years agomod_admin_adhoc: Implement global module loading
Florian Zeitz [Tue, 5 Feb 2013 23:51:25 +0000 (00:51 +0100)]
mod_admin_adhoc: Implement global module loading

11 years agomod_admin_adhoc: Remove a TODO, our pretty_print turns out not to be helpful after all
Florian Zeitz [Mon, 4 Feb 2013 23:43:14 +0000 (00:43 +0100)]
mod_admin_adhoc: Remove a TODO, our pretty_print turns out not to be helpful after all

11 years agonet.http.parser: Ensure full URL in status line contains a path.
Waqas Hussain [Thu, 7 Feb 2013 19:27:59 +0000 (00:27 +0500)]
net.http.parser: Ensure full URL in status line contains a path.

11 years agonet.http.parser: Fix traceback on invalid URL in status line.
Waqas Hussain [Thu, 7 Feb 2013 19:18:40 +0000 (00:18 +0500)]
net.http.parser: Fix traceback on invalid URL in status line.

11 years agoMerge 0.9->trunk
Kim Alvefur [Sun, 3 Feb 2013 14:52:27 +0000 (15:52 +0100)]
Merge 0.9->trunk

11 years agomod_pubsub, util.pubsub: Add delete action
Kim Alvefur [Thu, 31 Jan 2013 17:41:01 +0000 (18:41 +0100)]
mod_pubsub, util.pubsub: Add delete action

11 years agoportmanager: Make sure foo_ports is a table
Kim Alvefur [Thu, 31 Jan 2013 14:48:55 +0000 (15:48 +0100)]
portmanager: Make sure foo_ports is a table

11 years agomod_pubsub: More strict checks for node and ids
Kim Alvefur [Thu, 31 Jan 2013 14:33:41 +0000 (15:33 +0100)]
mod_pubsub: More strict checks for node and ids

11 years agomod_pubsub: Broadcast items correctly on new subscriptions
Kim Alvefur [Mon, 28 Jan 2013 00:06:05 +0000 (01:06 +0100)]
mod_pubsub: Broadcast items correctly on new subscriptions

11 years agomod_component: Look for the correct xmlns (thanks NebuK)
Kim Alvefur [Sun, 27 Jan 2013 16:11:45 +0000 (17:11 +0100)]
mod_component: Look for the correct xmlns (thanks NebuK)

11 years agoutil.pubsub: Fix nil access error in get_subscriptions.
Waqas Hussain [Fri, 25 Jan 2013 22:54:18 +0000 (03:54 +0500)]
util.pubsub: Fix nil access error in get_subscriptions.

11 years agomod_pubsub: require usermanager.
Waqas Hussain [Fri, 25 Jan 2013 22:50:13 +0000 (03:50 +0500)]
mod_pubsub: require usermanager.

11 years agomod_pubsub: Fix nil access error.
Waqas Hussain [Fri, 25 Jan 2013 22:49:45 +0000 (03:49 +0500)]
mod_pubsub: Fix nil access error.

11 years agomod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element
Florian Zeitz [Fri, 25 Jan 2013 00:32:14 +0000 (01:32 +0100)]
mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element

11 years agoutil.xmppstream: Include error stanza in error message if no error handler is available.
Waqas Hussain [Fri, 25 Jan 2013 22:39:18 +0000 (03:39 +0500)]
util.xmppstream: Include error stanza in error message if no error handler is available.

11 years agoejabberd2prosody.lua: Don't make assumptions about file name.
Kim Alvefur [Thu, 24 Jan 2013 23:36:17 +0000 (00:36 +0100)]
ejabberd2prosody.lua: Don't make assumptions about file name.

11 years agoejabberd2prosody.lua: Replace util.logger with a dummy before requiring util.serializ...
Kim Alvefur [Thu, 24 Jan 2013 20:48:45 +0000 (21:48 +0100)]
ejabberd2prosody.lua: Replace util.logger with a dummy before requiring util.serialization

11 years agomod_pubsub: Ignore subscription options for now, fixes traceback due to missing form
Kim Alvefur [Thu, 24 Jan 2013 15:36:48 +0000 (16:36 +0100)]
mod_pubsub: Ignore subscription options for now, fixes traceback due to missing form

11 years agomod_s2s: Don't try to close sessions that were destroyed before timeout
Kim Alvefur [Wed, 23 Jan 2013 23:59:32 +0000 (00:59 +0100)]
mod_s2s: Don't try to close sessions that were destroyed before timeout

11 years agos2smanager: Generate session names used for logging the same way everywhere
Kim Alvefur [Wed, 23 Jan 2013 23:58:17 +0000 (00:58 +0100)]
s2smanager: Generate session names used for logging the same way everywhere

11 years agomod_pubsub, util.pubsub: Implement the purge action
Kim Alvefur [Wed, 23 Jan 2013 23:58:03 +0000 (00:58 +0100)]
mod_pubsub, util.pubsub: Implement the purge action

11 years agomod_pubsub: Advertise autocreate_on_publish correctly.
Kim Alvefur [Wed, 23 Jan 2013 21:41:18 +0000 (22:41 +0100)]
mod_pubsub: Advertise autocreate_on_publish correctly.

11 years agoMerge 0.9->trunk
Waqas Hussain [Tue, 22 Jan 2013 03:30:38 +0000 (08:30 +0500)]
Merge 0.9->trunk

11 years agomod_auth_internal_plain, mod_auth_internal_hashed: No need to nodeprep here.
Waqas Hussain [Tue, 22 Jan 2013 03:26:08 +0000 (08:26 +0500)]
mod_auth_internal_plain, mod_auth_internal_hashed: No need to nodeprep here.

11 years agoutil.sasl.{plain,scram,digest-md5}: nodeprep username before passing to callbacks...
Waqas Hussain [Tue, 22 Jan 2013 03:21:05 +0000 (08:21 +0500)]
util.sasl.{plain,scram,digest-md5}: nodeprep username before passing to callbacks, so callbacks don't have to.

11 years agonet.http.server: Properly handle persistent connections
Florian Zeitz [Sat, 12 Jan 2013 16:26:50 +0000 (17:26 +0100)]
net.http.server: Properly handle persistent connections

11 years agoutil.http: New module for HTTP helper functions
Florian Zeitz [Sat, 12 Jan 2013 15:55:39 +0000 (16:55 +0100)]
util.http: New module for HTTP helper functions

11 years agomod_component: Make listener private (thanks Ge0rG)
Kim Alvefur [Thu, 17 Jan 2013 20:57:35 +0000 (21:57 +0100)]
mod_component: Make listener private (thanks Ge0rG)