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

10 years agomod_http: Use hostname from the correct context (thanks gryffus)
Kim Alvefur [Thu, 20 Feb 2014 18:08:55 +0000 (19:08 +0100)]
mod_http: Use hostname from the correct context (thanks gryffus)

10 years agomod_proxy65: Use mod_disco
Florian Zeitz [Wed, 19 Feb 2014 19:13:35 +0000 (20:13 +0100)]
mod_proxy65: Use mod_disco

10 years agotools/ejabberd2prosody: Don't throw an error if XML CDATA is null ([] in Erlang,...
Waqas Hussain [Tue, 18 Feb 2014 21:03:13 +0000 (16:03 -0500)]
tools/ejabberd2prosody: Don't throw an error if XML CDATA is null ([] in Erlang, instead of a string or being missing).

10 years agomod_compression: Only allow compression on authenticated streams
Kim Alvefur [Tue, 18 Feb 2014 19:03:12 +0000 (20:03 +0100)]
mod_compression: Only allow compression on authenticated streams

10 years agomod_auth_anonymous: Fixed a traceback in listing all users (issue#396).
Waqas Hussain [Mon, 17 Feb 2014 21:00:41 +0000 (16:00 -0500)]
mod_auth_anonymous: Fixed a traceback in listing all users (issue#396).

10 years agomod_auth_interal_hashed: Update salt and iteration count when setting a new password
Florian Zeitz [Wed, 12 Feb 2014 12:45:16 +0000 (13:45 +0100)]
mod_auth_interal_hashed: Update salt and iteration count when setting a new password

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

10 years agomod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392)
Kim Alvefur [Wed, 12 Feb 2014 18:25:15 +0000 (19:25 +0100)]
mod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392)

10 years agomod_admin_telnet: Prep jids for user:create() etc.
Kim Alvefur [Sun, 9 Feb 2014 14:17:01 +0000 (15:17 +0100)]
mod_admin_telnet: Prep jids for user:create() etc.

10 years agomod_s2s: Log a warning if no local addresses are found, as this breaks s2sout
Kim Alvefur [Sun, 9 Feb 2014 14:13:46 +0000 (15:13 +0100)]
mod_s2s: Log a warning if no local addresses are found, as this breaks s2sout

10 years agomod_storage_sql2: archive:delete() with username = true deletes for all users
Kim Alvefur [Sun, 9 Feb 2014 14:12:13 +0000 (15:12 +0100)]
mod_storage_sql2: archive:delete() with username = true deletes for all users

10 years agomod_ping: Use type-specific event
Kim Alvefur [Sun, 9 Feb 2014 14:09:12 +0000 (15:09 +0100)]
mod_ping: Use type-specific event

10 years agoMerge 0.9->0.10
Kim Alvefur [Thu, 6 Feb 2014 09:48:41 +0000 (10:48 +0100)]
Merge 0.9->0.10

10 years agomod_motd: Strip indentation only, leave multiple newlines
Kim Alvefur [Thu, 6 Feb 2014 09:44:21 +0000 (10:44 +0100)]
mod_motd: Strip indentation only, leave multiple newlines

10 years agoMerge 0.9->0.10
Kim Alvefur [Mon, 3 Feb 2014 06:23:33 +0000 (07:23 +0100)]
Merge 0.9->0.10

10 years agomod_c2s: Break out stream opening into a separate function
Florian Zeitz [Fri, 31 Jan 2014 11:01:12 +0000 (12:01 +0100)]
mod_c2s: Break out stream opening into a separate function

10 years agoMUC: Tag PMs with <x>, like presence stanzas
Kim Alvefur [Tue, 28 Jan 2014 18:21:21 +0000 (19:21 +0100)]
MUC: Tag PMs with <x>, like presence stanzas

10 years agotools/ejabberd2prosody: Handle new room member format.
Kim Alvefur [Mon, 27 Jan 2014 15:47:54 +0000 (16:47 +0100)]
tools/ejabberd2prosody: Handle new room member format.

10 years agomodulemanager: Always load a platform-specific module, add stub modules for Windows...
Kim Alvefur [Sun, 26 Jan 2014 20:16:24 +0000 (21:16 +0100)]
modulemanager: Always load a platform-specific module, add stub modules for Windows and unknown platforms

10 years agomod_posix: Daemonize by default only when installed
Kim Alvefur [Sun, 26 Jan 2014 17:35:03 +0000 (18:35 +0100)]
mod_posix: Daemonize by default only when installed

10 years agoMerge 0.9->0.10
Matthew Wild [Tue, 21 Jan 2014 03:24:40 +0000 (03:24 +0000)]
Merge 0.9->0.10

10 years agomod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given
Kim Alvefur [Tue, 21 Jan 2014 00:51:13 +0000 (01:51 +0100)]
mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given

10 years agomod_storage_sql2: Fix another SQL syntax error that slipped trough
Kim Alvefur [Mon, 20 Jan 2014 23:51:31 +0000 (00:51 +0100)]
mod_storage_sql2: Fix another SQL syntax error that slipped trough

10 years agotools/ejabberd2prosody: Disable generating a config, as the format it generates is...
Waqas Hussain [Sat, 18 Jan 2014 22:26:02 +0000 (17:26 -0500)]
tools/ejabberd2prosody: Disable generating a config, as the format it generates is completely out of date.

10 years agotools/ejabberd2prosody: ?xmlelement? can be ?xmlel? in newer ejabberd (thanks cr).
Waqas Hussain [Sat, 18 Jan 2014 22:24:10 +0000 (17:24 -0500)]
tools/ejabberd2prosody: ?xmlelement? can be ?xmlel? in newer ejabberd (thanks cr).

10 years agoMUC: Fire muc-room-destroyed event when the last participant leaves a non-persistent...
Kim Alvefur [Sat, 18 Jan 2014 19:14:05 +0000 (20:14 +0100)]
MUC: Fire muc-room-destroyed event when the last participant leaves a non-persistent room

10 years agoMerge 0.9->0.10
Matthew Wild [Sat, 18 Jan 2014 18:46:12 +0000 (18:46 +0000)]
Merge 0.9->0.10

10 years agomod_storage_sql2: Fix SQL syntax
Kim Alvefur [Sat, 18 Jan 2014 18:33:33 +0000 (19:33 +0100)]
mod_storage_sql2: Fix SQL syntax

10 years agoMUC: Expose room metatable on module
Kim Alvefur [Sat, 18 Jan 2014 17:28:50 +0000 (18:28 +0100)]
MUC: Expose room metatable on module

10 years agoMUC: Split out sending of the topic into method separate from sending history
Kim Alvefur [Sat, 18 Jan 2014 17:11:13 +0000 (18:11 +0100)]
MUC: Split out sending of the topic into method separate from sending history

10 years agoMUC: Split saving to history into a separate method
Kim Alvefur [Sat, 18 Jan 2014 17:05:42 +0000 (18:05 +0100)]
MUC: Split saving to history into a separate method

10 years agotools/ejabberd2prosody: Add support for importing MUC rooms.
Waqas Hussain [Sat, 18 Jan 2014 15:37:12 +0000 (10:37 -0500)]
tools/ejabberd2prosody: Add support for importing MUC rooms.

10 years agotools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors.
Waqas Hussain [Thu, 16 Jan 2014 19:03:27 +0000 (14:03 -0500)]
tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors.

10 years agoMerge
Matthew Wild [Sun, 12 Jan 2014 11:19:55 +0000 (06:19 -0500)]
Merge

10 years agoMerge 0.9->0.10
Matthew Wild [Sun, 12 Jan 2014 11:19:37 +0000 (06:19 -0500)]
Merge 0.9->0.10

10 years agoTagging 0.9.3
Matthew Wild [Sun, 12 Jan 2014 11:17:40 +0000 (06:17 -0500)]
Tagging 0.9.3

10 years agomod_tls: Log error when TLS initialization fails
Matthew Wild [Sun, 12 Jan 2014 11:16:49 +0000 (06:16 -0500)]
mod_tls: Log error when TLS initialization fails

10 years agomod_storage_sql2: Fix syntax error in subquery (Thanks Lance)
Kim Alvefur [Sun, 5 Jan 2014 22:38:34 +0000 (23:38 +0100)]
mod_storage_sql2: Fix syntax error in subquery (Thanks Lance)

10 years agomod_s2s: Include IP in log messages, if host is unavailable
Florian Zeitz [Sun, 5 Jan 2014 21:21:50 +0000 (22:21 +0100)]
mod_s2s: Include IP in log messages, if host is unavailable

10 years agotools/migration/migrator/prosody_files: Fix undefined global access of ?error?, print...
Waqas Hussain [Fri, 3 Jan 2014 20:52:52 +0000 (15:52 -0500)]
tools/migration/migrator/prosody_files: Fix undefined global access of ?error?, print the actual error message and correct file path in the error message when we fail to load a file, skip broken files instead of failing migration.

10 years agoutil.pubsub: Separate data from node configuration
Kim Alvefur [Mon, 30 Dec 2013 22:49:23 +0000 (23:49 +0100)]
util.pubsub: Separate data from node configuration

10 years agoutil.pubsub: Fire events on more actions
Kim Alvefur [Thu, 26 Dec 2013 17:14:34 +0000 (18:14 +0100)]
util.pubsub: Fire events on more actions