prosody.git
11 years agoMerge 0.9->trunk
Matthew Wild [Tue, 18 Jun 2013 11:17:06 +0000 (12:17 +0100)]
Merge 0.9->trunk

11 years agomod_s2s/s2sout.lib: Remove unused variables and imports
Matthew Wild [Tue, 18 Jun 2013 11:14:46 +0000 (12:14 +0100)]
mod_s2s/s2sout.lib: Remove unused variables and imports

11 years agomod_s2s/s2sout.lib: Remove reference to undefined global
Matthew Wild [Tue, 18 Jun 2013 11:12:49 +0000 (12:12 +0100)]
mod_s2s/s2sout.lib: Remove reference to undefined global

11 years agomod_s2s/s2sout.lib: Use new util.net.local_addresses() to fetch local interface addresses
Matthew Wild [Tue, 18 Jun 2013 11:12:12 +0000 (12:12 +0100)]
mod_s2s/s2sout.lib: Use new util.net.local_addresses() to fetch local interface addresses

11 years agomod_s2s/s2sout.lib: Only attempt to create an IPv6 socket if LuaSocket supports IPv6
Matthew Wild [Tue, 18 Jun 2013 11:11:40 +0000 (12:11 +0100)]
mod_s2s/s2sout.lib: Only attempt to create an IPv6 socket if LuaSocket supports IPv6

11 years agoutil.net: Add util.net, containing local_addresses() (removed from LuaSocket 3.0)
Matthew Wild [Tue, 18 Jun 2013 08:04:44 +0000 (09:04 +0100)]
util.net: Add util.net, containing local_addresses() (removed from LuaSocket 3.0)

11 years agomod_tls: Remove debug statement
Kim Alvefur [Sun, 16 Jun 2013 13:01:31 +0000 (15:01 +0200)]
mod_tls: Remove debug statement

11 years agoadditional fix for erlparse loading in ejabberd2prosody.lua
Vadim Misbakh-Soloviov [Fri, 14 Jun 2013 08:43:35 +0000 (15:43 +0700)]
additional fix for erlparse loading in ejabberd2prosody.lua

11 years agopackage{,c}path fixes for migration tools
Vadim Misbakh-Soloviov [Fri, 14 Jun 2013 08:15:05 +0000 (15:15 +0700)]
package{,c}path fixes for migration tools

11 years agoMerge the merge
Matthew Wild [Thu, 13 Jun 2013 22:24:36 +0000 (23:24 +0100)]
Merge the merge

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 13 Jun 2013 22:21:24 +0000 (23:21 +0100)]
Merge 0.9->trunk

11 years agoutil.dataforms: Return nil for empty list-mutli responses, to be consistent with...
Florian Zeitz [Thu, 13 Jun 2013 22:07:57 +0000 (00:07 +0200)]
util.dataforms: Return nil for empty list-mutli responses, to be consistent with other readers

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 13 Jun 2013 12:56:58 +0000 (13:56 +0100)]
Merge 0.9->trunk

11 years agomod_pep: When a client supplies no id on a published item, reflect our generated...
Florian Zeitz [Thu, 13 Jun 2013 12:56:35 +0000 (13:56 +0100)]
mod_pep: When a client supplies no id on a published item, reflect our generated id back to it

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 13 Jun 2013 11:07:46 +0000 (12:07 +0100)]
Merge 0.9->trunk

11 years agoMerge 0.9->trunk
Matthew Wild [Wed, 12 Jun 2013 23:46:29 +0000 (00:46 +0100)]
Merge 0.9->trunk

11 years agocertmanager: Add single_dh_use and single_ecdh_use to default options
Matthew Wild [Wed, 12 Jun 2013 23:45:41 +0000 (00:45 +0100)]
certmanager: Add single_dh_use and single_ecdh_use to default options

11 years agoMerge 0.9->trunk
Matthew Wild [Wed, 12 Jun 2013 23:09:56 +0000 (00:09 +0100)]
Merge 0.9->trunk

11 years agocertmanager: Set ssl.curve to 'secp384r1' by default, to enable ECC ciphers
Matthew Wild [Wed, 12 Jun 2013 23:04:04 +0000 (00:04 +0100)]
certmanager: Set ssl.curve to 'secp384r1' by default, to enable ECC ciphers

11 years agoutil.pubsub: Check whether node exists, when deleting
Florian Zeitz [Wed, 12 Jun 2013 14:53:51 +0000 (16:53 +0200)]
util.pubsub: Check whether node exists, when deleting

11 years agoMerge 0.9->trunk
Matthew Wild [Tue, 11 Jun 2013 20:50:41 +0000 (21:50 +0100)]
Merge 0.9->trunk

11 years agocertmanager: Use 'curve' and 'dhparam' options from ssl config if present
Matthew Wild [Tue, 11 Jun 2013 20:44:53 +0000 (21:44 +0100)]
certmanager: Use 'curve' and 'dhparam' options from ssl config if present

11 years agomod_c2s, mod_s2s: Fire an event on read timeouts
Kim Alvefur [Tue, 11 Jun 2013 19:36:15 +0000 (21:36 +0200)]
mod_c2s, mod_s2s: Fire an event on read timeouts

11 years agomod_c2s: Become a shared module and allow being disabled on some virtualhosts
Kim Alvefur [Tue, 11 Jun 2013 19:18:51 +0000 (21:18 +0200)]
mod_c2s: Become a shared module and allow being disabled on some virtualhosts

11 years agomod_bosh: Reduce a little code.
Waqas Hussain [Tue, 11 Jun 2013 16:55:47 +0000 (12:55 -0400)]
mod_bosh: Reduce a little code.

11 years agoMerge 0.9->trunk
Kim Alvefur [Mon, 10 Jun 2013 12:37:02 +0000 (14:37 +0200)]
Merge 0.9->trunk

11 years agomod_admin_telnet: Fix another wrong boolean expression
Kim Alvefur [Mon, 10 Jun 2013 12:35:35 +0000 (14:35 +0200)]
mod_admin_telnet: Fix another wrong boolean expression

11 years agoMerge 0.9->trunk
Kim Alvefur [Sun, 9 Jun 2013 15:03:15 +0000 (17:03 +0200)]
Merge 0.9->trunk

11 years agonet.server_select: Make sure there is a server to pause when hitting maxfd (Thanks...
Kim Alvefur [Sun, 9 Jun 2013 15:00:26 +0000 (17:00 +0200)]
net.server_select: Make sure there is a server to pause when hitting maxfd (Thanks elghinn)

11 years agomod_admin_telnet: Simplify IPv6 detection, fixes rare traceback
Kim Alvefur [Sun, 9 Jun 2013 10:59:23 +0000 (12:59 +0200)]
mod_admin_telnet: Simplify IPv6 detection, fixes rare traceback

11 years agomod_s2s: Set s2s_session.ip
Kim Alvefur [Sun, 9 Jun 2013 10:54:10 +0000 (12:54 +0200)]
mod_s2s: Set s2s_session.ip

11 years agomod_bosh: Make waiting_requests and dead_sessions shared to preserve across reloads
Matthew Wild [Sat, 8 Jun 2013 17:08:18 +0000 (18:08 +0100)]
mod_bosh: Make waiting_requests and dead_sessions shared to preserve across reloads

11 years agomod_muc: Include status code 332 on service shutdown (thanks mathieui)
Matthew Wild [Sat, 8 Jun 2013 17:07:36 +0000 (18:07 +0100)]
mod_muc: Include status code 332 on service shutdown (thanks mathieui)

11 years agomod_bosh: Don't tostring() stream:features when passing to session.send().
Waqas Hussain [Fri, 7 Jun 2013 20:26:08 +0000 (16:26 -0400)]
mod_bosh: Don't tostring() stream:features when passing to session.send().

11 years agoprosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates
Kim Alvefur [Fri, 7 Jun 2013 18:59:43 +0000 (20:59 +0200)]
prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates

11 years agocertmanager: Complain if key or certificate is missing from SSL config.
Kim Alvefur [Fri, 7 Jun 2013 18:55:02 +0000 (20:55 +0200)]
certmanager: Complain if key or certificate is missing from SSL config.

11 years agoprosodyctl: Add 'prosodyctl check --help'
Kim Alvefur [Fri, 7 Jun 2013 18:05:23 +0000 (20:05 +0200)]
prosodyctl: Add 'prosodyctl check --help'

11 years agomod_bosh: Only return CORS headers if the Origin header is received, and CORS is...
Waqas Hussain [Fri, 7 Jun 2013 18:20:13 +0000 (14:20 -0400)]
mod_bosh: Only return CORS headers if the Origin header is received, and CORS is enabled.

11 years agomod_bosh: Return empty string from the OPTIONS event handler, don't return the respon...
Waqas Hussain [Fri, 7 Jun 2013 17:24:56 +0000 (13:24 -0400)]
mod_bosh: Return empty string from the OPTIONS event handler, don't return the response object itself.

11 years agomod_bosh: Rename event handler argument to event, not request.
Waqas Hussain [Fri, 7 Jun 2013 17:21:38 +0000 (13:21 -0400)]
mod_bosh: Rename event handler argument to event, not request.

11 years agoMerge 0.9->trunk
Matthew Wild [Fri, 7 Jun 2013 12:23:04 +0000 (13:23 +0100)]
Merge 0.9->trunk

11 years agomod_bosh: Remove logging of request.id, it doesn't exist in the new HTTP server API...
Matthew Wild [Fri, 7 Jun 2013 12:22:13 +0000 (13:22 +0100)]
mod_bosh: Remove logging of request.id, it doesn't exist in the new HTTP server API (thanks Mikael Nordfeldth)

11 years agomod_bosh: Remove another place we set headers, fixes #348
Matthew Wild [Thu, 6 Jun 2013 13:48:41 +0000 (14:48 +0100)]
mod_bosh: Remove another place we set headers, fixes #348

11 years agomod_bosh: Clean up handling of response headers, set them only in one place
Matthew Wild [Wed, 5 Jun 2013 20:41:27 +0000 (21:41 +0100)]
mod_bosh: Clean up handling of response headers, set them only in one place

11 years agomod_bosh: Return errors when appropriate (invalid XML, missing sid)
Matthew Wild [Wed, 5 Jun 2013 20:39:56 +0000 (21:39 +0100)]
mod_bosh: Return errors when appropriate (invalid XML, missing sid)

11 years agomod_bosh: Remove some very verbose logging
Matthew Wild [Wed, 5 Jun 2013 20:37:33 +0000 (21:37 +0100)]
mod_bosh: Remove some very verbose logging

11 years agoMerge 0.9->trunk
Matthew Wild [Wed, 5 Jun 2013 20:36:29 +0000 (21:36 +0100)]
Merge 0.9->trunk

11 years agomod_bosh: Reset creating_session to prevent putting unnecessary attributes into every...
Matthew Wild [Wed, 5 Jun 2013 20:35:50 +0000 (21:35 +0100)]
mod_bosh: Reset creating_session to prevent putting unnecessary attributes into every BOSH response

11 years agomod_muc: Add Ad-Hoc command to destroy MUC rooms
Florian Zeitz [Tue, 4 Jun 2013 22:05:03 +0000 (00:05 +0200)]
mod_muc: Add Ad-Hoc command to destroy MUC rooms

11 years agomod_muc: Utilize mod_disco, instead of reimplementing disco handling
Florian Zeitz [Tue, 4 Jun 2013 22:04:44 +0000 (00:04 +0200)]
mod_muc: Utilize mod_disco, instead of reimplementing disco handling

11 years agomod_pubsub: Utilize mod_disco, instead of reimplementing disco handling
Florian Zeitz [Tue, 4 Jun 2013 22:01:17 +0000 (00:01 +0200)]
mod_pubsub: Utilize mod_disco, instead of reimplementing disco handling

11 years agomod_disco: Allow ansering disco requests including nodes, and adding custom items...
Florian Zeitz [Tue, 4 Jun 2013 21:59:59 +0000 (23:59 +0200)]
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests

11 years agomod_http_files: Put the MIME type map in a global shared table
Kim Alvefur [Thu, 13 Jun 2013 21:31:11 +0000 (23:31 +0200)]
mod_http_files: Put the MIME type map in a global shared table

11 years agoutil.sasl.external: Add SASL EXTERNAL mechanism
Kim Alvefur [Thu, 13 Jun 2013 16:20:49 +0000 (18:20 +0200)]
util.sasl.external: Add SASL EXTERNAL mechanism

11 years agoprosody: Remove global ssl context, no longer used
Kim Alvefur [Thu, 13 Jun 2013 15:48:09 +0000 (17:48 +0200)]
prosody: Remove global ssl context, no longer used

11 years agomod_tls: Refactor to allow separate SSL configuration for c2s and s2s connections
Kim Alvefur [Thu, 13 Jun 2013 15:47:45 +0000 (17:47 +0200)]
mod_tls: Refactor to allow separate SSL configuration for c2s and s2s connections

11 years agocertmanager: Overhaul of how ssl configs are built.
Kim Alvefur [Thu, 13 Jun 2013 15:44:42 +0000 (17:44 +0200)]
certmanager: Overhaul of how ssl configs are built.

11 years agomod_admin_telnet: Fix inverted boolean logic
Kim Alvefur [Tue, 4 Jun 2013 17:35:41 +0000 (19:35 +0200)]
mod_admin_telnet: Fix inverted boolean logic

11 years agoconfigure: Fix poor layout
James Callahan [Mon, 3 Jun 2013 16:50:37 +0000 (12:50 -0400)]
configure: Fix poor layout

11 years agonet.server_select: Ensure _maxfd = math.huge on Windows, always.
Waqas Hussain [Sun, 2 Jun 2013 20:23:19 +0000 (16:23 -0400)]
net.server_select: Ensure _maxfd = math.huge on Windows, always.

11 years agoMerge 0.9->trunk
Kim Alvefur [Sun, 2 Jun 2013 17:27:45 +0000 (19:27 +0200)]
Merge 0.9->trunk

11 years agomod_bosh: Fix traceback in case session is destroyed during the stream-features event...
Kim Alvefur [Sun, 2 Jun 2013 17:25:53 +0000 (19:25 +0200)]
mod_bosh: Fix traceback in case session is destroyed during the stream-features event (thanks Biszkopcik)

11 years agomod_c2s, mod_c2s: Send a whitespace on read timeout, to prod TCP into detecting if...
Kim Alvefur [Thu, 30 May 2013 12:32:40 +0000 (14:32 +0200)]
mod_c2s, mod_c2s: Send a whitespace on read timeout, to prod TCP into detecting if the connection died

11 years agomod_register: get_child_text()!
Kim Alvefur [Tue, 28 May 2013 16:32:51 +0000 (18:32 +0200)]
mod_register: get_child_text()!

11 years agomod_s2s: Remove unnecessary debug message
Matthew Wild [Tue, 28 May 2013 15:10:22 +0000 (16:10 +0100)]
mod_s2s: Remove unnecessary debug message

11 years agomod_admin_telnet: Make the muc:create() command complain if the room already exists
Kim Alvefur [Sun, 26 May 2013 20:58:13 +0000 (22:58 +0200)]
mod_admin_telnet: Make the muc:create() command complain if the room already exists

11 years agoutil.pubsub: Fix get_subscriptions to not pass a boolean as node name (thanks jonas)
Kim Alvefur [Sun, 26 May 2013 14:01:09 +0000 (16:01 +0200)]
util.pubsub: Fix get_subscriptions to not pass a boolean as node name (thanks jonas)

11 years agomod_bosh: rename variable for clarity
Matthew Wild [Fri, 24 May 2013 17:38:36 +0000 (18:38 +0100)]
mod_bosh: rename variable for clarity

11 years agomod_bosh: Some very minor whitespace/layout fixes
Matthew Wild [Fri, 24 May 2013 17:37:07 +0000 (18:37 +0100)]
mod_bosh: Some very minor whitespace/layout fixes

11 years agonet.server_select: Default checkinterval to 30s, so that read timeouts are actually...
Matthew Wild [Fri, 24 May 2013 17:33:16 +0000 (18:33 +0100)]
net.server_select: Default checkinterval to 30s, so that read timeouts are actually detected

11 years agonet.server_select: Support for listener.onreadtimeout() [see also e67891ad18d6]
Matthew Wild [Fri, 24 May 2013 17:14:09 +0000 (18:14 +0100)]
net.server_select: Support for listener.onreadtimeout() [see also e67891ad18d6]

11 years agoMerge 0.9->trunk
Kim Alvefur [Sun, 26 May 2013 20:59:06 +0000 (22:59 +0200)]
Merge 0.9->trunk

11 years agoMerge 0.9->trunk
Kim Alvefur [Sun, 26 May 2013 14:02:01 +0000 (16:02 +0200)]
Merge 0.9->trunk

11 years agocertmanager: Disable SSL compression if possible (LuaSec 0.5 or 0.4.1+OpenSSL 1.x)
Matthew Wild [Wed, 22 May 2013 13:32:02 +0000 (14:32 +0100)]
certmanager: Disable SSL compression if possible (LuaSec 0.5 or 0.4.1+OpenSSL 1.x)

11 years agomod_muc: Fix incorrect variable name
Matthew Wild [Tue, 21 May 2013 09:10:28 +0000 (10:10 +0100)]
mod_muc: Fix incorrect variable name

11 years agomod_admin_telnet: Verify that the host exists in user commands (Thanks SkyBlue)
Kim Alvefur [Sat, 18 May 2013 11:19:31 +0000 (13:19 +0200)]
mod_admin_telnet: Verify that the host exists in user commands (Thanks SkyBlue)

11 years agoutil.ip: Convert IPv4 mapped addresses to hex.
Kim Alvefur [Sat, 18 May 2013 11:14:19 +0000 (13:14 +0200)]
util.ip: Convert IPv4 mapped addresses to hex.

11 years agomod_admin_telnet: Don't rely on getpeerchain returning an empty list
Kim Alvefur [Sat, 18 May 2013 11:11:44 +0000 (13:11 +0200)]
mod_admin_telnet: Don't rely on getpeerchain returning an empty list

11 years agomod_s2s: Fix interaction between s2s_secure_auth and s2s_require_encryption, in parti...
Matthew Wild [Sat, 18 May 2013 11:02:25 +0000 (12:02 +0100)]
mod_s2s: Fix interaction between s2s_secure_auth and s2s_require_encryption, in particular ensure that when s2s_require_encryption is NOT set, do not require encryption on s2s_insecure_domains.

11 years agomod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz [Fri, 17 May 2013 16:35:50 +0000 (18:35 +0200)]
mod_disco: Emit events for disco requests, which contain a node, on user accounts

11 years agomod_pubsub: Split out handlers into a module library
Florian Zeitz [Fri, 17 May 2013 16:33:32 +0000 (18:33 +0200)]
mod_pubsub: Split out handlers into a module library

11 years agonet.server_event: Add support for listener.onreadtimeout(conn), which can return...
Matthew Wild [Fri, 24 May 2013 13:46:16 +0000 (14:46 +0100)]
net.server_event: Add support for listener.onreadtimeout(conn), which can return true to prevent the connection from being closed when a read timeout occurs

11 years agoprosody.cfg.lua: Remove some more sneaky ';' characters from the config
Matthew Wild [Fri, 24 May 2013 12:59:59 +0000 (13:59 +0100)]
prosody.cfg.lua: Remove some more sneaky ';' characters from the config

11 years agoprosody.cfg.lua.dist: Remove unnecessary ';' from default config (thanks Vincent)
Matthew Wild [Fri, 24 May 2013 12:55:28 +0000 (13:55 +0100)]
prosody.cfg.lua.dist: Remove unnecessary ';' from default config (thanks Vincent)

11 years agoMerge 0.9->trunk
Matthew Wild [Wed, 22 May 2013 13:33:18 +0000 (14:33 +0100)]
Merge 0.9->trunk

11 years agoprosodyctl: check dns: Add check that proxy65 addresses resolve correctly
Matthew Wild [Wed, 22 May 2013 12:33:33 +0000 (13:33 +0100)]
prosodyctl: check dns: Add check that proxy65 addresses resolve correctly

11 years agoprosodyctl: check config: Fix check for whether host is a component
Matthew Wild [Wed, 22 May 2013 12:32:38 +0000 (13:32 +0100)]
prosodyctl: check config: Fix check for whether host is a component

11 years agomod_muc: Remove some old TODO comments
Matthew Wild [Tue, 21 May 2013 12:21:30 +0000 (13:21 +0100)]
mod_muc: Remove some old TODO comments

11 years agoprosodyctl: check config: whitespace fix
Matthew Wild [Tue, 21 May 2013 12:21:12 +0000 (13:21 +0100)]
prosodyctl: check config: whitespace fix

11 years agoprosodyctl: check config: Show a suggestion to change hosts that begin with jabber...
Matthew Wild [Tue, 21 May 2013 12:18:56 +0000 (13:18 +0100)]
prosodyctl: check config: Show a suggestion to change hosts that begin with jabber/xmpp/chat/im subdomains, and link to DNS documentation

11 years agoprosody.cfg.lua.dist: Suggest 'prosodyctl check config' instead of 'luac -p'
Matthew Wild [Tue, 21 May 2013 11:58:57 +0000 (12:58 +0100)]
prosody.cfg.lua.dist: Suggest 'prosodyctl check config' instead of 'luac -p'

11 years agomod_muc: Fix incorrect variable name
Matthew Wild [Tue, 21 May 2013 09:10:28 +0000 (10:10 +0100)]
mod_muc: Fix incorrect variable name

11 years agomod_muc: Remove unused variable
Matthew Wild [Tue, 21 May 2013 09:10:09 +0000 (10:10 +0100)]
mod_muc: Remove unused variable

11 years agomod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions...
Matthew Wild [Tue, 21 May 2013 08:57:36 +0000 (09:57 +0100)]
mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions!

11 years agomod_muc: Replace getText() with get_child_text(), 1 insertion, 12 deletions!
Matthew Wild [Tue, 21 May 2013 08:48:59 +0000 (09:48 +0100)]
mod_muc: Replace getText() with get_child_text(), 1 insertion, 12 deletions!

11 years agoprosodyctl: Use jid.split() to parse parameter to adduser/deluser/passwd
Matthew Wild [Mon, 20 May 2013 14:33:57 +0000 (15:33 +0100)]
prosodyctl: Use jid.split() to parse parameter to adduser/deluser/passwd

11 years agotest_util_rfc6724: Update with new test vectors from RFC 6724
Florian Zeitz [Sun, 19 May 2013 22:28:02 +0000 (00:28 +0200)]
test_util_rfc6724: Update with new test vectors from RFC 6724

11 years agoutil.ip: Fix protocol detection of IPv6 addresses beginning with :
Matthew Wild [Sat, 18 May 2013 20:41:17 +0000 (21:41 +0100)]
util.ip: Fix protocol detection of IPv6 addresses beginning with :

11 years agotest_util_ip.lua: Add more tests for util.ip
Matthew Wild [Sat, 18 May 2013 20:40:40 +0000 (21:40 +0100)]
test_util_ip.lua: Add more tests for util.ip

11 years agotest_util_ip: Add tests for IP matching
Matthew Wild [Sat, 18 May 2013 16:44:01 +0000 (17:44 +0100)]
test_util_ip: Add tests for IP matching