prosody.git
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

11 years agotests/test_core_configmanager.lua: Update to remove tests based on sections (now...
Matthew Wild [Sat, 18 May 2013 16:17:56 +0000 (17:17 +0100)]
tests/test_core_configmanager.lua: Update to remove tests based on sections (now removed)

11 years agotests: Some much-needed cleanup...
Matthew Wild [Sat, 18 May 2013 16:14:30 +0000 (17:14 +0100)]
tests: Some much-needed cleanup...

11 years agoutil.ip: Add CIDR notation parsing and matching
Matthew Wild [Sat, 18 May 2013 15:45:29 +0000 (16:45 +0100)]
util.ip: Add CIDR notation parsing and matching

11 years agoMerge
Matthew Wild [Sat, 18 May 2013 14:29:31 +0000 (15:29 +0100)]
Merge

11 years agomod_muc: Pass actor (requesting JID) when generating the config form, and to the...
Matthew Wild [Sat, 18 May 2013 14:29:10 +0000 (15:29 +0100)]
mod_muc: Pass actor (requesting JID) when generating the config form, and to the muc-config-form event handler

11 years agomod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild [Sat, 18 May 2013 14:28:00 +0000 (15:28 +0100)]
mod_muc: Add getter/setter for 'whois' (fixes traceback)

11 years agoMerge 0.9->trunk
Kim Alvefur [Sat, 18 May 2013 11:20:46 +0000 (13:20 +0200)]
Merge 0.9->trunk

11 years agoMerge 0.9->trunk
Matthew Wild [Sat, 18 May 2013 11:03:03 +0000 (12:03 +0100)]
Merge 0.9->trunk

11 years agomod_admin_telnet: Use stanza:get_child_text()
Kim Alvefur [Fri, 17 May 2013 16:28:05 +0000 (18:28 +0200)]
mod_admin_telnet: Use stanza:get_child_text()

11 years agoprosodyctl: check dns: Use socket.local_addresses() if available
Matthew Wild [Fri, 17 May 2013 13:56:36 +0000 (14:56 +0100)]
prosodyctl: check dns: Use socket.local_addresses() if available

11 years agoprosodyctl: check dns: Whitespace fix in output
Matthew Wild [Fri, 17 May 2013 13:56:18 +0000 (14:56 +0100)]
prosodyctl: check dns: Whitespace fix in output

11 years agoprosodyctl: check dns: More concise output (merged separate v4/v6 warnings)
Matthew Wild [Fri, 17 May 2013 13:55:57 +0000 (14:55 +0100)]
prosodyctl: check dns: More concise output (merged separate v4/v6 warnings)

11 years agoprosodyctl: check dns: Correctly mark host as failed if expected SRV records are...
Matthew Wild [Fri, 17 May 2013 13:55:05 +0000 (14:55 +0100)]
prosodyctl: check dns: Correctly mark host as failed if expected SRV records are not found

11 years agoutil.ip: Add 'private' method/property to determine whether an IP address is generall...
Matthew Wild [Fri, 17 May 2013 13:53:51 +0000 (14:53 +0100)]
util.ip: Add 'private' method/property to determine whether an IP address is generally expected to be internet-routeable (YMMV)

11 years agoutil.ip: Automatically determine protocol of IP address if none specified. Return...
Matthew Wild [Fri, 17 May 2013 13:52:52 +0000 (14:52 +0100)]
util.ip: Automatically determine protocol of IP address if none specified. Return error if invalid.

11 years agomod_admin_telnet: List session flags (encryption, compression etc) the same way for...
Kim Alvefur [Fri, 17 May 2013 12:56:06 +0000 (14:56 +0200)]
mod_admin_telnet: List session flags (encryption, compression etc) the same way for c2s as s2s

11 years agoprosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server...
Matthew Wild [Fri, 17 May 2013 12:35:12 +0000 (13:35 +0100)]
prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records

11 years agoprosodyctl: Add 'check' command, which currently checks the config file for some...
Matthew Wild [Fri, 17 May 2013 08:01:11 +0000 (09:01 +0100)]
prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes

11 years agoutil.iterators: Small fix for variable scoping issue
Matthew Wild [Fri, 17 May 2013 07:42:21 +0000 (08:42 +0100)]
util.iterators: Small fix for variable scoping issue

11 years agoutil.iterators: Add filter() to run results through a filter function
Matthew Wild [Fri, 17 May 2013 07:31:03 +0000 (08:31 +0100)]
util.iterators: Add filter() to run results through a filter function

11 years agoutil.iterators: Various fixes and improvements, primarily use pack() where it should...
Matthew Wild [Fri, 17 May 2013 07:30:28 +0000 (08:30 +0100)]
util.iterators: Various fixes and improvements, primarily use pack() where it should be used.

11 years agomod_muc: Refactor config form handling, and allow for clients to submit incomplete...
Matthew Wild [Thu, 16 May 2013 13:17:25 +0000 (14:17 +0100)]
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246

11 years agomod_admin_telnet: Add server:memory() command to view details of Prosody's memory...
Matthew Wild [Thu, 16 May 2013 09:47:22 +0000 (10:47 +0100)]
mod_admin_telnet: Add server:memory() command to view details of Prosody's memory usage

11 years agomod_bosh: Remove Connection: keep-alive header (conflicts with new net.http.server)
Matthew Wild [Fri, 7 Jun 2013 16:47:49 +0000 (17:47 +0100)]
mod_bosh: Remove Connection: keep-alive header (conflicts with new net.http.server)

11 years agomod_bosh: Fix global write
Matthew Wild [Fri, 7 Jun 2013 16:47:27 +0000 (17:47 +0100)]
mod_bosh: Fix global write

11 years agomod_admin_telnet: Add server:memory() command to view details of Prosody's memory...
Matthew Wild [Thu, 16 May 2013 09:47:22 +0000 (10:47 +0100)]
mod_admin_telnet: Add server:memory() command to view details of Prosody's memory usage

11 years agoMerge 0.9->trunk
Matthew Wild [Tue, 14 May 2013 08:39:32 +0000 (09:39 +0100)]
Merge 0.9->trunk

11 years agomod_muc: Fire muc-room-created and muc-room-destroyed events (thanks nik)
Matthew Wild [Tue, 14 May 2013 08:38:54 +0000 (09:38 +0100)]
mod_muc: Fire muc-room-created and muc-room-destroyed events (thanks nik)

11 years agoutil.hashes: inttypes.h not available with MS Windows SDK, use MS specific __int32...
Waqas Hussain [Mon, 13 May 2013 19:52:01 +0000 (15:52 -0400)]
util.hashes: inttypes.h not available with MS Windows SDK, use MS specific __int32 instead.

11 years agoMerge merge merge merge
Matthew Wild [Sat, 11 May 2013 12:55:36 +0000 (13:55 +0100)]
Merge merge merge merge

11 years agoMerge 0.9->trunk
Matthew Wild [Sat, 11 May 2013 12:55:14 +0000 (13:55 +0100)]
Merge 0.9->trunk

11 years agoprosody.cfg.lua.dist: Fix my s2s_secure(_auth) mess
Matthew Wild [Sat, 11 May 2013 12:54:02 +0000 (13:54 +0100)]
prosody.cfg.lua.dist: Fix my s2s_secure(_auth) mess

11 years agoMerge 0.9->trunk
Kim Alvefur [Fri, 10 May 2013 20:31:20 +0000 (22:31 +0200)]
Merge 0.9->trunk

11 years agomod_c2s: Fix session:close() when a stanza is passed as reason
Kim Alvefur [Fri, 10 May 2013 20:29:03 +0000 (22:29 +0200)]
mod_c2s: Fix session:close() when a stanza is passed as reason