prosody.git
10 years agoMerge 0.10->trunk
Kim Alvefur [Sat, 26 Apr 2014 23:02:54 +0000 (01:02 +0200)]
Merge 0.10->trunk

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 agoutil.indexedbheap: Fix a possible traceback when removing the last item.
Waqas Hussain [Wed, 23 Apr 2014 15:38:34 +0000 (11:38 -0400)]
util.indexedbheap: Fix a possible traceback when removing the last item.

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

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 agoMerge daurnimator->trunk
Matthew Wild [Mon, 21 Apr 2014 16:42:44 +0000 (17:42 +0100)]
Merge daurnimator->trunk

10 years agoMerge 0.10->trunk
Kim Alvefur [Mon, 21 Apr 2014 00:43:38 +0000 (02:43 +0200)]
Merge 0.10->trunk

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 agoMerge 0.10->trunk
Kim Alvefur [Sun, 20 Apr 2014 21:39:45 +0000 (23:39 +0200)]
Merge 0.10->trunk

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 agoMerge with daurnimator
Matthew Wild [Thu, 17 Apr 2014 08:01:32 +0000 (09:01 +0100)]
Merge with daurnimator

10 years agoMerge 0.10->trunk
Kim Alvefur [Tue, 15 Apr 2014 19:54:44 +0000 (21:54 +0200)]
Merge 0.10->trunk

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 agoMerge 0.10->trunk
Kim Alvefur [Tue, 15 Apr 2014 18:36:39 +0000 (20:36 +0200)]
Merge 0.10->trunk

10 years agoMerge 0.10->trunk
Matthew Wild [Tue, 15 Apr 2014 17:08:16 +0000 (18:08 +0100)]
Merge 0.10->trunk

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 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 agoMerge 0.10->trunk
Kim Alvefur [Thu, 10 Apr 2014 14:52:03 +0000 (16:52 +0200)]
Merge 0.10->trunk

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.10->trunk
Kim Alvefur [Thu, 10 Apr 2014 11:16:54 +0000 (13:16 +0200)]
Merge 0.10->trunk

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 agoMerge 0.10->trunk
Kim Alvefur [Thu, 3 Apr 2014 21:54:58 +0000 (23:54 +0200)]
Merge 0.10->trunk

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.10->trunk
Matthew Wild [Wed, 2 Apr 2014 16:42:22 +0000 (17:42 +0100)]
Merge 0.10->trunk

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 agoplugins/muc/muc.lib: If decline is to person in room; route to all sessions
daurnimator [Thu, 27 Mar 2014 23:16:46 +0000 (19:16 -0400)]
plugins/muc/muc.lib: If decline is to person in room; route to all sessions

10 years agoplugins/muc/muc.lib: Have timestamp as seconds since epoch inside of history
daurnimator [Thu, 27 Mar 2014 22:10:34 +0000 (18:10 -0400)]
plugins/muc/muc.lib: Have timestamp as seconds since epoch inside of history

10 years agoplugins/muc: Rename admin query hook
daurnimator [Thu, 27 Mar 2014 22:09:42 +0000 (18:09 -0400)]
plugins/muc: Rename admin query hook

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.10->trunk
Kim Alvefur [Tue, 25 Mar 2014 18:18:32 +0000 (19:18 +0100)]
Merge 0.10->trunk

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 agoplugins/muc/muc.lib: Add :broadcast method; use it from :broadcast_except_nick and...
daurnimator [Mon, 24 Mar 2014 20:32:18 +0000 (16:32 -0400)]
plugins/muc/muc.lib: Add :broadcast method; use it from :broadcast_except_nick and :broadcast_message

10 years agoplugins/muc/muc.lib: Extra utility functions around subjects
daurnimator [Mon, 24 Mar 2014 17:36:43 +0000 (13:36 -0400)]
plugins/muc/muc.lib: Extra utility functions around subjects

10 years agoplugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event...
daurnimator [Mon, 24 Mar 2014 17:34:06 +0000 (13:34 -0400)]
plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once

10 years agoplugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history
daurnimator [Mon, 24 Mar 2014 17:10:54 +0000 (13:10 -0400)]
plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history

10 years agoplugins/muc/muc.lib: Better password check
daurnimator [Mon, 24 Mar 2014 16:44:31 +0000 (12:44 -0400)]
plugins/muc/muc.lib: Better password check

10 years agoplugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members...
daurnimator [Mon, 24 Mar 2014 14:25:43 +0000 (10:25 -0400)]
plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members-only, password, nick-conflict and lock checks

This reorders some of the checks.
Importantly; affiliations are checked first: this means banned users cannot try and guess passwords

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 agoplugins/muc/muc.lib: Move password check and nick conflict check into `handle_join`
daurnimator [Fri, 21 Mar 2014 18:01:02 +0000 (14:01 -0400)]
plugins/muc/muc.lib: Move password check and nick conflict check into `handle_join`

10 years agoplugins/muc/muc.lib: Additional `route_to_occupant` usage
daurnimator [Thu, 20 Mar 2014 20:19:13 +0000 (16:19 -0400)]
plugins/muc/muc.lib: Additional `route_to_occupant` usage

10 years agoplugins/muc/muc.lib: Remove duplicate variable; it can never be nil.
daurnimator [Thu, 20 Mar 2014 20:14:22 +0000 (16:14 -0400)]
plugins/muc/muc.lib: Remove duplicate variable; it can never be nil.

10 years agoplugins/muc/muc.lib: Add decline event for parity with invite
daurnimator [Thu, 20 Mar 2014 19:50:29 +0000 (15:50 -0400)]
plugins/muc/muc.lib: Add decline event for parity with invite

10 years agoplugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant...
daurnimator [Thu, 20 Mar 2014 19:22:02 +0000 (15:22 -0400)]
plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant sessions

10 years agoplugins/muc: Have utility methods for locking the room
daurnimator [Thu, 20 Mar 2014 15:06:10 +0000 (11:06 -0400)]
plugins/muc: Have utility methods for locking the room

10 years agoplugins/muc/muc.lib: Use occupant jids when whois == "moderators"
daurnimator [Wed, 19 Mar 2014 21:50:49 +0000 (17:50 -0400)]
plugins/muc/muc.lib: Use occupant jids when whois == "moderators"

10 years agoplugins/muc/muc.lib: Allow users with affiliations to invite while not in room themselves
daurnimator [Wed, 19 Mar 2014 21:50:00 +0000 (17:50 -0400)]
plugins/muc/muc.lib: Allow users with affiliations to invite while not in room themselves

10 years agoplugins/muc/muc.lib: Use `get_role` in `handle_admin_item_get_command`. Removed a...
daurnimator [Wed, 19 Mar 2014 21:46:25 +0000 (17:46 -0400)]
plugins/muc/muc.lib: Use `get_role` in `handle_admin_item_get_command`. Removed a TODO that's already done

10 years agoplugins/muc/muc.lib: Send invite out from event: removes '-prepared' from event name
daurnimator [Wed, 19 Mar 2014 21:33:32 +0000 (17:33 -0400)]
plugins/muc/muc.lib: Send invite out from event: removes '-prepared' from event name

10 years agoplugins/muc/muc.lib: Check role instead of current_nick
daurnimator [Wed, 19 Mar 2014 21:30:21 +0000 (17:30 -0400)]
plugins/muc/muc.lib: Check role instead of current_nick

10 years agoplugins/muc/muc.lib: Remove `payload` argument from `handle_mediated_*`; extract...
daurnimator [Wed, 19 Mar 2014 20:28:11 +0000 (16:28 -0400)]
plugins/muc/muc.lib: Remove `payload` argument from `handle_mediated_*`; extract it from inside.

10 years agoplugins/muc/muc.lib: Fix wrong variable in `construct_stanza_id` block
daurnimator [Wed, 19 Mar 2014 20:24:17 +0000 (16:24 -0400)]
plugins/muc/muc.lib: Fix wrong variable in `construct_stanza_id` block

10 years agoplugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations...
daurnimator [Wed, 19 Mar 2014 20:19:31 +0000 (16:19 -0400)]
plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations in members only rooms

10 years agoplugins/muc/muc.lib: Don't get same variable twice.....
daurnimator [Wed, 19 Mar 2014 19:01:18 +0000 (15:01 -0400)]
plugins/muc/muc.lib: Don't get same variable twice.....

10 years agoplugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick
daurnimator [Wed, 19 Mar 2014 19:00:53 +0000 (15:00 -0400)]
plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick

10 years agoplugins/muc/muc.lib: Fetch config via accessors instead of using `_data`
daurnimator [Wed, 19 Mar 2014 18:39:31 +0000 (14:39 -0400)]
plugins/muc/muc.lib: Fetch config via accessors instead of using `_data`

10 years agoplugins/muc/muc.lib: In `_route_stanza` access occupant data less often
daurnimator [Wed, 19 Mar 2014 18:35:17 +0000 (14:35 -0400)]
plugins/muc/muc.lib: In `_route_stanza` access occupant data less often

10 years agoplugins/muc/muc.lib: Tidy up `get_filtered_presence`
daurnimator [Wed, 19 Mar 2014 18:06:04 +0000 (14:06 -0400)]
plugins/muc/muc.lib: Tidy up `get_filtered_presence`

10 years agoplugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition.
daurnimator [Wed, 19 Mar 2014 17:59:59 +0000 (13:59 -0400)]
plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition.

Also removes `get_error_condition`; it was a one liner used in one place