prosody.git
10 years agonet/server_select: addclient: Check for failure correctly; remove wrapconnection...
daurnimator [Wed, 18 Dec 2013 22:54:31 +0000 (17:54 -0500)]
net/server_select: addclient: Check for failure correctly; remove wrapconnection call on failure

10 years agonet/server_event: add_client should have same arguments no-matter the server backend
daurnimator [Wed, 18 Dec 2013 22:52:28 +0000 (17:52 -0500)]
net/server_event: add_client should have same arguments no-matter the server backend

10 years agonet/server_select: Check arguments to add_server correctly
daurnimator [Wed, 18 Dec 2013 22:51:27 +0000 (17:51 -0500)]
net/server_select: Check arguments to add_server correctly

10 years agonet/server_select: pcall require ssl (easy to forget to require ssl)
daurnimator [Wed, 18 Dec 2013 22:50:38 +0000 (17:50 -0500)]
net/server_select: pcall require ssl (easy to forget to require ssl)

10 years agoMerge 0.10->trunk
Kim Alvefur [Wed, 18 Dec 2013 17:37:38 +0000 (18:37 +0100)]
Merge 0.10->trunk

10 years agoMerge 0.9->0.10
Kim Alvefur [Wed, 18 Dec 2013 17:36:54 +0000 (18:36 +0100)]
Merge 0.9->0.10

10 years agomod_component: Enable TCP keepalives on component streams
Kim Alvefur [Wed, 18 Dec 2013 17:35:35 +0000 (18:35 +0100)]
mod_component: Enable TCP keepalives on component streams

10 years agomod_component: Decrease priority of component auth hook
Kim Alvefur [Wed, 18 Dec 2013 17:34:22 +0000 (18:34 +0100)]
mod_component: Decrease priority of component auth hook

10 years agoMerge 0.10->trunk
Matthew Wild [Mon, 16 Dec 2013 23:32:29 +0000 (23:32 +0000)]
Merge 0.10->trunk

10 years agoMerge 0.9->0.10
Matthew Wild [Mon, 16 Dec 2013 23:32:11 +0000 (23:32 +0000)]
Merge 0.9->0.10

10 years agonet.server_select: Don't remove the socket from sendlist when we might have data...
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)

10 years agonet.http: assert() for socket creation success so it doesn't silently fail (thanks...
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)

10 years agoMerge with trunk
Matthew Wild [Mon, 16 Dec 2013 02:05:16 +0000 (02:05 +0000)]
Merge with trunk

10 years agoMerge 0.10->trunk
Matthew Wild [Mon, 16 Dec 2013 02:04:43 +0000 (02:04 +0000)]
Merge 0.10->trunk

10 years agoMerge 0.9->0.10
Matthew Wild [Mon, 16 Dec 2013 02:04:16 +0000 (02:04 +0000)]
Merge 0.9->0.10

10 years agoutil.jid: Strip trailing '.' when normalizing hostnames
Matthew Wild [Mon, 16 Dec 2013 02:03:35 +0000 (02:03 +0000)]
util.jid: Strip trailing '.' when normalizing hostnames

10 years agoMerge 0.10->trunk
Kim Alvefur [Sat, 14 Dec 2013 16:25:55 +0000 (17:25 +0100)]
Merge 0.10->trunk

10 years agomod_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)

10 years agomod_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)

10 years agoMerge 0.10->trunk
Matthew Wild [Fri, 13 Dec 2013 12:53:14 +0000 (12:53 +0000)]
Merge 0.10->trunk

10 years agoMerge 0.9->0.10
Matthew Wild [Fri, 13 Dec 2013 12:52:39 +0000 (12:52 +0000)]
Merge 0.9->0.10

10 years agomod_muc: Allow admins to always bypass restrict_room_creation (thanks Chris B)
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)

10 years agoprosody: Store the config file name so the same file can be used when reloading
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

10 years agoMerge 0.10->trunk
Matthew Wild [Wed, 11 Dec 2013 22:32:17 +0000 (22:32 +0000)]
Merge 0.10->trunk

10 years agoMerge 0.9->0.10
Matthew Wild [Wed, 11 Dec 2013 22:31:48 +0000 (22:31 +0000)]
Merge 0.9->0.10

10 years agoTagging 0.9.2 (again)
Matthew Wild [Wed, 4 Dec 2013 15:06:48 +0000 (15:06 +0000)]
Tagging 0.9.2 (again)

10 years agoMakefile, configure: Add option for disabling generation of example certificates
Kim Alvefur [Sat, 30 Nov 2013 21:26:20 +0000 (22:26 +0100)]
Makefile, configure: Add option for disabling generation of example certificates

10 years agoMerge 0.10->trunk
Matthew Wild [Fri, 29 Nov 2013 20:11:53 +0000 (20:11 +0000)]
Merge 0.10->trunk

10 years agoMerge 0.9->0.10
Matthew Wild [Fri, 29 Nov 2013 20:11:06 +0000 (20:11 +0000)]
Merge 0.9->0.10

10 years agoTagging 0.9.2
Matthew Wild [Fri, 29 Nov 2013 20:10:13 +0000 (20:10 +0000)]
Tagging 0.9.2

10 years agoMerge 0.10->trunk
Kim Alvefur [Thu, 28 Nov 2013 15:17:51 +0000 (16:17 +0100)]
Merge 0.10->trunk

10 years agoMerge 0.9->0.10
Kim Alvefur [Thu, 28 Nov 2013 15:17:21 +0000 (16:17 +0100)]
Merge 0.9->0.10

10 years agoutil.pposix: Verify that file handle is open
Kim Alvefur [Thu, 28 Nov 2013 15:12:40 +0000 (16:12 +0100)]
util.pposix: Verify that file handle is open

10 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 24 Nov 2013 13:24:53 +0000 (14:24 +0100)]
Merge 0.10->trunk

10 years agoMerge 0.9->0.10
Kim Alvefur [Sun, 24 Nov 2013 13:24:21 +0000 (14:24 +0100)]
Merge 0.9->0.10

10 years agoMakefile, certs: Generate example certificates on build, remove the old static one
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

10 years agoMerge 0.10->trunk
Matthew Wild [Thu, 21 Nov 2013 02:15:36 +0000 (02:15 +0000)]
Merge 0.10->trunk

10 years agoMerge 0.9->0.10
Matthew Wild [Thu, 21 Nov 2013 02:14:23 +0000 (02:14 +0000)]
Merge 0.9->0.10

10 years agocertmanager: Further cipher string tweaking. Re-enable ciphers required for DSA and...
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.

10 years agoMerge 0.10->trunk
Kim Alvefur [Wed, 13 Nov 2013 10:59:43 +0000 (11:59 +0100)]
Merge 0.10->trunk

10 years agoutil.sql: Fix previous commit
Kim Alvefur [Tue, 12 Nov 2013 10:38:52 +0000 (11:38 +0100)]
util.sql: Fix previous commit

10 years agoutil.sql: Get character set info from the correct database.
Kim Alvefur [Tue, 12 Nov 2013 10:13:45 +0000 (11:13 +0100)]
util.sql: Get character set info from the correct database.

10 years agoMerge 0.10->trunk
Matthew Wild [Tue, 12 Nov 2013 02:23:29 +0000 (02:23 +0000)]
Merge 0.10->trunk

10 years agoMerge 0.9->0.10
Matthew Wild [Tue, 12 Nov 2013 02:23:02 +0000 (02:23 +0000)]
Merge 0.9->0.10

10 years agoBack out 1b0ac7950129, as SSLv3 appears to still be in moderate use on the network...
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!

10 years agoMerge 0.10->trunk
Kim Alvefur [Mon, 11 Nov 2013 22:28:53 +0000 (23:28 +0100)]
Merge 0.10->trunk

10 years agomod_storage_sql2: Auto increment columns won't be NULL, so drop nullable=false
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

10 years agoutil.sql: Rewrite auto increment columns to SERIAL for PostgreSQL
Kim Alvefur [Mon, 11 Nov 2013 22:09:18 +0000 (23:09 +0100)]
util.sql: Rewrite auto increment columns to SERIAL for PostgreSQL

10 years agoMerge 0.10->trunk
Matthew Wild [Sun, 10 Nov 2013 23:10:46 +0000 (23:10 +0000)]
Merge 0.10->trunk

10 years agoutil.sql: Fix to call execute on 'self' rather than 'engine' (thanks eisensheng)
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)

10 years agoMerge 0.10->trunk
Matthew Wild [Sun, 10 Nov 2013 18:50:01 +0000 (18:50 +0000)]
Merge 0.10->trunk

10 years agoMerge 0.9->0.10
Matthew Wild [Sun, 10 Nov 2013 18:49:34 +0000 (18:49 +0000)]
Merge 0.9->0.10

10 years agocertmanager: Update default cipher string to prefer forward-secrecy over cipher stren...
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)

10 years agoutil.set: Remove unused variable
Matthew Wild [Sun, 10 Nov 2013 16:43:10 +0000 (16:43 +0000)]
util.set: Remove unused variable

10 years agoMerge 0.10->trunk
Matthew Wild [Sat, 9 Nov 2013 18:37:13 +0000 (18:37 +0000)]
Merge 0.10->trunk

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 agocore.moduleapi: Fix some global accesses.
Waqas Hussain [Wed, 6 Nov 2013 19:38:51 +0000 (14:38 -0500)]
core.moduleapi: Fix some global accesses.

10 years agocore/moduleapi: Return timer object from module:add_timer
daurnimator [Wed, 6 Nov 2013 17:56:35 +0000 (12:56 -0500)]
core/moduleapi: Return timer object from module:add_timer

10 years agoutil/timer: Re-set params when timer is rescheduled
daurnimator [Wed, 6 Nov 2013 17:56:18 +0000 (12:56 -0500)]
util/timer: Re-set params when timer is rescheduled

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

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 agoutil.timer: Import all require upvalues.
Waqas Hussain [Wed, 30 Oct 2013 21:58:17 +0000 (17:58 -0400)]
util.timer: Import all require upvalues.

10 years agoutil.timer: Fix another variable name typo (thanks again zash).
Waqas Hussain [Wed, 30 Oct 2013 21:56:00 +0000 (17:56 -0400)]
util.timer: Fix another variable name typo (thanks again zash).

10 years agoutil.timer: Fix variable name typo.
Waqas Hussain [Wed, 30 Oct 2013 21:51:37 +0000 (17:51 -0400)]
util.timer: Fix variable name typo.

10 years agoutil.timer: Updated to use util.indexedbheap to provide a more complete API. Timers...
Waqas Hussain [Wed, 30 Oct 2013 21:44:42 +0000 (17:44 -0400)]
util.timer: Updated to use util.indexedbheap to provide a more complete API. Timers can now be stopped or rescheduled. Callbacks are now pcall'd. Adding/removing timers from within timer callbacks works better. Optional parameter can be passed when creating timer which gets passed to callback, eliminating the need for closures in various timer uses. Timers are now much more lightweight.

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 agoutil.indexedbheap: A priority queue implementation with a reverse index with no per...
Waqas Hussain [Wed, 30 Oct 2013 21:30:35 +0000 (17:30 -0400)]
util.indexedbheap: A priority queue implementation with a reverse index with no per-entry memory allocation.

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 agoMerge 0.10->trunk
Kim Alvefur [Tue, 15 Oct 2013 08:48:11 +0000 (10:48 +0200)]
Merge 0.10->trunk

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

10 years agoMerge 0.10->trunk
Kim Alvefur [Mon, 14 Oct 2013 23:38:02 +0000 (01:38 +0200)]
Merge 0.10->trunk

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.10->trunk
Matthew Wild [Thu, 10 Oct 2013 21:27:01 +0000 (22:27 +0100)]
Merge 0.10->trunk

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 agoMerge 0.10->trunk
Kim Alvefur [Mon, 7 Oct 2013 10:56:53 +0000 (12:56 +0200)]
Merge 0.10->trunk

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