prosody.git
9 years agoMerge 0.9->0.10
Kim Alvefur [Fri, 4 Jul 2014 13:54:37 +0000 (15:54 +0200)]
Merge 0.9->0.10

9 years agomod_register: get_child_text! (thanks Lloyd)
Kim Alvefur [Thu, 3 Jul 2014 15:53:24 +0000 (17:53 +0200)]
mod_register: get_child_text! (thanks Lloyd)

9 years agomod_tls: Simplify and use new ssl config merging in certmanager
Kim Alvefur [Thu, 3 Jul 2014 13:35:45 +0000 (15:35 +0200)]
mod_tls: Simplify and use new ssl config merging in certmanager

9 years agocore.portmanager: Simplify and take advantage of new ssl config merging in certmanager
Kim Alvefur [Thu, 3 Jul 2014 13:33:11 +0000 (15:33 +0200)]
core.portmanager: Simplify and take advantage of new ssl config merging in certmanager

9 years agocore.certmanager: Make create_context() support an arbitrary number of option sets...
Kim Alvefur [Thu, 3 Jul 2014 13:32:26 +0000 (15:32 +0200)]
core.certmanager: Make create_context() support an arbitrary number of option sets, merging all

9 years agocore.certmanager: Use util.sslconfig
Kim Alvefur [Thu, 3 Jul 2014 13:31:12 +0000 (15:31 +0200)]
core.certmanager: Use util.sslconfig

9 years agoutil.sslconfig: Add lib to deal with LuaSec SSL context configs
Kim Alvefur [Thu, 3 Jul 2014 13:27:49 +0000 (15:27 +0200)]
util.sslconfig: Add lib to deal with LuaSec SSL context configs

9 years agomod_presence: Move presence/initial event to correct place so it actually fires
Kim Alvefur [Thu, 3 Jul 2014 09:54:50 +0000 (11:54 +0200)]
mod_presence: Move presence/initial event to correct place so it actually fires

9 years agoMerge 0.9->0.10
Kim Alvefur [Mon, 30 Jun 2014 11:11:01 +0000 (13:11 +0200)]
Merge 0.9->0.10

9 years agonet.dns: Fix duplicated cache insertions by limiting outstanding queries per name...
Kim Alvefur [Mon, 30 Jun 2014 10:45:53 +0000 (12:45 +0200)]
net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one

9 years agonet.adns: Add missing local declaration
Kim Alvefur [Wed, 25 Jun 2014 13:33:49 +0000 (15:33 +0200)]
net.adns: Add missing local declaration

9 years agoMerge 0.9->0.10
Kim Alvefur [Sat, 21 Jun 2014 13:05:21 +0000 (15:05 +0200)]
Merge 0.9->0.10

9 years agomod_storage_{none,internal,sql}: Return error for unsupported (everything but keyval...
Kim Alvefur [Fri, 20 Jun 2014 14:22:23 +0000 (16:22 +0200)]
mod_storage_{none,internal,sql}: Return error for unsupported (everything but keyval) store types

9 years agomod_storage_sql2: Don't ignore failure in keyval_store:get() (thanks daurnimator)
Kim Alvefur [Fri, 20 Jun 2014 14:16:33 +0000 (16:16 +0200)]
mod_storage_sql2: Don't ignore failure in keyval_store:get() (thanks daurnimator)

9 years agomod_presence: Fire a presence/initial event on initial presence
Kim Alvefur [Fri, 20 Jun 2014 14:10:04 +0000 (16:10 +0200)]
mod_presence: Fire a presence/initial event on initial presence

9 years agotools/ejabberd2prosody.lua: Fix JID building, node-less jids became @hostname in...
Kim Alvefur [Tue, 17 Jun 2014 09:01:51 +0000 (11:01 +0200)]
tools/ejabberd2prosody.lua: Fix JID building, node-less jids became @hostname in some cases

10 years agomod_admin_telnet: Add command to list MUC rooms
Matthew Wild [Wed, 28 May 2014 11:43:34 +0000 (12:43 +0100)]
mod_admin_telnet: Add command to list MUC rooms

10 years agomod_s2s: Fire a 's2s-created' event when new s2s connections are initialized
Kim Alvefur [Sat, 24 May 2014 09:17:26 +0000 (11:17 +0200)]
mod_s2s: Fire a 's2s-created' event when new s2s connections are initialized

10 years agomod_s2s: Remove redundant setting of session.direction
Kim Alvefur [Thu, 22 May 2014 20:49:43 +0000 (22:49 +0200)]
mod_s2s: Remove redundant setting of session.direction

10 years agomod_s2s: Move filter initialization to common place
Kim Alvefur [Thu, 22 May 2014 20:48:06 +0000 (22:48 +0200)]
mod_s2s: Move filter initialization to common place

10 years agomod_s2s: Decide on log function once
Kim Alvefur [Thu, 22 May 2014 20:45:58 +0000 (22:45 +0200)]
mod_s2s: Decide on log function once

10 years agomod_admin_telnet: Remove dead code
Kim Alvefur [Sun, 11 May 2014 23:16:17 +0000 (01:16 +0200)]
mod_admin_telnet: Remove dead code

10 years agomod_admin_telnet: Show which hosts are components and what type of component in host...
Kim Alvefur [Sun, 11 May 2014 23:07:40 +0000 (01:07 +0200)]
mod_admin_telnet: Show which hosts are components and what type of component in host:list()

10 years agomod_admin_telnet: Add c2s:show_tls(), behaves like s2s:show_tls()
Kim Alvefur [Sun, 11 May 2014 17:13:36 +0000 (19:13 +0200)]
mod_admin_telnet: Add c2s:show_tls(), behaves like s2s:show_tls()

10 years agomod_admin_telnet: Move generation of log tag for s2s:show() (adds it to c2s:show...
Kim Alvefur [Sun, 11 May 2014 17:12:03 +0000 (19:12 +0200)]
mod_admin_telnet: Move generation of log tag for s2s:show() (adds it to c2s:show() too)

10 years agomod_admin_telnet: Add s2s:show_tls() for showing ciphers used on s2s connections
Kim Alvefur [Sun, 11 May 2014 16:51:08 +0000 (18:51 +0200)]
mod_admin_telnet: Add s2s:show_tls() for showing ciphers used on s2s connections

10 years agomod_admin_telnet: Move extraction of c2s presence info into session_flags()
Kim Alvefur [Sun, 11 May 2014 17:03:23 +0000 (19:03 +0200)]
mod_admin_telnet: Move extraction of c2s presence info into session_flags()

10 years agomod_admin_telnet: Split (secure) into (authenticated) + (secure)
Kim Alvefur [Sun, 11 May 2014 16:28:00 +0000 (18:28 +0200)]
mod_admin_telnet: Split (secure) into (authenticated) + (secure)

10 years agomod_admin_telnet: Send NUL byte as keepalive on read timeouts
Kim Alvefur [Sun, 11 May 2014 16:22:17 +0000 (18:22 +0200)]
mod_admin_telnet: Send NUL byte as keepalive on read timeouts

10 years agomod_c2s: Fix traceback if c2s stream sent to component
Kim Alvefur [Sat, 10 May 2014 00:12:51 +0000 (02:12 +0200)]
mod_c2s: Fix traceback if c2s stream sent to component

10 years agoMerge 0.9->0.10
Kim Alvefur [Fri, 9 May 2014 21:28:09 +0000 (23:28 +0200)]
Merge 0.9->0.10

10 years agoconfigmanager: Delay importing LuaFileSystem until needed by an Include line
Kim Alvefur [Fri, 9 May 2014 17:59:49 +0000 (19:59 +0200)]
configmanager: Delay importing LuaFileSystem until needed by an Include line

10 years agocore.certmanager, core.moduleapi, mod_storage_sql, mod_storage_sql2: Import from...
Kim Alvefur [Fri, 9 May 2014 17:35:29 +0000 (19:35 +0200)]
core.certmanager, core.moduleapi, mod_storage_sql, mod_storage_sql2: Import from util.paths

10 years agocore.configmanager: Move path utility functions into util.paths
Kim Alvefur [Fri, 9 May 2014 17:34:35 +0000 (19:34 +0200)]
core.configmanager: Move path utility functions into util.paths

10 years agoprosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined
Kim Alvefur [Fri, 2 May 2014 06:56:03 +0000 (08:56 +0200)]
prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined

10 years agoprosodyctl: Use correct variable in check certs
Kim Alvefur [Fri, 2 May 2014 06:27:29 +0000 (08:27 +0200)]
prosodyctl: Use correct variable in check certs

10 years agoprosodyctl: Check for deprecated config options
Kim Alvefur [Fri, 2 May 2014 06:21:56 +0000 (08:21 +0200)]
prosodyctl: Check for deprecated config options

10 years agoprosodyctl: Add check that points out any disabled hosts
Kim Alvefur [Fri, 2 May 2014 06:16:26 +0000 (08:16 +0200)]
prosodyctl: Add check that points out any disabled hosts

10 years agoprosodyctl: Only perform checks on enabled hosts
Kim Alvefur [Fri, 2 May 2014 06:11:11 +0000 (08:11 +0200)]
prosodyctl: Only perform checks on enabled hosts

10 years agoMerge 0.9->0.10
Kim Alvefur [Sat, 26 Apr 2014 23:02:20 +0000 (01:02 +0200)]
Merge 0.9->0.10

10 years agoutil.x509: Remove unused imports
Kim Alvefur [Fri, 25 Apr 2014 00:47:09 +0000 (02:47 +0200)]
util.x509: Remove unused imports

10 years agoutil.pposix: Fix error reporting from really old Linux fallocate() that did not use...
Kim Alvefur [Fri, 25 Apr 2014 00:41:55 +0000 (02:41 +0200)]
util.pposix: Fix error reporting from really old Linux fallocate() that did not use errno for some reason (thanks pro)

10 years agoutil.pposix: Fix error reporting from posix_fallocate, it doesn't use errno (thanks...
Kim Alvefur [Thu, 24 Apr 2014 22:36:01 +0000 (00:36 +0200)]
util.pposix: Fix error reporting from posix_fallocate, it doesn't use errno (thanks pro)

10 years agoutil.x509: And functions for converting between DER and PEM
Kim Alvefur [Thu, 24 Apr 2014 21:38:47 +0000 (23:38 +0200)]
util.x509: And functions for converting between DER and PEM

10 years agoMerge 0.9->0.10
Kim Alvefur [Tue, 22 Apr 2014 22:22:36 +0000 (00:22 +0200)]
Merge 0.9->0.10

10 years agoutil.dataforms: Add support for XEP-0221: Data Forms Media Element
Kim Alvefur [Tue, 22 Apr 2014 21:36:26 +0000 (23:36 +0200)]
util.dataforms: Add support for XEP-0221: Data Forms Media Element

10 years agotools/jabberd14sql2prosody: Fix package.path (thanks daurnimator)
Kim Alvefur [Tue, 22 Apr 2014 21:14:53 +0000 (23:14 +0200)]
tools/jabberd14sql2prosody: Fix package.path (thanks daurnimator)

10 years agomod_s2s: Follow XMPP Core on when a stream is to be considered ready
Kim Alvefur [Tue, 22 Apr 2014 19:56:06 +0000 (21:56 +0200)]
mod_s2s: Follow XMPP Core on when a stream is to be considered ready

10 years agocertmanager: Move ssl.protocol handling to after ssl.options is a table (thanks Ralph)
Kim Alvefur [Mon, 21 Apr 2014 00:43:09 +0000 (02:43 +0200)]
certmanager: Move ssl.protocol handling to after ssl.options is a table (thanks Ralph)

10 years agocertmanager: Fix traceback if no global 'ssl' section set (thanks albert)
Kim Alvefur [Sun, 20 Apr 2014 19:25:26 +0000 (21:25 +0200)]
certmanager: Fix traceback if no global 'ssl' section set (thanks albert)

10 years agomod_http: Update to disable peer verification with the new certmanager
Kim Alvefur [Sat, 19 Apr 2014 19:59:53 +0000 (21:59 +0200)]
mod_http: Update to disable peer verification with the new certmanager

10 years agomod_s2s: Replace open_stream() with function that only adds s2s/dialback attributes...
Kim Alvefur [Fri, 18 Apr 2014 05:51:41 +0000 (07:51 +0200)]
mod_s2s: Replace open_stream() with function that only adds s2s/dialback attributes to stream header

10 years agoutil.xmppstream: Check for callback that may add stream header attributes
Kim Alvefur [Fri, 18 Apr 2014 05:50:44 +0000 (07:50 +0200)]
util.xmppstream: Check for callback that may add stream header attributes

10 years agonet.http.server: Fix some typos introduced in 420c0d3b8583.
Daurnimator [Tue, 15 Apr 2014 18:51:49 +0000 (14:51 -0400)]
net.http.server: Fix some typos introduced in 420c0d3b8583.

10 years agocertmanager: Update ssl_compression when config is reloaded
Kim Alvefur [Mon, 14 Apr 2014 23:02:56 +0000 (01:02 +0200)]
certmanager: Update ssl_compression when config is reloaded

10 years agocertmanager: Reformat core ssl defaults
Kim Alvefur [Mon, 14 Apr 2014 22:49:17 +0000 (00:49 +0200)]
certmanager: Reformat core ssl defaults

10 years agocertmanager: Support ssl.protocol syntax like "tlsv1+" that disables older protocols
Kim Alvefur [Mon, 14 Apr 2014 22:45:07 +0000 (00:45 +0200)]
certmanager: Support ssl.protocol syntax like "tlsv1+" that disables older protocols

10 years agocertmanager: Merge ssl.options, verify etc from core defaults and global ssl settings...
Kim Alvefur [Mon, 14 Apr 2014 22:32:11 +0000 (00:32 +0200)]
certmanager: Merge ssl.options, verify etc from core defaults and global ssl settings with inheritance while allowing options to be disabled per virtualhost

10 years agocertmanager: Wrap long line and add comment
Kim Alvefur [Mon, 14 Apr 2014 21:41:26 +0000 (23:41 +0200)]
certmanager: Wrap long line and add comment

10 years agocertmanager: Concatenate cipher list if given as a table
Kim Alvefur [Mon, 14 Apr 2014 21:34:35 +0000 (23:34 +0200)]
certmanager: Concatenate cipher list if given as a table

10 years agocertmanager: Allow non-server contexts to be without certificate and key
Kim Alvefur [Mon, 14 Apr 2014 21:09:28 +0000 (23:09 +0200)]
certmanager: Allow non-server contexts to be without certificate and key

10 years agocertmanager: Check for non-nil values instead of true-ish values, allows removing...
Kim Alvefur [Mon, 14 Apr 2014 21:00:44 +0000 (23:00 +0200)]
certmanager: Check for non-nil values instead of true-ish values, allows removing defaults

10 years agonet.http.server: Add prepare_header() and finish_response() to allow sending chunked...
Daurnimator [Tue, 15 Apr 2014 17:07:45 +0000 (18:07 +0100)]
net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API

10 years agomod_s2s: Revert e626ee2fe106 change, it broke Dialback
Kim Alvefur [Thu, 10 Apr 2014 14:49:59 +0000 (16:49 +0200)]
mod_s2s: Revert e626ee2fe106 change, it broke Dialback

10 years agoMerge 0.9->0.10
Kim Alvefur [Thu, 10 Apr 2014 11:15:11 +0000 (13:15 +0200)]
Merge 0.9->0.10

10 years agomod_c2s, mod_s2s, mod_component, util.xmppstream: Move all session:open_stream()...
Kim Alvefur [Thu, 10 Apr 2014 11:13:07 +0000 (13:13 +0200)]
mod_c2s, mod_s2s, mod_component, util.xmppstream: Move all session:open_stream() functions to util.xmppstream

10 years agoprosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default...
Kim Alvefur [Wed, 9 Apr 2014 22:24:29 +0000 (00:24 +0200)]
prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms

10 years agomod_posix: Remove compat code for 0.5
Kim Alvefur [Wed, 9 Apr 2014 22:23:35 +0000 (00:23 +0200)]
mod_posix: Remove compat code for 0.5

10 years agoprosody: Check dependencies later in the startup sequence
Kim Alvefur [Wed, 9 Apr 2014 18:46:39 +0000 (20:46 +0200)]
prosody: Check dependencies later in the startup sequence

10 years agoutil.dependencies: Check for Lua 5.1. We don't currently support any other versions...
Waqas Hussain [Wed, 9 Apr 2014 18:01:02 +0000 (14:01 -0400)]
util.dependencies: Check for Lua 5.1. We don't currently support any other versions. LuaJIT identifies as 5.1.

10 years agomod_storage_sql2: Build counter query without ORDER BY clause
Kim Alvefur [Tue, 8 Apr 2014 17:23:11 +0000 (19:23 +0200)]
mod_storage_sql2: Build counter query without ORDER BY clause

10 years agomod_admin_telnet: muc:*: Fix nil index error when a room JID is passed with a non...
Matthew Wild [Sat, 5 Apr 2014 14:05:40 +0000 (15:05 +0100)]
mod_admin_telnet: muc:*: Fix nil index error when a room JID is passed with a non-existent host

10 years agomod_compression: Only iterate over correctly named and namespaced child tags of compr...
Kim Alvefur [Thu, 3 Apr 2014 21:48:12 +0000 (23:48 +0200)]
mod_compression: Only iterate over correctly named and namespaced child tags of compression feature

10 years agomod_compression: Use get_child() and get_child_text()
Kim Alvefur [Thu, 3 Apr 2014 21:40:20 +0000 (23:40 +0200)]
mod_compression: Use get_child() and get_child_text()

10 years agomod_compression: Remove checks for impossible conditions
Kim Alvefur [Thu, 3 Apr 2014 21:33:38 +0000 (23:33 +0200)]
mod_compression: Remove checks for impossible conditions

10 years agoMerge 0.9->0.10
Matthew Wild [Wed, 2 Apr 2014 16:41:38 +0000 (17:41 +0100)]
Merge 0.9->0.10

10 years agoutil.xmppstream: Also disable CharacterData merging after stream restarts
Matthew Wild [Wed, 2 Apr 2014 13:31:19 +0000 (14:31 +0100)]
util.xmppstream: Also disable CharacterData merging after stream restarts

10 years agoutil.xmppstream: Disable LuaExpat's buffering (if possible)
Matthew Wild [Wed, 2 Apr 2014 10:05:41 +0000 (11:05 +0100)]
util.xmppstream: Disable LuaExpat's buffering (if possible)

10 years agoTagging 0.9.4
Matthew Wild [Tue, 1 Apr 2014 15:50:15 +0000 (16:50 +0100)]
Tagging 0.9.4

10 years agoMerge
Matthew Wild [Tue, 1 Apr 2014 15:03:21 +0000 (16:03 +0100)]
Merge

10 years agoMUC: Fixed traceback when a JID not in a room requested a role change for an occupant.
Waqas Hussain [Tue, 1 Apr 2014 14:02:58 +0000 (10:02 -0400)]
MUC: Fixed traceback when a JID not in a room requested a role change for an occupant.

10 years agoMerge
Matthew Wild [Tue, 1 Apr 2014 14:02:36 +0000 (15:02 +0100)]
Merge

10 years agonet.server_{select,event}: Add compat code for supporting the same client port API...
Kim Alvefur [Tue, 1 Apr 2014 13:26:40 +0000 (15:26 +0200)]
net.server_{select,event}: Add compat code for supporting the same client port API on connections

10 years agoBacked out changeset a5b5bce71a11
Kim Alvefur [Mon, 31 Mar 2014 17:38:06 +0000 (19:38 +0200)]
Backed out changeset a5b5bce71a11

10 years agoMakefile: Change sed regex to be compatible with FreeBSD's odd sed, and change /...
Matthew Wild [Sun, 30 Mar 2014 08:16:27 +0000 (09:16 +0100)]
Makefile: Change sed regex to be compatible with FreeBSD's odd sed, and change / to | to allow paths to be used in RUNWITH (thanks Ben)

10 years agoutil.dependencies: Log error when LuaExpat is not capable of enforcing stanza size...
Matthew Wild [Sun, 30 Mar 2014 08:15:28 +0000 (09:15 +0100)]
util.dependencies: Log error when LuaExpat is not capable of enforcing stanza size limits

10 years agoutil.xmppstream: Implement stanza size limiting, default limit 10MB
Matthew Wild [Sun, 30 Mar 2014 08:14:39 +0000 (09:14 +0100)]
util.xmppstream: Implement stanza size limiting, default limit 10MB

10 years agoportmanager: Make maximum read size configurable, and default to 4KB
Matthew Wild [Sun, 30 Mar 2014 07:44:55 +0000 (08:44 +0100)]
portmanager: Make maximum read size configurable, and default to 4KB

10 years agonet.server_event: Rename conn:port() -> conn:clientport() to match server_select
Kim Alvefur [Thu, 27 Mar 2014 22:02:52 +0000 (23:02 +0100)]
net.server_event: Rename conn:port() -> conn:clientport() to match server_select

10 years agoMerge 0.9->0.10
Kim Alvefur [Tue, 25 Mar 2014 18:16:38 +0000 (19:16 +0100)]
Merge 0.9->0.10

10 years agoprosody.cfg.lua.dist: mod_posix is enabled by default on posix platforms now
Kim Alvefur [Sat, 22 Mar 2014 13:53:17 +0000 (14:53 +0100)]
prosody.cfg.lua.dist: mod_posix is enabled by default on posix platforms now

10 years agoutil.sasl: Fix logic for when mechanisms with channel binding support are offered
Kim Alvefur [Sat, 22 Mar 2014 13:45:04 +0000 (14:45 +0100)]
util.sasl: Fix logic for when mechanisms with channel binding support are offered

10 years agoprosodyctl: Show real error if certificate config file can't be opened
Kim Alvefur [Sat, 22 Mar 2014 11:02:11 +0000 (12:02 +0100)]
prosodyctl: Show real error if certificate config file can't be opened

10 years agomodulemanager: Load mod_saslauth on components by default
Kim Alvefur [Sat, 22 Mar 2014 11:42:01 +0000 (12:42 +0100)]
modulemanager: Load mod_saslauth on components by default

10 years agomod_saslauth: Only do c2s SASL on normal VirtualHosts
Kim Alvefur [Sat, 22 Mar 2014 11:41:38 +0000 (12:41 +0100)]
mod_saslauth: Only do c2s SASL on normal VirtualHosts

10 years agoMerge 0.9->0.10
Kim Alvefur [Sun, 9 Mar 2014 22:47:53 +0000 (23:47 +0100)]
Merge 0.9->0.10

10 years agomod_http_files: Strip path separator from end of paths, was broken on Windows (thanks...
Kim Alvefur [Sun, 9 Mar 2014 21:16:44 +0000 (22:16 +0100)]
mod_http_files: Strip path separator from end of paths, was broken on Windows (thanks Junne)

10 years agoutil.pluginloader: Always use path separator from package.config (thanks Junne)
Kim Alvefur [Sun, 9 Mar 2014 21:15:40 +0000 (22:15 +0100)]
util.pluginloader: Always use path separator from package.config (thanks Junne)

10 years agoMerge 0.9->0.10
Kim Alvefur [Wed, 26 Feb 2014 21:21:55 +0000 (22:21 +0100)]
Merge 0.9->0.10

10 years agomod_http: Fix http_external_url setting without an explicit port
Kim Alvefur [Wed, 26 Feb 2014 21:19:58 +0000 (22:19 +0100)]
mod_http: Fix http_external_url setting without an explicit port