prosody.git
9 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 26 Oct 2014 19:58:02 +0000 (20:58 +0100)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Kim Alvefur [Sun, 26 Oct 2014 19:57:06 +0000 (20:57 +0100)]
Merge 0.9->0.10

9 years agomod_blocklist: Don't send unavailable presence from unavailable sessions when blockin...
Kim Alvefur [Sun, 26 Oct 2014 15:29:50 +0000 (16:29 +0100)]
mod_blocklist: Don't send unavailable presence from unavailable sessions when blocking a contact

9 years agomod_blocklist: Only log message about migrating from mod_privacy when there is data...
Kim Alvefur [Sat, 25 Oct 2014 12:45:11 +0000 (14:45 +0200)]
mod_blocklist: Only log message about migrating from mod_privacy when there is data to migrate

9 years agoTagging 0.9.7
Matthew Wild [Fri, 24 Oct 2014 22:23:02 +0000 (23:23 +0100)]
Tagging 0.9.7

9 years agoBackout changeset 6e67c73f730c: not a major fix and it breaks interop with at least...
Matthew Wild [Fri, 24 Oct 2014 22:20:06 +0000 (23:20 +0100)]
Backout changeset 6e67c73f730c: not a major fix and it breaks interop with at least Isode M-Link, and possibly standards, while it's not clear it actually fixes the original problem either.

9 years agonet/server: Handle lack of util.signal correctly
daurnimator [Wed, 22 Oct 2014 20:00:40 +0000 (16:00 -0400)]
net/server: Handle lack of util.signal correctly

9 years agonet/server: Remove print
daurnimator [Wed, 22 Oct 2014 19:59:51 +0000 (15:59 -0400)]
net/server: Remove print

9 years agonet.server: Rename 'server' config option to 'network_backend' (to select which net...
Matthew Wild [Wed, 22 Oct 2014 11:56:41 +0000 (12:56 +0100)]
net.server: Rename 'server' config option to 'network_backend' (to select which net.server implementation to use)

9 years agonet/server: If server.hook_signal exists, overwrite signal.signal; else make server...
daurnimator [Tue, 21 Oct 2014 21:26:48 +0000 (17:26 -0400)]
net/server: If server.hook_signal exists, overwrite signal.signal; else make server.hook_signal == signal.signal

No longer server_event specific
server.hook_signal will always exist

9 years agomod_saslauth: Better name for config option
Kim Alvefur [Tue, 21 Oct 2014 14:41:28 +0000 (16:41 +0200)]
mod_saslauth: Better name for config option

9 years agomod_saslauth: Make it possible to disable certain mechanisms
Kim Alvefur [Tue, 21 Oct 2014 12:38:40 +0000 (14:38 +0200)]
mod_saslauth: Make it possible to disable certain mechanisms

9 years agomod_saslauth: Add LOGIN to mechanisms not allowed over unencrypted connections as...
Kim Alvefur [Tue, 21 Oct 2014 12:37:05 +0000 (14:37 +0200)]
mod_saslauth: Add LOGIN to mechanisms not allowed over unencrypted connections as it may be offered by 3rd party authentication plugins

9 years agomod_saslauth: Use a configurable set of mechanisms to not allow over unencrypted...
Kim Alvefur [Tue, 21 Oct 2014 12:35:32 +0000 (14:35 +0200)]
mod_saslauth: Use a configurable set of mechanisms to not allow over unencrypted connections

9 years agomod_saslauth: Log warning if no SASL mechanisms were offered
Kim Alvefur [Tue, 21 Oct 2014 10:57:56 +0000 (12:57 +0200)]
mod_saslauth: Log warning if no SASL mechanisms were offered

9 years agomod_saslauth: Use type-specific config option getters
Kim Alvefur [Tue, 21 Oct 2014 10:56:19 +0000 (12:56 +0200)]
mod_saslauth: Use type-specific config option getters

9 years agomod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default option...
Kim Alvefur [Tue, 21 Oct 2014 10:49:03 +0000 (12:49 +0200)]
mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default option to s2s_require_encryption so the later overrides the former

9 years agoprosodyctl: Add 'require_encryption' to list of deprecated options pointed out by...
Kim Alvefur [Tue, 21 Oct 2014 10:47:53 +0000 (12:47 +0200)]
prosodyctl: Add 'require_encryption' to list of deprecated options pointed out by the check command

9 years agoMove timer code out of util.timer and into relevant net.server backends
daurnimator [Mon, 20 Oct 2014 20:13:24 +0000 (16:13 -0400)]
Move timer code out of util.timer and into relevant net.server backends

9 years agoprosodyctl: Fix nil global access traceback in `prosodyctl about` (luarocks 2.2.0...
Waqas Hussain [Sun, 19 Oct 2014 07:05:49 +0000 (03:05 -0400)]
prosodyctl: Fix nil global access traceback in `prosodyctl about` (luarocks 2.2.0 no longer uses module())

9 years agonet/server: Split up different backends in a nicer way. Add global config option...
daurnimator [Fri, 17 Oct 2014 21:30:21 +0000 (17:30 -0400)]
net/server: Split up different backends in a nicer way. Add global config option 'server'

9 years agoplugins/muc/mod_muc: Add 'local_only' flag to mod_muc, so rooms don't get restored...
daurnimator [Fri, 17 Oct 2014 20:35:46 +0000 (16:35 -0400)]
plugins/muc/mod_muc: Add 'local_only' flag to mod_muc, so rooms don't get restored on shutdown

9 years agoplugins/muc/muc.lib: Add :each_affiliation() iterator
daurnimator [Wed, 15 Oct 2014 21:08:19 +0000 (17:08 -0400)]
plugins/muc/muc.lib: Add :each_affiliation() iterator

9 years agoplugins/muc/members_only: Kick non-members when members-only is turned on
daurnimator [Wed, 15 Oct 2014 21:07:16 +0000 (17:07 -0400)]
plugins/muc/members_only: Kick non-members when members-only is turned on

9 years agoplugins/muc/muc.lib: Kick users from outcast hosts
daurnimator [Wed, 15 Oct 2014 20:56:42 +0000 (16:56 -0400)]
plugins/muc/muc.lib: Kick users from outcast hosts

9 years agoplugins/muc/muc.lib: Fix passing actor along as a boolean (thanks fippo)
daurnimator [Wed, 15 Oct 2014 18:28:16 +0000 (14:28 -0400)]
plugins/muc/muc.lib: Fix passing actor along as a boolean (thanks fippo)

9 years agoTagging 0.9.6
Matthew Wild [Tue, 14 Oct 2014 23:39:37 +0000 (00:39 +0100)]
Tagging 0.9.6

9 years agocertmanager, net.http: Disable SSLv3 by default
Matthew Wild [Tue, 14 Oct 2014 17:55:08 +0000 (18:55 +0100)]
certmanager, net.http: Disable SSLv3 by default

9 years agoMerge 0.10->trunk
Matthew Wild [Tue, 14 Oct 2014 09:59:54 +0000 (10:59 +0100)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Matthew Wild [Tue, 14 Oct 2014 09:59:27 +0000 (10:59 +0100)]
Merge 0.9->0.10

9 years agomod_pubsub: Fix error type of 'forbidden' (change from 'cancel' to 'auth')
Matthew Wild [Tue, 14 Oct 2014 09:58:11 +0000 (10:58 +0100)]
mod_pubsub: Fix error type of 'forbidden' (change from 'cancel' to 'auth')

9 years agoprosody: Make getfenv() replacement for require() sandboxing local to avoid polluting...
Kim Alvefur [Mon, 13 Oct 2014 19:02:04 +0000 (21:02 +0200)]
prosody: Make getfenv() replacement for require() sandboxing local to avoid polluting the globals table

9 years agomod_s2s: Capitalize log message
Kim Alvefur [Thu, 9 Oct 2014 22:56:53 +0000 (00:56 +0200)]
mod_s2s: Capitalize log message

9 years agoMerge 0.10->trunk
Waqas Hussain [Wed, 8 Oct 2014 22:47:01 +0000 (18:47 -0400)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Waqas Hussain [Wed, 8 Oct 2014 22:42:33 +0000 (18:42 -0400)]
Merge 0.9->0.10

9 years agoutil/dataforms: Make sure we iterate over field tags
daurnimator [Tue, 7 Oct 2014 16:08:23 +0000 (12:08 -0400)]
util/dataforms: Make sure we iterate over field tags

9 years agoutil.stanza: Escape newlines and tabs (\r\n\t) when serializing stanzas. \r\n transfo...
Waqas Hussain [Wed, 8 Oct 2014 19:56:11 +0000 (15:56 -0400)]
util.stanza: Escape newlines and tabs (\r\n\t) when serializing stanzas. \r\n transforms into \n  otherwise, and \r\n\t in attributes transforms into spaces.

9 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 5 Oct 2014 13:37:46 +0000 (15:37 +0200)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Kim Alvefur [Sun, 5 Oct 2014 13:37:21 +0000 (15:37 +0200)]
Merge 0.9->0.10

9 years agomod_blocklist: Capitalize log message
Kim Alvefur [Sun, 5 Oct 2014 13:36:19 +0000 (15:36 +0200)]
mod_blocklist: Capitalize log message

9 years agonet.dns: Avoid duplicate cache entries
Florian Zeitz [Sun, 5 Oct 2014 12:28:40 +0000 (14:28 +0200)]
net.dns: Avoid duplicate cache entries

9 years agonet.server_select: Reset read timeout timer if the event is handled
Kim Alvefur [Fri, 3 Oct 2014 12:42:18 +0000 (14:42 +0200)]
net.server_select: Reset read timeout timer if the event is handled

9 years agoMerge 0.10->trunk
daurnimator [Mon, 29 Sep 2014 17:59:16 +0000 (13:59 -0400)]
Merge 0.10->trunk

9 years agomod_admin_adhoc: Add required to field in user deletion form too
Kim Alvefur [Mon, 29 Sep 2014 09:18:04 +0000 (11:18 +0200)]
mod_admin_adhoc: Add required to field in user deletion form too

9 years agomod_admin_adhoc: Mark 'accountjids' field as required in 'end user sessions' command...
Kim Alvefur [Mon, 29 Sep 2014 09:02:06 +0000 (11:02 +0200)]
mod_admin_adhoc: Mark 'accountjids' field as required in 'end user sessions' command (thanks Lloyd)

9 years agomod_admin_web: Add "List S2S connections" command
Florian Zeitz [Sun, 28 Sep 2014 21:03:03 +0000 (23:03 +0200)]
mod_admin_web: Add "List S2S connections" command

9 years agomod_admin_adhoc: Show IP in detailed version of online user listing
Florian Zeitz [Sun, 28 Sep 2014 19:06:50 +0000 (21:06 +0200)]
mod_admin_adhoc: Show IP in detailed version of online user listing

9 years agoplugins/muc/muc.lib: Fire muc-occupant-left from other places an occupant may leave...
daurnimator [Fri, 26 Sep 2014 21:44:14 +0000 (17:44 -0400)]
plugins/muc/muc.lib: Fire muc-occupant-left from other places an occupant may leave the room

9 years agoplugins/muc/muc.lib: Validate affiliations and roles to admin query get
daurnimator [Fri, 26 Sep 2014 21:43:00 +0000 (17:43 -0400)]
plugins/muc/muc.lib: Validate affiliations and roles to admin query get

9 years agoplugins/muc/muc.lib: Add missing :up()
daurnimator [Fri, 26 Sep 2014 21:34:02 +0000 (17:34 -0400)]
plugins/muc/muc.lib: Add missing :up()

9 years agoplugins/muc/muc.lib: Use occupants iterator instead of assuming pairs
daurnimator [Fri, 26 Sep 2014 21:33:38 +0000 (17:33 -0400)]
plugins/muc/muc.lib: Use occupants iterator instead of assuming pairs

9 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 28 Sep 2014 01:08:03 +0000 (03:08 +0200)]
Merge 0.10->trunk

9 years agomod_pep_plus: Remove config form, it moved into pubsub.lib
Kim Alvefur [Sun, 28 Sep 2014 01:07:46 +0000 (03:07 +0200)]
mod_pep_plus: Remove config form, it moved into pubsub.lib

9 years agopubsub.lib: Fix variable renaming issue
Kim Alvefur [Sun, 28 Sep 2014 01:06:29 +0000 (03:06 +0200)]
pubsub.lib: Fix variable renaming issue

9 years agomod_pubsub: Fix retreival of node config defaults
Kim Alvefur [Sun, 28 Sep 2014 00:48:29 +0000 (02:48 +0200)]
mod_pubsub: Fix retreival of node config defaults

9 years agomod_pubsub: Move node config form into pubsub.lib (Thanks Florob)
Kim Alvefur [Sun, 28 Sep 2014 00:47:54 +0000 (02:47 +0200)]
mod_pubsub: Move node config form into pubsub.lib (Thanks Florob)

9 years agopubsub.lib: Fix actor in configure
Kim Alvefur [Sun, 28 Sep 2014 00:41:13 +0000 (02:41 +0200)]
pubsub.lib: Fix actor in configure

9 years agomod_pep_plus: Default to max one item per node (Recomended for PEP)
Kim Alvefur [Sun, 28 Sep 2014 00:00:44 +0000 (02:00 +0200)]
mod_pep_plus: Default to max one item per node (Recomended for PEP)

9 years agomod_pep_plus: Add node config form
Kim Alvefur [Sun, 28 Sep 2014 00:00:09 +0000 (02:00 +0200)]
mod_pep_plus: Add node config form

9 years agoMerge 0.10->trunk
Kim Alvefur [Sat, 27 Sep 2014 23:56:22 +0000 (01:56 +0200)]
Merge 0.10->trunk

9 years agomod_pubsub: Add support for requesting default node configuration
Kim Alvefur [Sat, 27 Sep 2014 23:55:32 +0000 (01:55 +0200)]
mod_pubsub: Add support for requesting default node configuration

9 years agomod_pubsub: Add max items to node config form
Kim Alvefur [Sat, 27 Sep 2014 23:50:17 +0000 (01:50 +0200)]
mod_pubsub: Add max items to node config form

9 years agoutil.pubsub: Add support for limiting the number of item in a node (default to 20)
Kim Alvefur [Sat, 27 Sep 2014 23:50:00 +0000 (01:50 +0200)]
util.pubsub: Add support for limiting the number of item in a node (default to 20)

9 years agomod_pubsub: Add support for node configuration
Kim Alvefur [Sat, 27 Sep 2014 23:46:17 +0000 (01:46 +0200)]
mod_pubsub: Add support for node configuration

9 years agoutil.pubsub: Add support for node configuration
Kim Alvefur [Sat, 27 Sep 2014 23:45:59 +0000 (01:45 +0200)]
util.pubsub: Add support for node configuration

9 years agoutil.pubsub: One less table allocated per pubsub object created
Kim Alvefur [Sat, 27 Sep 2014 22:05:21 +0000 (00:05 +0200)]
util.pubsub: One less table allocated per pubsub object created

9 years agoutil.pubsub: Use local
Kim Alvefur [Sat, 27 Sep 2014 17:57:33 +0000 (19:57 +0200)]
util.pubsub: Use local

9 years agomod_pubsub: Transplant pieces of cdcfd93e2f43 from trunk
Kim Alvefur [Sat, 27 Sep 2014 17:53:39 +0000 (19:53 +0200)]
mod_pubsub: Transplant pieces of cdcfd93e2f43 from trunk

9 years agomod_pep_plus: Add pubsub service objects to an item list
Kim Alvefur [Sat, 27 Sep 2014 17:00:09 +0000 (19:00 +0200)]
mod_pep_plus: Add pubsub service objects to an item list

9 years agonet.websocket: Make data masking configurable
Florian Zeitz [Fri, 26 Sep 2014 20:12:21 +0000 (22:12 +0200)]
net.websocket: Make data masking configurable

9 years agomuc: Add 'occupant' to muc-occupant-{joined,left,session-new} events (thanks daurnima...
Matthew Wild [Fri, 26 Sep 2014 16:34:15 +0000 (17:34 +0100)]
muc: Add 'occupant' to muc-occupant-{joined,left,session-new} events (thanks daurnimator/fippo)

9 years agonet.server_select: When an SSL handshake is connected, if there is pending data to...
Matthew Wild [Fri, 26 Sep 2014 16:16:46 +0000 (17:16 +0100)]
net.server_select: When an SSL handshake is connected, if there is pending data to be written to the socket, mark the socket as waiting to send (thanks daurnimator)

9 years agohostmanager: Don't prevent host_session.send() from routing errors or iq results...
Matthew Wild [Fri, 26 Sep 2014 16:10:43 +0000 (17:10 +0100)]
hostmanager: Don't prevent host_session.send() from routing errors or iq results, so modules can handle them. This code was originally added for a reason, but I can't remember what it was.

9 years agoplugins/muc: Add muc-occupant-groupchat event
daurnimator [Thu, 25 Sep 2014 21:43:00 +0000 (17:43 -0400)]
plugins/muc: Add muc-occupant-groupchat event

  - Plugins can cancel messages before they are broadcast; and while they still have real from jid
  - Use it for subject changes
  - Allows for custom roles (via role_rank)
  - Roles are now checked before subject
  - Removed muc-subject-change event

9 years agoMerge 0.10->trunk
Kim Alvefur [Tue, 23 Sep 2014 21:22:13 +0000 (23:22 +0200)]
Merge 0.10->trunk

9 years agomod_saslauth: Fix encoding of missing vs empty SASL reply messages
Kim Alvefur [Tue, 23 Sep 2014 17:46:29 +0000 (19:46 +0200)]
mod_saslauth: Fix encoding of missing vs empty SASL reply messages

9 years agomod_s2s: Close s2s connections that can not proceed due to mod_dialback not being...
Kim Alvefur [Tue, 23 Sep 2014 17:41:10 +0000 (19:41 +0200)]
mod_s2s: Close s2s connections that can not proceed due to mod_dialback not being present

9 years agomod_saslauth: Stricter SASL EXTERNAL handling more in line with XEP-0178
Kim Alvefur [Tue, 23 Sep 2014 17:29:14 +0000 (19:29 +0200)]
mod_saslauth: Stricter SASL EXTERNAL handling more in line with XEP-0178

9 years agomod_dialback, mod_saslauth: Remove broken fallback to dialback on SASL EXTERNAL failure
Kim Alvefur [Tue, 23 Sep 2014 12:23:01 +0000 (14:23 +0200)]
mod_dialback, mod_saslauth: Remove broken fallback to dialback on SASL EXTERNAL failure

9 years agoMerge 0.10->trunk
Kim Alvefur [Mon, 22 Sep 2014 23:44:16 +0000 (01:44 +0200)]
Merge 0.10->trunk

9 years agocore.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r)
Kim Alvefur [Mon, 22 Sep 2014 22:23:33 +0000 (00:23 +0200)]
core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r)

9 years agoutil.random: Ensure at least 4 bytes of previous random state is used when generating...
Kim Alvefur [Thu, 18 Sep 2014 08:21:38 +0000 (10:21 +0200)]
util.random: Ensure at least 4 bytes of previous random state is used when generating new randomness

9 years agoutil.random: Switch to SHA512
Kim Alvefur [Thu, 18 Sep 2014 08:16:59 +0000 (10:16 +0200)]
util.random: Switch to SHA512

9 years agoutil.array: Add type() local
Kim Alvefur [Wed, 17 Sep 2014 12:50:44 +0000 (14:50 +0200)]
util.array: Add type() local

9 years agoprosody: Fix getfenv replacement for Lua 5.2
Kim Alvefur [Wed, 17 Sep 2014 12:50:00 +0000 (14:50 +0200)]
prosody: Fix getfenv replacement for Lua 5.2

9 years agocore.modulemanager, core.moduleapi: Hack around dependency loop
Kim Alvefur [Wed, 17 Sep 2014 12:48:49 +0000 (14:48 +0200)]
core.modulemanager, core.moduleapi: Hack around dependency loop

9 years agocore.moduleapi: Use require instead of global to get storagemanager in module:open_st...
Kim Alvefur [Wed, 17 Sep 2014 12:47:52 +0000 (14:47 +0200)]
core.moduleapi: Use require instead of global to get storagemanager in module:open_store()

9 years agoutil-src/*.c: Add macro for compiling with Lua 5.2
Kim Alvefur [Wed, 17 Sep 2014 12:30:29 +0000 (14:30 +0200)]
util-src/*.c: Add macro for compiling with Lua 5.2

9 years agoutil-src/*.c: Use the more concise lua_setfield
Kim Alvefur [Wed, 17 Sep 2014 00:23:17 +0000 (02:23 +0200)]
util-src/*.c: Use the more concise lua_setfield

9 years agoplugins/muc/muc.lib: Fix iq results coming from the real jid, not the in-room jid...
daurnimator [Tue, 16 Sep 2014 21:11:29 +0000 (17:11 -0400)]
plugins/muc/muc.lib: Fix iq results coming from the real jid, not the in-room jid (thanks Lance)

9 years agoMerge 0.10->trunk
Kim Alvefur [Thu, 18 Sep 2014 00:22:48 +0000 (02:22 +0200)]
Merge 0.10->trunk

9 years agoutil-src/*.c: Don't create globals when loaded
Kim Alvefur [Tue, 16 Sep 2014 19:56:18 +0000 (21:56 +0200)]
util-src/*.c: Don't create globals when loaded

9 years agoplugins/muc/muc.lib: Allow plugins to reject broadcasts in the muc-broadcast-message...
daurnimator [Tue, 16 Sep 2014 17:02:21 +0000 (13:02 -0400)]
plugins/muc/muc.lib: Allow plugins to reject broadcasts in the muc-broadcast-message event.

9 years agoplugins/mod_muc_unique: Fix undefined global access (thanks Lance)
Waqas Hussain [Tue, 16 Sep 2014 16:27:05 +0000 (12:27 -0400)]
plugins/mod_muc_unique: Fix undefined global access (thanks Lance)

9 years agoMerge 0.10->trunk
Kim Alvefur [Wed, 10 Sep 2014 23:17:56 +0000 (01:17 +0200)]
Merge 0.10->trunk

9 years agonet.websocket: Fix handling of 'protocol' argument
Kim Alvefur [Wed, 10 Sep 2014 22:55:51 +0000 (00:55 +0200)]
net.websocket: Fix handling of 'protocol' argument

9 years agoMakefile: Add net/websocket to install target
Kim Alvefur [Wed, 10 Sep 2014 22:31:11 +0000 (00:31 +0200)]
Makefile: Add net/websocket to install target

9 years agoprosodyctl: Use sha256 for certificate requests and self-signed certificates
Kim Alvefur [Wed, 10 Sep 2014 22:10:29 +0000 (00:10 +0200)]
prosodyctl: Use sha256 for certificate requests and self-signed certificates

9 years agocore.sessionmanager: Set a fake thread on destroyed sessions, fixes traceback if...
Kim Alvefur [Wed, 10 Sep 2014 22:09:07 +0000 (00:09 +0200)]
core.sessionmanager: Set a fake thread on destroyed sessions, fixes traceback if stanzas are emitted after a session is destroyed (thanks Sven Blumenstein)

9 years agoutil.vcard: Turn PHOTO fields into data-uris
Kim Alvefur [Wed, 10 Sep 2014 14:47:55 +0000 (16:47 +0200)]
util.vcard: Turn PHOTO fields into data-uris