prosody.git
10 years agoMerge 0.9->0.10
Matthew Wild [Sat, 9 Nov 2013 18:36:32 +0000 (18:36 +0000)]
Merge 0.9->0.10

10 years agocertmanager: Fix order of options, so that the dynamic option is at the end of the...
Matthew Wild [Sat, 9 Nov 2013 17:54:21 +0000 (17:54 +0000)]
certmanager: Fix order of options, so that the dynamic option is at the end of the array

10 years agocertmanager: Default to using the server's cipher preference order by default, as...
Matthew Wild [Sat, 9 Nov 2013 17:50:19 +0000 (17:50 +0000)]
certmanager: Default to using the server's cipher preference order by default, as clients have been shown to commonly select weak and insecure ciphers even when they support stronger ones

10 years agomod_storage_sql2: Fix backwards comparison of timestamp
Kim Alvefur [Thu, 7 Nov 2013 16:18:20 +0000 (17:18 +0100)]
mod_storage_sql2: Fix backwards comparison of timestamp

10 years agoMerge 0.9 -> 0.10
Kim Alvefur [Thu, 31 Oct 2013 19:47:57 +0000 (20:47 +0100)]
Merge 0.9 -> 0.10

10 years agocertmanager: Disable SSLv3 by default
Kim Alvefur [Thu, 31 Oct 2013 18:00:36 +0000 (19:00 +0100)]
certmanager: Disable SSLv3 by default

10 years agomod_storage_sql2: Switch to the util.sql table definition for the main table
Kim Alvefur [Wed, 30 Oct 2013 23:53:59 +0000 (00:53 +0100)]
mod_storage_sql2: Switch to the util.sql table definition for the main table

10 years agomod_storage_sql2: The prosodyarchive_index should be unique
Kim Alvefur [Wed, 30 Oct 2013 21:37:07 +0000 (22:37 +0100)]
mod_storage_sql2: The prosodyarchive_index should be unique

10 years agomod_storage_sql2: Use primary_key and auto_increment flags instead of baking that...
Kim Alvefur [Wed, 30 Oct 2013 21:27:22 +0000 (22:27 +0100)]
mod_storage_sql2: Use primary_key and auto_increment flags instead of baking that into the type

10 years agomod_storage_sql2: Use MEDIUMTEXT fields for value columns (ie TEXT on non-MySQL)
Kim Alvefur [Wed, 30 Oct 2013 13:33:15 +0000 (14:33 +0100)]
mod_storage_sql2: Use MEDIUMTEXT fields for value columns (ie TEXT on non-MySQL)

10 years agoutil.sql: Rewrite MEDIUMTEXT to TEXT for drivers other than MySQL
Kim Alvefur [Wed, 30 Oct 2013 09:24:35 +0000 (10:24 +0100)]
util.sql: Rewrite MEDIUMTEXT to TEXT for drivers other than MySQL

10 years agoutil.sql: Check what encoding SQLite3 uses
Kim Alvefur [Tue, 29 Oct 2013 10:43:49 +0000 (11:43 +0100)]
util.sql: Check what encoding SQLite3 uses

10 years agoutil.sql: Find out if MySQL supports utf8mb4 and use that
Kim Alvefur [Tue, 29 Oct 2013 10:42:55 +0000 (11:42 +0100)]
util.sql: Find out if MySQL supports utf8mb4 and use that

10 years agoutil.sql: Support incrementing columns
Kim Alvefur [Mon, 28 Oct 2013 22:20:25 +0000 (23:20 +0100)]
util.sql: Support incrementing columns

10 years agoutil.sql: Allow columns to be marked the primary key
Kim Alvefur [Mon, 28 Oct 2013 22:19:47 +0000 (23:19 +0100)]
util.sql: Allow columns to be marked the primary key

10 years agoutil.sql: Allow creating unique indices
Kim Alvefur [Mon, 28 Oct 2013 22:18:54 +0000 (23:18 +0100)]
util.sql: Allow creating unique indices

10 years agomod_storage_sql2: Move checking of the sql_manage_tables option so it also includes...
Kim Alvefur [Mon, 28 Oct 2013 21:08:46 +0000 (22:08 +0100)]
mod_storage_sql2: Move checking of the sql_manage_tables option so it also includes table upgrades (again)

10 years agomod_storage_sql2, util.sql: Move code for setting encoding to util.sql
Kim Alvefur [Mon, 28 Oct 2013 21:07:16 +0000 (22:07 +0100)]
mod_storage_sql2, util.sql: Move code for setting encoding to util.sql

10 years agomod_storage_sql2: Move all schema upgrade code to the same place
Kim Alvefur [Mon, 28 Oct 2013 20:37:30 +0000 (21:37 +0100)]
mod_storage_sql2: Move all schema upgrade code to the same place

10 years agomod_storage_sql2: Split up setting of encoding and table upgrade code
Kim Alvefur [Mon, 28 Oct 2013 20:34:55 +0000 (21:34 +0100)]
mod_storage_sql2: Split up setting of encoding and table upgrade code

10 years agocertmanager: Fix. Again.
Kim Alvefur [Tue, 15 Oct 2013 08:47:34 +0000 (10:47 +0200)]
certmanager: Fix. Again.

10 years agocertmanager: Add back single_dh_use and single_ecdh_use to default options (Zash...
Kim Alvefur [Mon, 14 Oct 2013 23:37:16 +0000 (01:37 +0200)]
certmanager: Add back single_dh_use and single_ecdh_use to default options (Zash breaks, Zash unbreaks)

10 years agoutil.sasl.scram: Rename variable for clarity
Kim Alvefur [Sat, 12 Oct 2013 23:43:04 +0000 (01:43 +0200)]
util.sasl.scram: Rename variable for clarity

10 years agoutil.sasl.scram: Cache profile name instead of concatenating when used
Kim Alvefur [Sat, 12 Oct 2013 23:36:28 +0000 (01:36 +0200)]
util.sasl.scram: Cache profile name instead of concatenating when used

10 years agoutil.sasl.scram: Rewrite patterns and capture client-first-message-bare, client-final...
Kim Alvefur [Sat, 12 Oct 2013 23:14:21 +0000 (01:14 +0200)]
util.sasl.scram: Rewrite patterns and capture client-first-message-bare, client-final-message-without-proof

10 years agoutil.sasl.scram: Create the state table as late as possible, keep state in locals...
Kim Alvefur [Sat, 12 Oct 2013 22:29:47 +0000 (00:29 +0200)]
util.sasl.scram: Create the state table as late as possible, keep state in locals for faster access

10 years agoutil.sasl.scram: Compare gs2-header to cbind-input (Thanks Tobias)
Kim Alvefur [Sat, 12 Oct 2013 19:15:36 +0000 (21:15 +0200)]
util.sasl.scram: Compare gs2-header to cbind-input (Thanks Tobias)

10 years agoMerge 0.9->0.10
Matthew Wild [Thu, 10 Oct 2013 21:26:41 +0000 (22:26 +0100)]
Merge 0.9->0.10

10 years agoutil.windows: Incorrect output buffer size passed to ReadConsoleOutputAttribute ...
Waqas Hussain [Thu, 10 Oct 2013 21:18:16 +0000 (17:18 -0400)]
util.windows: Incorrect output buffer size passed to ReadConsoleOutputAttribute (fixes issue#362, thanks yanjun).

10 years agoutil.sasl: Remove unused print() import.
Waqas Hussain [Mon, 7 Oct 2013 22:02:58 +0000 (18:02 -0400)]
util.sasl: Remove unused print() import.

10 years agoutil.sasl: Make registerMechanism a public function (again)
Waqas Hussain [Mon, 7 Oct 2013 21:57:06 +0000 (17:57 -0400)]
util.sasl: Make registerMechanism a public function (again)

10 years agomod_saslauth: Collect data for channel binding only if we know for sure that the...
Kim Alvefur [Mon, 7 Oct 2013 10:56:21 +0000 (12:56 +0200)]
mod_saslauth: Collect data for channel binding only if we know for sure that the stream is encrypted

10 years agomod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways mean encry...
Kim Alvefur [Mon, 7 Oct 2013 10:43:00 +0000 (12:43 +0200)]
mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways mean encrypted (eg consider_bosh_secure)

10 years agoutil.array: Improve array:reverse() and make it work as both method and non-mutating...
Kim Alvefur [Sun, 6 Oct 2013 21:18:54 +0000 (23:18 +0200)]
util.array: Improve array:reverse() and make it work as both method and non-mutating function

10 years agoutil.sasl.scram: Remove unused function and import
Kim Alvefur [Sun, 6 Oct 2013 21:17:05 +0000 (23:17 +0200)]
util.sasl.scram: Remove unused function and import

10 years agoMerge 0.9->0.10
Matthew Wild [Sat, 5 Oct 2013 16:15:25 +0000 (12:15 -0400)]
Merge 0.9->0.10

10 years agomuc.lib.lua: Fix Spark jabber client not displaying conference room lists, seemingly...
Paul [Sat, 5 Oct 2013 16:11:16 +0000 (17:11 +0100)]
muc.lib.lua: Fix Spark jabber client not displaying conference room lists, seemingly due to a missing value tag for the room description if the description has not been set

10 years agoMerge 0.9->0.10
Matthew Wild [Mon, 30 Sep 2013 22:46:38 +0000 (23:46 +0100)]
Merge 0.9->0.10

10 years agoutil.filters: Fix inserting items so that higher priority filters run first
Kim Alvefur [Mon, 30 Sep 2013 19:51:42 +0000 (21:51 +0200)]
util.filters: Fix inserting items so that higher priority filters run first

10 years agomod_storage_sql2: Add method for deleting items from archives with same syntax as...
Kim Alvefur [Sat, 28 Sep 2013 20:04:04 +0000 (22:04 +0200)]
mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()

10 years agomod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur [Sat, 28 Sep 2013 19:58:01 +0000 (21:58 +0200)]
mod_storage_sql2: Split out code for building WHERE clauses into separate functions

10 years agoserver_select: fix onreadtimeout support so that listeners can override the default...
Matthew Wild [Sat, 28 Sep 2013 17:40:48 +0000 (18:40 +0100)]
server_select: fix onreadtimeout support so that listeners can override the default (disconnect) behaviour

10 years agoutil.x509: Only compare identity with oid-on-xmppAddr for XMPP services
Kim Alvefur [Thu, 26 Sep 2013 14:55:39 +0000 (16:55 +0200)]
util.x509: Only compare identity with oid-on-xmppAddr for XMPP services

10 years agoutil.sasl.scram: Simplify validation of client-first-message
Kim Alvefur [Sun, 22 Sep 2013 02:29:27 +0000 (04:29 +0200)]
util.sasl.scram: Simplify validation of client-first-message

10 years agoMerge Tobias SCRAM-PLUS work
Kim Alvefur [Sat, 21 Sep 2013 22:44:20 +0000 (00:44 +0200)]
Merge Tobias SCRAM-PLUS work

10 years agoBackout ae48bf828f21
Kim Alvefur [Sat, 21 Sep 2013 22:37:04 +0000 (00:37 +0200)]
Backout ae48bf828f21

10 years agoMerge 0.9->trunk
Matthew Wild [Mon, 16 Sep 2013 17:41:30 +0000 (18:41 +0100)]
Merge 0.9->trunk

10 years agomoduleapi: Add module:unhook()
Matthew Wild [Mon, 16 Sep 2013 17:41:09 +0000 (18:41 +0100)]
moduleapi: Add module:unhook()

10 years agoTagging 0.9.1
Matthew Wild [Mon, 9 Sep 2013 10:32:03 +0000 (11:32 +0100)]
Tagging 0.9.1

10 years agonet.server_select: Return handler from addclient
Kim Alvefur [Fri, 6 Sep 2013 08:53:04 +0000 (10:53 +0200)]
net.server_select: Return handler from addclient

10 years agonet.server_select: Pass on all arguments to addclient on to wrapclient
Kim Alvefur [Fri, 6 Sep 2013 08:52:37 +0000 (10:52 +0200)]
net.server_select: Pass on all arguments to addclient on to wrapclient

10 years agocertmanager: Allow for specifying the dhparam option as a path to a file instead...
Kim Alvefur [Tue, 3 Sep 2013 13:43:59 +0000 (15:43 +0200)]
certmanager: Allow for specifying the dhparam option as a path to a file instead of a callback

10 years agoMerge 0.9->trunk
Kim Alvefur [Tue, 3 Sep 2013 11:43:39 +0000 (13:43 +0200)]
Merge 0.9->trunk

10 years agocertmanager: Fix dhparam callback, missing imports (Testing, pfft)
Kim Alvefur [Tue, 3 Sep 2013 11:40:29 +0000 (13:40 +0200)]
certmanager: Fix dhparam callback, missing imports (Testing, pfft)

10 years agoMerge 0.9->trunk
Matthew Wild [Tue, 3 Sep 2013 11:32:18 +0000 (12:32 +0100)]
Merge 0.9->trunk

10 years agomod_admin_adhoc: As the only user of set:items(), update... it's now an iterator...
Matthew Wild [Tue, 3 Sep 2013 11:22:22 +0000 (12:22 +0100)]
mod_admin_adhoc: As the only user of set:items(), update... it's now an iterator, and the extra keys() iterator is now unnecessary

10 years agoutil.set: :items() now returns an iterator instead of the underlying table. This...
Matthew Wild [Tue, 3 Sep 2013 11:21:43 +0000 (12:21 +0100)]
util.set: :items() now returns an iterator instead of the underlying table. This is much more efficient than 'for item in set' (which still works for now). Current access to _items is generally done directly, this may change.

10 years agocertmanager: Allow for specifying the dhparam option as a path to a file instead...
Kim Alvefur [Tue, 3 Sep 2013 11:13:31 +0000 (13:13 +0200)]
certmanager: Allow for specifying the dhparam option as a path to a file instead of a callback

10 years agocertmanager: Fix for working around a bug with LuaSec 0.4.1 that causes it to not...
Matthew Wild [Tue, 3 Sep 2013 11:11:11 +0000 (12:11 +0100)]
certmanager: Fix for working around a bug with LuaSec 0.4.1 that causes it to not honour the 'ciphers' option. This change will apply 0.9's default cipher string for LuaSec 0.4.1 users.

10 years agoMerge 0.9->trunk
Matthew Wild [Mon, 2 Sep 2013 23:20:28 +0000 (00:20 +0100)]
Merge 0.9->trunk

10 years agoutil.set: Fix :include() and :exclude() methods to iterate the input set correctly
Matthew Wild [Mon, 2 Sep 2013 19:52:19 +0000 (20:52 +0100)]
util.set: Fix :include() and :exclude() methods to iterate the input set correctly

10 years agoutil.pposix: Fix building on non-Linux with glibc
Kim Alvefur [Mon, 2 Sep 2013 16:19:38 +0000 (18:19 +0200)]
util.pposix: Fix building on non-Linux with glibc

10 years agoprosodyctl: check: Support for unicode (IDN) domains (thanks once again albert)
Matthew Wild [Mon, 2 Sep 2013 14:22:41 +0000 (15:22 +0100)]
prosodyctl: check: Support for unicode (IDN) domains (thanks once again albert)

10 years agoconfigmanager: Fix checking of absolute paths on Windows
Kim Alvefur [Fri, 30 Aug 2013 16:51:55 +0000 (18:51 +0200)]
configmanager: Fix checking of absolute paths on Windows

10 years agoutil.net: Fix s2sout on Windows (return 0.0.0.0 and :: instead of an empty list)
Kim Alvefur [Fri, 30 Aug 2013 14:14:31 +0000 (16:14 +0200)]
util.net: Fix s2sout on Windows (return 0.0.0.0 and :: instead of an empty list)

10 years agomod_muc: Support for locking newly-created rooms until they are configured (enabled...
Matthew Wild [Fri, 30 Aug 2013 13:15:29 +0000 (14:15 +0100)]
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)

10 years agomod_muc: Import util.array
Matthew Wild [Fri, 30 Aug 2013 13:10:51 +0000 (14:10 +0100)]
mod_muc: Import util.array

10 years agoprosody.cfg.lua.dist: Set c2s_require_encryption = true
Matthew Wild [Thu, 29 Aug 2013 10:59:27 +0000 (11:59 +0100)]
prosody.cfg.lua.dist: Set c2s_require_encryption = true

10 years agoMerge 0.9->trunk
Matthew Wild [Sat, 24 Aug 2013 22:16:08 +0000 (23:16 +0100)]
Merge 0.9->trunk

10 years agomod_pep: Update COMPAT comment, it seems Asterisk 1.8 also suffers from this issue...
Matthew Wild [Sat, 24 Aug 2013 22:15:24 +0000 (23:15 +0100)]
mod_pep: Update COMPAT comment, it seems Asterisk 1.8 also suffers from this issue (thanks Lonnie Abelbeck)

10 years agoAdded tag 0.9.0 for changeset 6ef79af0c445
Matthew Wild [Mon, 19 Aug 2013 19:36:04 +0000 (20:36 +0100)]
Added tag 0.9.0 for changeset 6ef79af0c445

10 years agomod_c2s: Move another log message to debug level
Kim Alvefur [Wed, 14 Aug 2013 13:38:56 +0000 (15:38 +0200)]
mod_c2s: Move another log message to debug level

10 years agomod_c2s, mod_s2s: Log cipher and encryption info in a more compact and (hopefully...
Kim Alvefur [Wed, 14 Aug 2013 13:00:36 +0000 (15:00 +0200)]
mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and (hopefully) less confusing way

10 years agomod_s2s: Captitalize log messages that begin with a stream direction
Kim Alvefur [Wed, 14 Aug 2013 12:53:50 +0000 (14:53 +0200)]
mod_s2s: Captitalize log messages that begin with a stream direction

10 years agomod_s2s: Lower "Beginning new connection attempt" message from info to debug level
Kim Alvefur [Wed, 14 Aug 2013 12:44:56 +0000 (14:44 +0200)]
mod_s2s: Lower "Beginning new connection attempt" message from info to debug level

10 years agomod_s2s/s2sout.lib: Improve error message logged at 'info' level when failing to...
Matthew Wild [Tue, 13 Aug 2013 23:18:39 +0000 (00:18 +0100)]
mod_s2s/s2sout.lib: Improve error message logged at 'info' level when failing to connect to a host. Now 'Failed in all attempts to connect to XYZ'

10 years agoutil.async: Make guarder() local
Matthew Wild [Tue, 13 Aug 2013 22:38:50 +0000 (23:38 +0100)]
util.async: Make guarder() local

10 years agoutil.async: Add guarder method, to create guards to ensure only a single runner can...
Matthew Wild [Tue, 13 Aug 2013 20:26:53 +0000 (21:26 +0100)]
util.async: Add guarder method, to create guards to ensure only a single runner can pass through a section of code at a time

10 years agousermanager: Remove unused import of pairs()
Matthew Wild [Tue, 13 Aug 2013 18:38:05 +0000 (19:38 +0100)]
usermanager: Remove unused import of pairs()

10 years agoutil.async: Fix logic bug that prevented error watcher being called for runners
Matthew Wild [Tue, 13 Aug 2013 18:23:00 +0000 (19:23 +0100)]
util.async: Fix logic bug that prevented error watcher being called for runners

10 years agoutil.async: waiter: Throw error if done() called too many times
Kim Alvefur [Mon, 12 Aug 2013 11:22:27 +0000 (13:22 +0200)]
util.async: waiter: Throw error if done() called too many times

10 years agoutil.async: waiter: Remove restriction about wait() being called before done()
Matthew Wild [Mon, 12 Aug 2013 11:08:51 +0000 (12:08 +0100)]
util.async: waiter: Remove restriction about wait() being called before done()

10 years agoutil.async: runner: Fix check for new state to recognise transition to 'waiting'
Matthew Wild [Mon, 12 Aug 2013 10:50:27 +0000 (11:50 +0100)]
util.async: runner: Fix check for new state to recognise transition to 'waiting'

10 years agoutil.async: Make functions local
Matthew Wild [Mon, 12 Aug 2013 09:27:08 +0000 (10:27 +0100)]
util.async: Make functions local

10 years agomod_c2s: Port coroutine code to util.async
Matthew Wild [Sun, 11 Aug 2013 13:46:27 +0000 (14:46 +0100)]
mod_c2s: Port coroutine code to util.async

10 years agoutil.async: New library to provide support around coroutine-based non-blocking functions
Matthew Wild [Sun, 11 Aug 2013 13:46:07 +0000 (14:46 +0100)]
util.async: New library to provide support around coroutine-based non-blocking functions

10 years agoutil.debug: Fix level of locals when inspecting a coroutine
Matthew Wild [Sun, 11 Aug 2013 09:42:58 +0000 (10:42 +0100)]
util.debug: Fix level of locals when inspecting a coroutine

10 years agoutil.debug: Further fix to display locals in extended tracebacks
Matthew Wild [Sat, 10 Aug 2013 19:40:45 +0000 (20:40 +0100)]
util.debug: Further fix to display locals in extended tracebacks

10 years agoutil.debug: Fixes to make coroutine tracebacks work properly
Matthew Wild [Sat, 10 Aug 2013 19:30:40 +0000 (20:30 +0100)]
util.debug: Fixes to make coroutine tracebacks work properly

10 years agomod_auth_internal_hashed: Log calls to provider methods and be consistent with mod_au...
Kim Alvefur [Sat, 10 Aug 2013 18:19:40 +0000 (20:19 +0200)]
mod_auth_internal_hashed: Log calls to provider methods and be consistent with mod_auth_internal_plain

10 years agomod_auth_internal_hashed: Use logger setup by moduleapi instead of going for util...
Kim Alvefur [Sat, 10 Aug 2013 18:17:45 +0000 (20:17 +0200)]
mod_auth_internal_hashed: Use logger setup by moduleapi instead of going for util.logger directly

10 years agomod_auth_internal_hashed: Remove this 'initializing' message too
Kim Alvefur [Sat, 10 Aug 2013 18:15:25 +0000 (20:15 +0200)]
mod_auth_internal_hashed: Remove this 'initializing' message too

10 years agomod_auth_internal_plain: Remove "initializing" log message, hostmanager logs this too
Kim Alvefur [Sat, 10 Aug 2013 18:10:30 +0000 (20:10 +0200)]
mod_auth_internal_plain: Remove "initializing" log message, hostmanager logs this too

10 years agomod_auth_internal_plain: Log a debug message when changing password to be consistent...
Kim Alvefur [Sat, 10 Aug 2013 18:09:33 +0000 (20:09 +0200)]
mod_auth_internal_plain: Log a debug message when changing password to be consistent with the other methods

10 years agomod_auth_internal_plain: Remove redundant hostname from log messages
Kim Alvefur [Sat, 10 Aug 2013 18:06:51 +0000 (20:06 +0200)]
mod_auth_internal_plain: Remove redundant hostname from log messages

10 years agomod_dialback: Change level of some log statements to be more appropriate
Kim Alvefur [Sat, 10 Aug 2013 17:53:22 +0000 (19:53 +0200)]
mod_dialback: Change level of some log statements to be more appropriate

10 years agoutil.pposix: Fix overflow in rlimit argument conversion (thanks gcc, now be quiet...
Kim Alvefur [Sat, 10 Aug 2013 17:02:52 +0000 (19:02 +0200)]
util.pposix: Fix overflow in rlimit argument conversion (thanks gcc, now be quiet please)

10 years agoRemove all trailing whitespace
Florian Zeitz [Fri, 9 Aug 2013 15:48:21 +0000 (17:48 +0200)]
Remove all trailing whitespace

10 years agoMerge 0.9->trunk
Kim Alvefur [Fri, 9 Aug 2013 14:03:48 +0000 (16:03 +0200)]
Merge 0.9->trunk

10 years agoutil.hashes: Silence compiler warning about pointer signedness
Kim Alvefur [Fri, 9 Aug 2013 14:03:17 +0000 (16:03 +0200)]
util.hashes: Silence compiler warning about pointer signedness