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

9 years agocore.stanza_router, mod_s2s: Move handling of S2S features to mod_s2s from stanza_router
Kim Alvefur [Tue, 9 Sep 2014 13:05:46 +0000 (15:05 +0200)]
core.stanza_router, mod_s2s: Move handling of S2S features to mod_s2s from stanza_router

9 years agoMerge 0.9->0.10
Kim Alvefur [Tue, 9 Sep 2014 12:42:33 +0000 (14:42 +0200)]
Merge 0.9->0.10

9 years agocore.stanza_router: Stricter validation of stanzas
Kim Alvefur [Tue, 9 Sep 2014 12:42:10 +0000 (14:42 +0200)]
core.stanza_router: Stricter validation of stanzas

9 years agoMerge 0.10->trunk
Matthew Wild [Fri, 5 Sep 2014 18:09:13 +0000 (19:09 +0100)]
Merge 0.10->trunk

9 years agoMerge with Florob
Matthew Wild [Fri, 5 Sep 2014 18:08:42 +0000 (19:08 +0100)]
Merge with Florob

9 years agoplugins/muc: Add affiliation_notify config option to send out status code 101
daurnimator [Fri, 5 Sep 2014 16:16:53 +0000 (12:16 -0400)]
plugins/muc: Add affiliation_notify config option to send out status code 101

9 years agoplugins/muc/muc.lib: Add muc-set-affiliation event
daurnimator [Fri, 5 Sep 2014 15:28:28 +0000 (11:28 -0400)]
plugins/muc/muc.lib: Add muc-set-affiliation event

9 years agoplugins/muc/muc.lib: Use get_affilation() inside of set_affiliation(), so that the...
daurnimator [Fri, 5 Sep 2014 15:20:54 +0000 (11:20 -0400)]
plugins/muc/muc.lib: Use get_affilation() inside of set_affiliation(), so that the override in mod_muc works

9 years agoplugins/muc/muc.lib: Add instant room support
daurnimator [Fri, 5 Sep 2014 15:19:16 +0000 (11:19 -0400)]
plugins/muc/muc.lib: Add instant room support

9 years agoMerge 0.10->trunk
Matthew Wild [Fri, 5 Sep 2014 08:04:37 +0000 (09:04 +0100)]
Merge 0.10->trunk

9 years agomod_websocket: Initial commit (based on the prosody-modules version)
Florian Zeitz [Fri, 5 Sep 2014 01:47:39 +0000 (03:47 +0200)]
mod_websocket: Initial commit (based on the prosody-modules version)

9 years agoCheck Sec-WebSocket-Protocol header
Florian Zeitz [Fri, 5 Sep 2014 00:14:04 +0000 (02:14 +0200)]
Check Sec-WebSocket-Protocol header

9 years agonet/websocket: Add new websocket client code
daurnimator [Wed, 3 Sep 2014 19:28:46 +0000 (15:28 -0400)]
net/websocket: Add new websocket client code

9 years agonet/websocket: Add new websocket client code
daurnimator [Wed, 3 Sep 2014 19:28:46 +0000 (15:28 -0400)]
net/websocket: Add new websocket client code

9 years agoMerge 0.10->trunk
Matthew Wild [Wed, 3 Sep 2014 17:51:29 +0000 (18:51 +0100)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Matthew Wild [Wed, 3 Sep 2014 17:50:20 +0000 (18:50 +0100)]
Merge 0.9->0.10

9 years agonet.http.parser: Support status code 101 and allow handling of the received data...
Matthew Wild [Wed, 3 Sep 2014 17:49:41 +0000 (18:49 +0100)]
net.http.parser: Support status code 101 and allow handling of the received data by someone else

9 years agoMerge 0.10->trunk
Kim Alvefur [Wed, 3 Sep 2014 01:35:48 +0000 (03:35 +0200)]
Merge 0.10->trunk

9 years agoutil.hex: Use locals!
Kim Alvefur [Tue, 2 Sep 2014 22:37:41 +0000 (00:37 +0200)]
util.hex: Use locals!

9 years agoMerge 0.10->trunk
Kim Alvefur [Tue, 2 Sep 2014 20:34:32 +0000 (22:34 +0200)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Kim Alvefur [Tue, 2 Sep 2014 20:33:11 +0000 (22:33 +0200)]
Merge 0.9->0.10

9 years agoutil.uuid: Use util.hex and util.random
Matthew Wild [Tue, 2 Sep 2014 16:58:12 +0000 (17:58 +0100)]
util.uuid: Use util.hex and util.random

9 years agoutil.random: Generic util lib for generating strings of random bytes
Matthew Wild [Tue, 2 Sep 2014 16:57:18 +0000 (17:57 +0100)]
util.random: Generic util lib for generating strings of random bytes

9 years agoutil.hex: Small util lib for converting to/from hex strings
Matthew Wild [Tue, 2 Sep 2014 16:56:42 +0000 (17:56 +0100)]
util.hex: Small util lib for converting to/from hex strings

9 years agonet.server_select: 'listener'->'listeners' (fixes undefined global access)
Matthew Wild [Tue, 2 Sep 2014 16:23:44 +0000 (17:23 +0100)]
net.server_select: 'listener'->'listeners' (fixes undefined global access)

9 years agomod_dialback: Move d-w-d after to/from validation
Kim Alvefur [Mon, 1 Sep 2014 18:20:05 +0000 (20:20 +0200)]
mod_dialback: Move d-w-d after to/from validation

9 years agomod_muc: Fix 'destroy rooms' adhoc command (Thanks Florob)
Kim Alvefur [Sun, 31 Aug 2014 18:33:47 +0000 (20:33 +0200)]
mod_muc: Fix 'destroy rooms' adhoc command (Thanks Florob)

9 years agonet.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet, mod_net...
Matthew Wild [Fri, 29 Aug 2014 10:54:34 +0000 (11:54 +0100)]
net.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent)

9 years agonet.server_{select,event}: Add 'ondetach' callback for listener objects, to notify...
Matthew Wild [Fri, 29 Aug 2014 10:39:56 +0000 (11:39 +0100)]
net.server_{select,event}: Add 'ondetach' callback for listener objects, to notify them when another listener is being assigned to a connection

9 years agomod_s2s: Close offending s2s streams missing an 'id' attribute with a stream error...
Kim Alvefur [Tue, 2 Sep 2014 15:24:25 +0000 (17:24 +0200)]
mod_s2s: Close offending s2s streams missing an 'id' attribute with a stream error instead of throwing an unhandled error

9 years agomod_s2s_auth_certs: Warn about lack of certificate (Mostly jabberd14 not sending...
Kim Alvefur [Fri, 29 Aug 2014 00:24:49 +0000 (02:24 +0200)]
mod_s2s_auth_certs: Warn about lack of certificate (Mostly jabberd14 not sending a client certificate)

9 years agoMerge 0.10->trunk
Matthew Wild [Thu, 28 Aug 2014 11:24:15 +0000 (12:24 +0100)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Matthew Wild [Thu, 28 Aug 2014 11:23:58 +0000 (12:23 +0100)]
Merge 0.9->0.10

9 years agoTagging 0.9.5
Matthew Wild [Thu, 28 Aug 2014 11:22:39 +0000 (12:22 +0100)]
Tagging 0.9.5

9 years agoMerge 0.10->trunk
Matthew Wild [Thu, 28 Aug 2014 11:05:18 +0000 (12:05 +0100)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Matthew Wild [Thu, 28 Aug 2014 08:23:24 +0000 (09:23 +0100)]
Merge 0.9->0.10

9 years agoutil.filters: Ignore filters being added twice (fixes issues on removal)
Matthew Wild [Thu, 28 Aug 2014 08:20:33 +0000 (09:20 +0100)]
util.filters: Ignore filters being added twice (fixes issues on removal)

9 years agomod_privacy: Fix to correctly sort privacy list rules by order (thanks Flow)
Matthew Wild [Thu, 28 Aug 2014 08:17:07 +0000 (09:17 +0100)]
mod_privacy: Fix to correctly sort privacy list rules by order (thanks Flow)

9 years agoutil.xmppstream: Don't include empty stream ID in stream header (got here from mod_c2s)
Kim Alvefur [Wed, 27 Aug 2014 11:00:04 +0000 (13:00 +0200)]
util.xmppstream: Don't include empty stream ID in stream header (got here from mod_c2s)

9 years agomod_c2s, mod_s2s: Log received invalid stream headers
Matthew Wild [Sat, 23 Aug 2014 08:29:17 +0000 (09:29 +0100)]
mod_c2s, mod_s2s: Log received invalid stream headers

9 years agoutil.xmppstream: When error is 'no-stream', pass the received tagname to the error...
Matthew Wild [Sat, 23 Aug 2014 08:22:05 +0000 (09:22 +0100)]
util.xmppstream: When error is 'no-stream', pass the received tagname to the error handler

9 years agomod_s2s: Reset stream ID when resetting stream [compliance]
Kim Alvefur [Wed, 27 Aug 2014 11:20:08 +0000 (13:20 +0200)]
mod_s2s: Reset stream ID when resetting stream [compliance]

9 years agomodulemanager: Reduce warning to debug level message about modules already being...
Kim Alvefur [Wed, 27 Aug 2014 08:46:22 +0000 (10:46 +0200)]
modulemanager: Reduce warning to debug level message about modules already being loaded, it's probably just module:depends()

9 years agonet.http.server: Comment out a log message
Kim Alvefur [Wed, 27 Aug 2014 08:44:45 +0000 (10:44 +0200)]
net.http.server: Comment out a log message

9 years agomod_s2s: Mark stream as opened earlier for outgoing connections, fixes double stream...
Kim Alvefur [Tue, 26 Aug 2014 19:50:08 +0000 (21:50 +0200)]
mod_s2s: Mark stream as opened earlier for outgoing connections, fixes double stream headers on policy failures

9 years agomod_compression: Handle compression setup errors by logging a warning about it (fixes...
Kim Alvefur [Tue, 26 Aug 2014 10:19:27 +0000 (12:19 +0200)]
mod_compression: Handle compression setup errors by logging a warning about it (fixes #408)

9 years agomod_posix: Make sure that 'pidfile' is a string
Kim Alvefur [Tue, 26 Aug 2014 10:02:41 +0000 (12:02 +0200)]
mod_posix: Make sure that 'pidfile' is a string

9 years agoprosodyctl: Verify that 'pidfile' is a string, show friendly error otherwise
Kim Alvefur [Tue, 26 Aug 2014 10:00:51 +0000 (12:00 +0200)]
prosodyctl: Verify that 'pidfile' is a string, show friendly error otherwise

9 years agoMerge 0.10->trunk
Kim Alvefur [Wed, 13 Aug 2014 17:22:08 +0000 (19:22 +0200)]
Merge 0.10->trunk

9 years agomod_private: Fix traceback due to missing table index
Kim Alvefur [Wed, 13 Aug 2014 17:19:34 +0000 (19:19 +0200)]
mod_private: Fix traceback due to missing table index

9 years agomod_blocklist: Use full word as variable name, we can afford that
Kim Alvefur [Tue, 12 Aug 2014 13:42:20 +0000 (15:42 +0200)]
mod_blocklist: Use full word as variable name, we can afford that

9 years agomod_blocklist: Correct comment
Kim Alvefur [Tue, 12 Aug 2014 13:40:00 +0000 (15:40 +0200)]
mod_blocklist: Correct comment

9 years agomod_blocklist: Fix any unblock emptying the blocklist
Kim Alvefur [Tue, 12 Aug 2014 13:38:48 +0000 (15:38 +0200)]
mod_blocklist: Fix any unblock emptying the blocklist

9 years agomod_storage_sql2: DELETE then INSERT in map stores
Kim Alvefur [Tue, 12 Aug 2014 09:38:12 +0000 (11:38 +0200)]
mod_storage_sql2: DELETE then INSERT in map stores

9 years agomod_muc: Fix tracebacks (thanks nick1)
Kim Alvefur [Mon, 11 Aug 2014 09:36:30 +0000 (11:36 +0200)]
mod_muc: Fix tracebacks (thanks nick1)

9 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 10 Aug 2014 08:31:18 +0000 (10:31 +0200)]
Merge 0.10->trunk

9 years agomod_privacy: Remove, leave a log message about being replaced by mod_blocklist and...
Kim Alvefur [Sun, 10 Aug 2014 08:29:38 +0000 (10:29 +0200)]
mod_privacy: Remove, leave a log message about being replaced by mod_blocklist and load that instead

9 years agoprosody.cfg.lua.dist: Replace mod_privacy with mod_blocklist in the default config
Kim Alvefur [Sun, 10 Aug 2014 08:27:20 +0000 (10:27 +0200)]
prosody.cfg.lua.dist: Replace mod_privacy with mod_blocklist in the default config

9 years agomod_blocklist: XEP-0191 implementation written for speed and independence from mod_pr...
Kim Alvefur [Sun, 10 Aug 2014 08:27:00 +0000 (10:27 +0200)]
mod_blocklist: XEP-0191 implementation written for speed and independence from mod_privacy

9 years agomod_private: Use map store
Kim Alvefur [Sat, 9 Aug 2014 19:52:32 +0000 (21:52 +0200)]
mod_private: Use map store

9 years agoMerge 0.10->trunk
Kim Alvefur [Sat, 9 Aug 2014 19:48:52 +0000 (21:48 +0200)]
Merge 0.10->trunk

9 years agomod_private: Cleanup and more tailcalls
Kim Alvefur [Sat, 9 Aug 2014 19:48:11 +0000 (21:48 +0200)]
mod_private: Cleanup and more tailcalls

9 years agostoragemanager: Fix map store shim if store is empty
Kim Alvefur [Fri, 8 Aug 2014 10:38:35 +0000 (12:38 +0200)]
storagemanager: Fix map store shim if store is empty

9 years agoplugins/mod_storage_sql2: Return correct arguments from map_store operations
daurnimator [Thu, 7 Aug 2014 22:34:51 +0000 (18:34 -0400)]
plugins/mod_storage_sql2: Return correct arguments from map_store operations

9 years agoplugins/muc/mod_muc: persistent rooms keyval store needs username as nil
daurnimator [Thu, 7 Aug 2014 22:03:31 +0000 (18:03 -0400)]
plugins/muc/mod_muc: persistent rooms keyval store needs username as nil

9 years agoplugins/muc/mod_muc: Use map store for room persistence
daurnimator [Thu, 7 Aug 2014 16:35:12 +0000 (12:35 -0400)]
plugins/muc/mod_muc: Use map store for room persistence

9 years agoplugins/muc/mod_muc: Remove unused import
daurnimator [Thu, 7 Aug 2014 16:34:51 +0000 (12:34 -0400)]
plugins/muc/mod_muc: Remove unused import

9 years agoplugins/mod_storage_sql2: Add map store support
daurnimator [Thu, 7 Aug 2014 16:16:16 +0000 (12:16 -0400)]
plugins/mod_storage_sql2: Add map store support

9 years agocore/storagemanager: When map store isn't available, fallback to keyval store
daurnimator [Thu, 7 Aug 2014 16:15:15 +0000 (12:15 -0400)]
core/storagemanager: When map store isn't available, fallback to keyval store

9 years agoutil.jid: Optimize bare
Kim Alvefur [Thu, 7 Aug 2014 15:43:28 +0000 (17:43 +0200)]
util.jid: Optimize bare

9 years agoutil.jid: Use existing join function in jid.prep
Kim Alvefur [Thu, 7 Aug 2014 15:35:11 +0000 (17:35 +0200)]
util.jid: Use existing join function in jid.prep

9 years agoutil.jid: Return early in join on invalid jids
Kim Alvefur [Thu, 7 Aug 2014 15:20:51 +0000 (17:20 +0200)]
util.jid: Return early in join on invalid jids

9 years agomod_muc: Import util.stanza into the config handler modules that need it. Fixes ...
Matthew Wild [Tue, 5 Aug 2014 08:55:08 +0000 (09:55 +0100)]
mod_muc: Import util.stanza into the config handler modules that need it. Fixes #432.

9 years agomod_muc: Fix use of undefined global. Fixes #431.
Matthew Wild [Tue, 5 Aug 2014 08:16:29 +0000 (09:16 +0100)]
mod_muc: Fix use of undefined global. Fixes #431.

9 years agoMerge 0.10->trunk
Matthew Wild [Thu, 31 Jul 2014 06:14:54 +0000 (07:14 +0100)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Matthew Wild [Thu, 31 Jul 2014 06:11:54 +0000 (07:11 +0100)]
Merge 0.9->0.10

9 years agoprosodyctl: Remove nonsensical warning
Matthew Wild [Thu, 31 Jul 2014 05:59:12 +0000 (06:59 +0100)]
prosodyctl: Remove nonsensical warning

9 years agoprosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser
Matthew Wild [Thu, 31 Jul 2014 05:58:15 +0000 (06:58 +0100)]
prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser

9 years agoconfigmanager: nameprep VirtualHost and Component names
Matthew Wild [Thu, 31 Jul 2014 05:56:21 +0000 (06:56 +0100)]
configmanager: nameprep VirtualHost and Component names

9 years agoMerge 0.10->trunk
Kim Alvefur [Fri, 25 Jul 2014 19:16:52 +0000 (21:16 +0200)]
Merge 0.10->trunk

9 years agomod_s2s: Remove unused locals
Kim Alvefur [Fri, 25 Jul 2014 19:12:21 +0000 (21:12 +0200)]
mod_s2s: Remove unused locals

9 years agomod_s2s: Remove unused locals
Kim Alvefur [Fri, 25 Jul 2014 19:12:21 +0000 (21:12 +0200)]
mod_s2s: Remove unused locals

9 years agomod_s2s_auth_certs: Pick a logging function once and stick with it
Kim Alvefur [Fri, 25 Jul 2014 19:03:16 +0000 (21:03 +0200)]
mod_s2s_auth_certs: Pick a logging function once and stick with it

9 years agomod_s2s_auth_certs: Split PKIX based certificate checking from mod_s2s into new plugin
Kim Alvefur [Fri, 25 Jul 2014 18:41:54 +0000 (20:41 +0200)]
mod_s2s_auth_certs: Split PKIX based certificate checking from mod_s2s into new plugin

9 years agomod_muc/muc.lib: Remove is_anonymous from event (fix for ec57067c1e0d)
Matthew Wild [Fri, 25 Jul 2014 17:34:43 +0000 (18:34 +0100)]
mod_muc/muc.lib: Remove is_anonymous from event (fix for ec57067c1e0d)

9 years agomod_muc/muc.lib: Pass all info to muc-broadcast-presence handlers that would be requi...
Matthew Wild [Fri, 25 Jul 2014 17:32:15 +0000 (18:32 +0100)]
mod_muc/muc.lib: Pass all info to muc-broadcast-presence handlers that would be required to use room:build_item_list() - useful for plugins

9 years agoMerge 0.10->trunk
Matthew Wild [Fri, 25 Jul 2014 12:54:47 +0000 (13:54 +0100)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Matthew Wild [Fri, 25 Jul 2014 12:54:27 +0000 (13:54 +0100)]
Merge 0.9->0.10

9 years agonet.server_select/event: Switch sender mode to *a when reading, to make sure we get...
Matthew Wild [Fri, 25 Jul 2014 12:53:39 +0000 (13:53 +0100)]
net.server_select/event: Switch sender mode to *a when reading, to make sure we get all available data

9 years agoMerge 0.10->trunk
Matthew Wild [Fri, 25 Jul 2014 12:02:46 +0000 (13:02 +0100)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Matthew Wild [Fri, 25 Jul 2014 12:01:57 +0000 (13:01 +0100)]
Merge 0.9->0.10

9 years agomod_admin_telnet: Fix dns:(add,set)nameservers()
Kim Alvefur [Fri, 25 Jul 2014 11:59:17 +0000 (13:59 +0200)]
mod_admin_telnet: Fix dns:(add,set)nameservers()

9 years agonet.dns: Remove unused obsolete code
Matthew Wild [Fri, 25 Jul 2014 11:54:31 +0000 (12:54 +0100)]
net.dns: Remove unused obsolete code

9 years agonet.dns: Ensure all pending requests get notified of a timeout when looking up a...
Matthew Wild [Fri, 25 Jul 2014 11:08:07 +0000 (12:08 +0100)]
net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb)