prosody.git
8 years agoMUC: Return item-not-found as error when attempting to change role of non-existant...
Kim Alvefur [Tue, 19 Apr 2016 16:43:15 +0000 (18:43 +0200)]
MUC: Return item-not-found as error when attempting to change role of non-existant occupant

8 years agoMerge 0.10->trunk
Kim Alvefur [Tue, 19 Apr 2016 16:23:44 +0000 (18:23 +0200)]
Merge 0.10->trunk

8 years agoMerge 0.9->0.10
Kim Alvefur [Tue, 19 Apr 2016 16:23:02 +0000 (18:23 +0200)]
Merge 0.9->0.10

8 years agonet.server_event: Return the correct value as timeout
Kim Alvefur [Tue, 19 Apr 2016 16:20:39 +0000 (18:20 +0200)]
net.server_event: Return the correct value as timeout

8 years agonet.server_event: Fix traceback if event re-added during starttls
Kim Alvefur [Tue, 19 Apr 2016 16:18:57 +0000 (18:18 +0200)]
net.server_event: Fix traceback if event re-added during starttls

8 years agomod_bosh: Add annotations to ignore unused arguments [luacheck]
Kim Alvefur [Tue, 19 Apr 2016 16:00:04 +0000 (18:00 +0200)]
mod_bosh: Add annotations to ignore unused arguments [luacheck]

8 years agomod_bosh: Remove unused imports (also mistake in merge)
Kim Alvefur [Tue, 19 Apr 2016 15:59:49 +0000 (17:59 +0200)]
mod_bosh: Remove unused imports (also mistake in merge)

8 years agomod_bosh: Fix imports that got lost in merge
Kim Alvefur [Tue, 19 Apr 2016 15:59:22 +0000 (17:59 +0200)]
mod_bosh: Fix imports that got lost in merge

8 years agoMerge 0.10->trunk
Kim Alvefur [Tue, 19 Apr 2016 15:44:11 +0000 (17:44 +0200)]
Merge 0.10->trunk

8 years agomod_bosh: Don't decrement rid twice (thanks av6)
Kim Alvefur [Tue, 19 Apr 2016 15:44:04 +0000 (17:44 +0200)]
mod_bosh: Don't decrement rid twice (thanks av6)

8 years agoMerge 0.10->trunk
Kim Alvefur [Tue, 19 Apr 2016 15:32:22 +0000 (17:32 +0200)]
Merge 0.10->trunk

8 years agoMerge 0.9->0.10
Kim Alvefur [Tue, 19 Apr 2016 15:30:30 +0000 (17:30 +0200)]
Merge 0.9->0.10

8 years agonet.server_event: Re-add write event if writebuffer is non-empty after write (eg...
Kim Alvefur [Tue, 19 Apr 2016 15:24:00 +0000 (17:24 +0200)]
net.server_event: Re-add write event if writebuffer is non-empty after write (eg due to writes from ondrain callback) (fixes #661)

8 years agoMUC: Accept missing form as "instant room" request (fixes #377)
Kim Alvefur [Tue, 19 Apr 2016 15:20:39 +0000 (17:20 +0200)]
MUC: Accept missing form as "instant room" request (fixes #377)

8 years agoMerge 0.10->trunk
Kim Alvefur [Tue, 19 Apr 2016 15:10:42 +0000 (17:10 +0200)]
Merge 0.10->trunk

8 years agomod_bosh: Reject fractional 'wait' (See #343)
Kim Alvefur [Tue, 19 Apr 2016 10:33:58 +0000 (12:33 +0200)]
mod_bosh: Reject fractional 'wait' (See #343)

8 years agomod_bosh: Return a proper BOSH error response from XML parse error callback (see...
Kim Alvefur [Tue, 19 Apr 2016 10:19:15 +0000 (12:19 +0200)]
mod_bosh: Return a proper BOSH error response from XML parse error callback (see #343)

8 years agomod_bosh: Validate that 'sid' and 'wait' have sane values (fixes #475, also see ...
Kim Alvefur [Tue, 19 Apr 2016 10:18:19 +0000 (12:18 +0200)]
mod_bosh: Validate that 'sid' and 'wait' have sane values (fixes #475, also see #343)

8 years agomod_bosh: Validate 'to' host (see #343)
Kim Alvefur [Tue, 19 Apr 2016 10:17:00 +0000 (12:17 +0200)]
mod_bosh: Validate 'to' host (see #343)

8 years agomod_bosh: Return a proper BOSH error response instead of deprecated(?) status code...
Kim Alvefur [Tue, 19 Apr 2016 10:16:17 +0000 (12:16 +0200)]
mod_bosh: Return a proper BOSH error response instead of deprecated(?) status code (See #343)

8 years agomod_bosh: Log error returned from stream:feed()
Kim Alvefur [Tue, 19 Apr 2016 10:15:20 +0000 (12:15 +0200)]
mod_bosh: Log error returned from stream:feed()

8 years agomod_bosh: Return if a response has been sent already (See #343)
Kim Alvefur [Tue, 19 Apr 2016 10:14:07 +0000 (12:14 +0200)]
mod_bosh: Return if a response has been sent already (See #343)

8 years agomod_bosh: Remove unused import
Kim Alvefur [Tue, 19 Apr 2016 10:13:03 +0000 (12:13 +0200)]
mod_bosh: Remove unused import

8 years agoCHANGES: Update for MUC changes
Kim Alvefur [Mon, 18 Apr 2016 19:27:13 +0000 (21:27 +0200)]
CHANGES: Update for MUC changes

8 years agoMUC: Store rooms on disk on shutdown
Kim Alvefur [Mon, 18 Apr 2016 18:32:48 +0000 (20:32 +0200)]
MUC: Store rooms on disk on shutdown

8 years agoMUC: Cache public rooms and their names to speed up disco#items
Kim Alvefur [Mon, 18 Apr 2016 17:19:33 +0000 (19:19 +0200)]
MUC: Cache public rooms and their names to speed up disco#items

8 years agoMUC: Switch to util.cache for storing rooms, store rooms to disk on eviction
Kim Alvefur [Mon, 18 Apr 2016 17:18:37 +0000 (19:18 +0200)]
MUC: Switch to util.cache for storing rooms, store rooms to disk on eviction

8 years agoMUC: Add support for serializing live rooms, including occupants and their presence
Kim Alvefur [Mon, 18 Apr 2016 17:30:15 +0000 (19:30 +0200)]
MUC: Add support for serializing live rooms, including occupants and their presence

8 years agoMUC: Flatten format of serialized rooms
Kim Alvefur [Mon, 18 Apr 2016 17:29:23 +0000 (19:29 +0200)]
MUC: Flatten format of serialized rooms

8 years agoMUC: Move room deserialization to muc.lib
Kim Alvefur [Mon, 18 Apr 2016 17:26:26 +0000 (19:26 +0200)]
MUC: Move room deserialization to muc.lib

8 years agoMUC: Wrap "support" for the groupchat 1.0 join protocol in a config option to allow...
Kim Alvefur [Mon, 18 Apr 2016 17:20:51 +0000 (19:20 +0200)]
MUC: Wrap "support" for the groupchat 1.0 join protocol in a config option to allow disabling

8 years agoMUC/subject: Fix reference to room for save call (self, not room)
Kim Alvefur [Mon, 18 Apr 2016 17:09:10 +0000 (19:09 +0200)]
MUC/subject: Fix reference to room for save call (self, not room)

8 years agoMUC: Save yourself! (fixes reference to current room)
Kim Alvefur [Mon, 18 Apr 2016 17:08:31 +0000 (19:08 +0200)]
MUC: Save yourself! (fixes reference to current room)

8 years agoMUC: Assign occupants unavailable presence on room destruction, fixes destruction...
Kim Alvefur [Mon, 18 Apr 2016 14:51:09 +0000 (16:51 +0200)]
MUC: Assign occupants unavailable presence on room destruction, fixes destruction notification

8 years agoMUC: Use config passed to rew_roow()
Kim Alvefur [Mon, 18 Apr 2016 12:54:01 +0000 (14:54 +0200)]
MUC: Use config passed to rew_roow()

8 years agoMerge with Link Mauve
Kim Alvefur [Sun, 17 Apr 2016 20:28:48 +0000 (22:28 +0200)]
Merge with Link Mauve

8 years agoMUC: Move 'preserialization' step to muc.lib
Kim Alvefur [Sun, 17 Apr 2016 20:09:44 +0000 (22:09 +0200)]
MUC: Move 'preserialization' step to muc.lib

8 years agoUpdate every link to the documentation to use HTTPS
Emmanuel Gil Peyrot [Sat, 16 Apr 2016 20:08:05 +0000 (21:08 +0100)]
Update every link to the documentation to use HTTPS

8 years agomod_pubsub: Don?t require util.dataforms twice
Emmanuel Gil Peyrot [Sat, 16 Apr 2016 19:56:47 +0000 (20:56 +0100)]
mod_pubsub: Don?t require util.dataforms twice

8 years agoMUC: Save room after subject is changed
Kim Alvefur [Fri, 15 Apr 2016 16:03:55 +0000 (18:03 +0200)]
MUC: Save room after subject is changed

8 years agoMerge 0.10->trunk
Kim Alvefur [Fri, 15 Apr 2016 11:39:56 +0000 (13:39 +0200)]
Merge 0.10->trunk

8 years agoutil.iterators: Add iterator wrapper that works like select(n, ...) applied to origin...
Kim Alvefur [Fri, 15 Apr 2016 11:20:31 +0000 (13:20 +0200)]
util.iterators: Add iterator wrapper that works like select(n, ...) applied to original iterator

8 years agoutil.cache: Add method for iterating over values
Kim Alvefur [Fri, 15 Apr 2016 11:19:20 +0000 (13:19 +0200)]
util.cache: Add method for iterating over values

8 years agoMUC: Save room to storage once after form processing, not in each individual setter
Kim Alvefur [Fri, 15 Apr 2016 09:50:55 +0000 (11:50 +0200)]
MUC: Save room to storage once after form processing, not in each individual setter

8 years agoMUC: Provide a noop stub room:save() method
Kim Alvefur [Thu, 14 Apr 2016 19:23:09 +0000 (21:23 +0200)]
MUC: Provide a noop stub room:save() method

8 years agoutil.iterators: Normalize indentation
Kim Alvefur [Wed, 13 Apr 2016 18:00:41 +0000 (20:00 +0200)]
util.iterators: Normalize indentation

8 years agoMUC: Move history to room._history
Kim Alvefur [Tue, 12 Apr 2016 17:35:55 +0000 (19:35 +0200)]
MUC: Move history to room._history

8 years agomod_compression: Remove and replace with placeholder that logs an error
Matthew Wild [Sat, 9 Apr 2016 18:21:05 +0000 (19:21 +0100)]
mod_compression: Remove and replace with placeholder that logs an error

8 years agoMerge 0.10->trunk
Kim Alvefur [Fri, 8 Apr 2016 15:54:50 +0000 (17:54 +0200)]
Merge 0.10->trunk

8 years agoMUC: Include originating session and stanza in events
Kim Alvefur [Fri, 8 Apr 2016 15:54:46 +0000 (17:54 +0200)]
MUC: Include originating session and stanza in events

8 years agoMUC: Spread event tables over multiple lines
Kim Alvefur [Fri, 8 Apr 2016 15:53:49 +0000 (17:53 +0200)]
MUC: Spread event tables over multiple lines

8 years agomod_presence: Fix variable name
Kim Alvefur [Fri, 8 Apr 2016 15:14:58 +0000 (17:14 +0200)]
mod_presence: Fix variable name

8 years agomod_presence: Construct a 'from' JID when roster items are removed outside of a session
Kim Alvefur [Fri, 8 Apr 2016 14:35:23 +0000 (16:35 +0200)]
mod_presence: Construct a 'from' JID when roster items are removed outside of a session

8 years agoMerge 0.10->trunk
Kim Alvefur [Thu, 7 Apr 2016 11:36:58 +0000 (13:36 +0200)]
Merge 0.10->trunk

8 years agomoduleapi: Allow an origin session to be passed to module:send()
Kim Alvefur [Wed, 6 Apr 2016 19:29:30 +0000 (21:29 +0200)]
moduleapi: Allow an origin session to be passed to module:send()

8 years agoMerge 0.10->trunk
Kim Alvefur [Wed, 6 Apr 2016 12:50:34 +0000 (14:50 +0200)]
Merge 0.10->trunk

8 years agomod_websocket: Fix read timeout handler (thanks mt)
Kim Alvefur [Wed, 6 Apr 2016 12:44:51 +0000 (14:44 +0200)]
mod_websocket: Fix read timeout handler (thanks mt)

8 years agoMerge 0.10->trunk
Kim Alvefur [Tue, 5 Apr 2016 18:54:43 +0000 (20:54 +0200)]
Merge 0.10->trunk

8 years agoserver_event: Split long list of assignments into multiple lines for readability
Kim Alvefur [Tue, 5 Apr 2016 18:41:50 +0000 (20:41 +0200)]
server_event: Split long list of assignments into multiple lines for readability

8 years agoserver_event: Fix indentation (again)
Kim Alvefur [Tue, 5 Apr 2016 18:39:36 +0000 (20:39 +0200)]
server_event: Fix indentation (again)

8 years agoMerge 0.10->trunk
Kim Alvefur [Tue, 5 Apr 2016 10:48:36 +0000 (12:48 +0200)]
Merge 0.10->trunk

8 years agomod_roster: Fire event for pending items for good measure
Kim Alvefur [Mon, 4 Apr 2016 19:48:42 +0000 (21:48 +0200)]
mod_roster: Fire event for pending items for good measure

8 years agomod_roster: Handle roster item removal with event on user deletion
Kim Alvefur [Mon, 4 Apr 2016 15:18:27 +0000 (17:18 +0200)]
mod_roster: Handle roster item removal with event on user deletion

8 years agomod_presence: Send unavailable presence when roster items are removed (fixes #331)
Kim Alvefur [Mon, 4 Apr 2016 15:15:47 +0000 (17:15 +0200)]
mod_presence: Send unavailable presence when roster items are removed (fixes #331)

8 years agomod_presence, mod_roster: Move responsibility for sending presence on roster removal...
Kim Alvefur [Mon, 4 Apr 2016 15:15:10 +0000 (17:15 +0200)]
mod_presence, mod_roster: Move responsibility for sending presence on roster removal to mod_presence

8 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 3 Apr 2016 13:53:00 +0000 (15:53 +0200)]
Merge 0.10->trunk

8 years agoMerge 0.9->0.10
Kim Alvefur [Sun, 3 Apr 2016 13:52:40 +0000 (15:52 +0200)]
Merge 0.9->0.10

8 years agomod_c2s: Just destroy the session when it has no connection (see #641)
Kim Alvefur [Sun, 3 Apr 2016 13:18:21 +0000 (15:18 +0200)]
mod_c2s: Just destroy the session when it has no connection (see #641)

8 years agoMerge 0.10->trunk
Kim Alvefur [Sat, 2 Apr 2016 15:13:12 +0000 (17:13 +0200)]
Merge 0.10->trunk

8 years agomod_bosh: Skip sending stanzas removed out by filters (fixes #657)
Kim Alvefur [Fri, 1 Apr 2016 16:56:26 +0000 (18:56 +0200)]
mod_bosh: Skip sending stanzas removed out by filters (fixes #657)

8 years agostoragemanager: Capitalize log message
Kim Alvefur [Fri, 1 Apr 2016 13:56:12 +0000 (15:56 +0200)]
storagemanager: Capitalize log message

8 years agoMerge 0.10->trunk
Kim Alvefur [Tue, 29 Mar 2016 13:38:14 +0000 (15:38 +0200)]
Merge 0.10->trunk

8 years agoMerge 0.10->trunk
Matthew Wild [Sat, 26 Mar 2016 20:17:59 +0000 (20:17 +0000)]
Merge 0.10->trunk

8 years agocertmanager: Explicitly tonumber() version number segments before doing arithmetic...
Matthew Wild [Sat, 26 Mar 2016 19:55:08 +0000 (19:55 +0000)]
certmanager: Explicitly tonumber() version number segments before doing arithmetic and avoid relying on implicit coercion (thanks David Favro)

8 years agoMerge 0.10->trunk
Kim Alvefur [Sat, 26 Mar 2016 13:54:39 +0000 (14:54 +0100)]
Merge 0.10->trunk

8 years agoutil.sql: Log errors in transaction to error level with traceback but return only...
Kim Alvefur [Fri, 25 Mar 2016 15:09:34 +0000 (16:09 +0100)]
util.sql: Log errors in transaction to error level with traceback but return only error message (fixes #464)

8 years agoMerge 0.10->trunk
Kim Alvefur [Thu, 24 Mar 2016 12:57:58 +0000 (13:57 +0100)]
Merge 0.10->trunk

8 years agomod_websocket: Send a ping on read timeout
Kim Alvefur [Wed, 23 Mar 2016 22:21:03 +0000 (23:21 +0100)]
mod_websocket: Send a ping on read timeout

8 years agomod_websocket: Remove warning about unsolicited pong frames "MAY be sent unsolicited...
Kim Alvefur [Wed, 23 Mar 2016 13:31:35 +0000 (14:31 +0100)]
mod_websocket: Remove warning about unsolicited pong frames "MAY be sent unsolicited" per RFC 6455 (thanks mt)

8 years agoMerge 0.10->trunk
Matthew Wild [Wed, 23 Mar 2016 12:19:23 +0000 (12:19 +0000)]
Merge 0.10->trunk

8 years agoutil.sql: Charset should be innocent until proven guilty (initialize charset_ok to...
Matthew Wild [Wed, 23 Mar 2016 12:17:28 +0000 (12:17 +0000)]
util.sql: Charset should be innocent until proven guilty (initialize charset_ok to true), fixes bug introduced in 187ba2e9c012

8 years agoprosodyctl: Only use host part of JIDs eg components that have node parts (thanks...
Kim Alvefur [Tue, 22 Mar 2016 13:42:55 +0000 (14:42 +0100)]
prosodyctl: Only use host part of JIDs eg components that have node parts (thanks suzyo)

8 years agoMerge 0.10->trunk
Matthew Wild [Mon, 21 Mar 2016 21:05:15 +0000 (21:05 +0000)]
Merge 0.10->trunk

8 years agoutil.iterators: Fix use of incorrect variable accidentally introduced in a9ef93bc81d9
Matthew Wild [Mon, 21 Mar 2016 21:04:14 +0000 (21:04 +0000)]
util.iterators: Fix use of incorrect variable accidentally introduced in a9ef93bc81d9

8 years agoMerge 0.10->trunk
Kim Alvefur [Mon, 21 Mar 2016 13:52:43 +0000 (14:52 +0100)]
Merge 0.10->trunk

8 years agoCHANGES: Move async to trunk, it was dropped from 0.10
Kim Alvefur [Mon, 21 Mar 2016 11:10:10 +0000 (12:10 +0100)]
CHANGES: Move async to trunk, it was dropped from 0.10

8 years agoutil.sql: Catch errors from LuaDBI connect (Fixes #568)
Kim Alvefur [Mon, 21 Mar 2016 08:50:52 +0000 (09:50 +0100)]
util.sql: Catch errors from LuaDBI connect (Fixes #568)

8 years agomod_storage_sql: Make sure all serialization errors are propagated
Kim Alvefur [Mon, 21 Mar 2016 08:33:12 +0000 (09:33 +0100)]
mod_storage_sql: Make sure all serialization errors are propagated

8 years agoMerge 0.10->trunk
Kim Alvefur [Sat, 19 Mar 2016 21:46:41 +0000 (22:46 +0100)]
Merge 0.10->trunk

8 years agomodulemanager: Silence log message about attempts to load already loaded modules...
Kim Alvefur [Sat, 19 Mar 2016 15:35:43 +0000 (16:35 +0100)]
modulemanager: Silence log message about attempts to load already loaded modules for shared modules

8 years agoMerge 0.10->trunk
Matthew Wild [Fri, 18 Mar 2016 14:03:35 +0000 (14:03 +0000)]
Merge 0.10->trunk

8 years agomod_component: Some cleanup [luacheck]
Matthew Wild [Fri, 18 Mar 2016 14:03:14 +0000 (14:03 +0000)]
mod_component: Some cleanup [luacheck]

8 years agomod_component: Fire event when component disconnects
Matthew Wild [Fri, 18 Mar 2016 13:58:55 +0000 (13:58 +0000)]
mod_component: Fire event when component disconnects

8 years agoMerge
Kim Alvefur [Fri, 18 Mar 2016 10:55:40 +0000 (11:55 +0100)]
Merge

8 years agomod_saslauth: Disable DIGEST-MD5 by default (closes #515)
Kim Alvefur [Fri, 18 Mar 2016 10:51:58 +0000 (11:51 +0100)]
mod_saslauth: Disable DIGEST-MD5 by default (closes #515)

8 years agoprosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading...
Matthew Wild [Fri, 18 Mar 2016 10:24:46 +0000 (10:24 +0000)]
prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308.

8 years agoutil.jid+tests: Add simple helpers... node(), host() and resource() for extracting...
Matthew Wild [Thu, 17 Mar 2016 23:15:08 +0000 (23:15 +0000)]
util.jid+tests: Add simple helpers... node(), host() and resource() for extracting specific parts of a JID

8 years agoMerge 0.10->trunk
Kim Alvefur [Thu, 17 Mar 2016 23:08:58 +0000 (00:08 +0100)]
Merge 0.10->trunk

8 years agomod_websocket: Make sure stanza xmlns filter runs late in the chain
Kim Alvefur [Thu, 17 Mar 2016 23:08:33 +0000 (00:08 +0100)]
mod_websocket: Make sure stanza xmlns filter runs late in the chain

8 years agomod_register: Make sure only an on_evict function or nil is passed to util.cache
Kim Alvefur [Thu, 17 Mar 2016 21:25:56 +0000 (22:25 +0100)]
mod_register: Make sure only an on_evict function or nil is passed to util.cache