Matthew Wild [Sun, 12 Jan 2014 11:19:37 +0000 (06:19 -0500)]
Merge 0.9->0.10
Matthew Wild [Sun, 12 Jan 2014 11:17:40 +0000 (06:17 -0500)]
Tagging 0.9.3
Matthew Wild [Sun, 12 Jan 2014 11:16:49 +0000 (06:16 -0500)]
mod_tls: Log error when TLS initialization fails
Florian Zeitz [Sun, 5 Jan 2014 21:21:50 +0000 (22:21 +0100)]
mod_s2s: Include IP in log messages, if host is unavailable
Waqas Hussain [Fri, 3 Jan 2014 20:52:52 +0000 (15:52 -0500)]
tools/migration/migrator/prosody_files: Fix undefined global access of ?error?, print the actual error message and correct file path in the error message when we fail to load a file, skip broken files instead of failing migration.
Kim Alvefur [Wed, 18 Dec 2013 17:36:54 +0000 (18:36 +0100)]
Merge 0.9->0.10
Kim Alvefur [Wed, 18 Dec 2013 17:35:35 +0000 (18:35 +0100)]
mod_component: Enable TCP keepalives on component streams
Kim Alvefur [Wed, 18 Dec 2013 17:34:22 +0000 (18:34 +0100)]
mod_component: Decrease priority of component auth hook
Matthew Wild [Mon, 16 Dec 2013 23:32:11 +0000 (23:32 +0000)]
Merge 0.9->0.10
Matthew Wild [Mon, 16 Dec 2013 23:31:43 +0000 (23:31 +0000)]
net.server_select: Don't remove the socket from sendlist when we might have data in the buffer (we'll now let sendbuffer() take care of that) (thanks daurnimator)
Matthew Wild [Mon, 16 Dec 2013 23:24:16 +0000 (23:24 +0000)]
net.http: assert() for socket creation success so it doesn't silently fail (thanks daurnimator)
Matthew Wild [Mon, 16 Dec 2013 02:04:16 +0000 (02:04 +0000)]
Merge 0.9->0.10
Matthew Wild [Mon, 16 Dec 2013 02:03:35 +0000 (02:03 +0000)]
util.jid: Strip trailing '.' when normalizing hostnames
Kim Alvefur [Sat, 14 Dec 2013 16:25:17 +0000 (17:25 +0100)]
mod_muc: Remove extra parenthesis (thanks janhouse)
Kim Alvefur [Sat, 14 Dec 2013 16:25:17 +0000 (17:25 +0100)]
mod_muc: Remove extra parenthesis (thanks janhouse)
Matthew Wild [Fri, 13 Dec 2013 12:52:39 +0000 (12:52 +0000)]
Merge 0.9->0.10
Matthew Wild [Fri, 13 Dec 2013 12:52:03 +0000 (12:52 +0000)]
mod_muc: Allow admins to always bypass restrict_room_creation (thanks Chris B)
Kim Alvefur [Fri, 13 Dec 2013 09:25:40 +0000 (10:25 +0100)]
prosody: Store the config file name so the same file can be used when reloading
Matthew Wild [Wed, 11 Dec 2013 22:31:48 +0000 (22:31 +0000)]
Merge 0.9->0.10
Matthew Wild [Wed, 4 Dec 2013 15:06:48 +0000 (15:06 +0000)]
Tagging 0.9.2 (again)
Kim Alvefur [Sat, 30 Nov 2013 21:26:20 +0000 (22:26 +0100)]
Makefile, configure: Add option for disabling generation of example certificates
Matthew Wild [Fri, 29 Nov 2013 20:11:06 +0000 (20:11 +0000)]
Merge 0.9->0.10
Matthew Wild [Fri, 29 Nov 2013 20:10:13 +0000 (20:10 +0000)]
Tagging 0.9.2
Kim Alvefur [Thu, 28 Nov 2013 15:17:21 +0000 (16:17 +0100)]
Merge 0.9->0.10
Kim Alvefur [Thu, 28 Nov 2013 15:12:40 +0000 (16:12 +0100)]
util.pposix: Verify that file handle is open
Kim Alvefur [Sun, 24 Nov 2013 13:24:21 +0000 (14:24 +0100)]
Merge 0.9->0.10
Kim Alvefur [Fri, 22 Nov 2013 14:27:21 +0000 (15:27 +0100)]
Makefile, certs: Generate example certificates on build, remove the old static one
Matthew Wild [Thu, 21 Nov 2013 02:14:23 +0000 (02:14 +0000)]
Merge 0.9->0.10
Matthew Wild [Thu, 21 Nov 2013 02:11:09 +0000 (02:11 +0000)]
certmanager: Further cipher string tweaking. Re-enable ciphers required for DSA and ECDH certs/keys.
Kim Alvefur [Tue, 12 Nov 2013 10:38:52 +0000 (11:38 +0100)]
util.sql: Fix previous commit
Kim Alvefur [Tue, 12 Nov 2013 10:13:45 +0000 (11:13 +0100)]
util.sql: Get character set info from the correct database.
Matthew Wild [Tue, 12 Nov 2013 02:23:02 +0000 (02:23 +0000)]
Merge 0.9->0.10
Matthew Wild [Tue, 12 Nov 2013 02:13:01 +0000 (02:13 +0000)]
Back out
1b0ac7950129, as SSLv3 appears to still be in moderate use on the network. Also, although obsolete, SSLv3 isn't documented to have any weaknesses that TLS 1.0 (the most common version used today) doesn't also have. Get your act together clients!
Kim Alvefur [Mon, 11 Nov 2013 22:15:26 +0000 (23:15 +0100)]
mod_storage_sql2: Auto increment columns won't be NULL, so drop nullable=false
Kim Alvefur [Mon, 11 Nov 2013 22:09:18 +0000 (23:09 +0100)]
util.sql: Rewrite auto increment columns to SERIAL for PostgreSQL
Matthew Wild [Sun, 10 Nov 2013 23:10:27 +0000 (23:10 +0000)]
util.sql: Fix to call execute on 'self' rather than 'engine' (thanks eisensheng)
Matthew Wild [Sun, 10 Nov 2013 18:49:34 +0000 (18:49 +0000)]
Merge 0.9->0.10
Matthew Wild [Sun, 10 Nov 2013 18:46:48 +0000 (18:46 +0000)]
certmanager: Update default cipher string to prefer forward-secrecy over cipher strength and to disable triple-DES (weaker and much slower than AES)
Matthew Wild [Sun, 10 Nov 2013 16:43:10 +0000 (16:43 +0000)]
util.set: Remove unused variable
Matthew Wild [Sat, 9 Nov 2013 18:36:32 +0000 (18:36 +0000)]
Merge 0.9->0.10
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
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
Kim Alvefur [Thu, 7 Nov 2013 16:18:20 +0000 (17:18 +0100)]
mod_storage_sql2: Fix backwards comparison of timestamp
Kim Alvefur [Thu, 31 Oct 2013 19:47:57 +0000 (20:47 +0100)]
Merge 0.9 -> 0.10
Kim Alvefur [Thu, 31 Oct 2013 18:00:36 +0000 (19:00 +0100)]
certmanager: Disable SSLv3 by default
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
Kim Alvefur [Wed, 30 Oct 2013 21:37:07 +0000 (22:37 +0100)]
mod_storage_sql2: The prosodyarchive_index should be unique
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
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)
Kim Alvefur [Wed, 30 Oct 2013 09:24:35 +0000 (10:24 +0100)]
util.sql: Rewrite MEDIUMTEXT to TEXT for drivers other than MySQL
Kim Alvefur [Tue, 29 Oct 2013 10:43:49 +0000 (11:43 +0100)]
util.sql: Check what encoding SQLite3 uses
Kim Alvefur [Tue, 29 Oct 2013 10:42:55 +0000 (11:42 +0100)]
util.sql: Find out if MySQL supports utf8mb4 and use that
Kim Alvefur [Mon, 28 Oct 2013 22:20:25 +0000 (23:20 +0100)]
util.sql: Support incrementing columns
Kim Alvefur [Mon, 28 Oct 2013 22:19:47 +0000 (23:19 +0100)]
util.sql: Allow columns to be marked the primary key
Kim Alvefur [Mon, 28 Oct 2013 22:18:54 +0000 (23:18 +0100)]
util.sql: Allow creating unique indices
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)
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
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
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
Kim Alvefur [Tue, 15 Oct 2013 08:47:34 +0000 (10:47 +0200)]
certmanager: Fix. Again.
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)
Kim Alvefur [Sat, 12 Oct 2013 23:43:04 +0000 (01:43 +0200)]
util.sasl.scram: Rename variable for clarity
Kim Alvefur [Sat, 12 Oct 2013 23:36:28 +0000 (01:36 +0200)]
util.sasl.scram: Cache profile name instead of concatenating when used
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
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
Kim Alvefur [Sat, 12 Oct 2013 19:15:36 +0000 (21:15 +0200)]
util.sasl.scram: Compare gs2-header to cbind-input (Thanks Tobias)
Matthew Wild [Thu, 10 Oct 2013 21:26:41 +0000 (22:26 +0100)]
Merge 0.9->0.10
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).
Waqas Hussain [Mon, 7 Oct 2013 22:02:58 +0000 (18:02 -0400)]
util.sasl: Remove unused print() import.
Waqas Hussain [Mon, 7 Oct 2013 21:57:06 +0000 (17:57 -0400)]
util.sasl: Make registerMechanism a public function (again)
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
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)
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
Kim Alvefur [Sun, 6 Oct 2013 21:17:05 +0000 (23:17 +0200)]
util.sasl.scram: Remove unused function and import
Matthew Wild [Sat, 5 Oct 2013 16:15:25 +0000 (12:15 -0400)]
Merge 0.9->0.10
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
Matthew Wild [Mon, 30 Sep 2013 22:46:38 +0000 (23:46 +0100)]
Merge 0.9->0.10
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
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()
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
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
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
Kim Alvefur [Sun, 22 Sep 2013 02:29:27 +0000 (04:29 +0200)]
util.sasl.scram: Simplify validation of client-first-message
Kim Alvefur [Sat, 21 Sep 2013 22:44:20 +0000 (00:44 +0200)]
Merge Tobias SCRAM-PLUS work
Kim Alvefur [Sat, 21 Sep 2013 22:37:04 +0000 (00:37 +0200)]
Matthew Wild [Mon, 16 Sep 2013 17:41:30 +0000 (18:41 +0100)]
Merge 0.9->trunk
Matthew Wild [Mon, 16 Sep 2013 17:41:09 +0000 (18:41 +0100)]
moduleapi: Add module:unhook()
Matthew Wild [Mon, 9 Sep 2013 10:32:03 +0000 (11:32 +0100)]
Tagging 0.9.1
Kim Alvefur [Fri, 6 Sep 2013 08:53:04 +0000 (10:53 +0200)]
net.server_select: Return handler from addclient
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
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
Kim Alvefur [Tue, 3 Sep 2013 11:43:39 +0000 (13:43 +0200)]
Merge 0.9->trunk
Kim Alvefur [Tue, 3 Sep 2013 11:40:29 +0000 (13:40 +0200)]
certmanager: Fix dhparam callback, missing imports (Testing, pfft)
Matthew Wild [Tue, 3 Sep 2013 11:32:18 +0000 (12:32 +0100)]
Merge 0.9->trunk
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
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.
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
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.
Matthew Wild [Mon, 2 Sep 2013 23:20:28 +0000 (00:20 +0100)]
Merge 0.9->trunk
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