prosody.git
10 years agoMerge 0.9->0.10
Kim Alvefur [Thu, 6 Feb 2014 09:48:41 +0000 (10:48 +0100)]
Merge 0.9->0.10

10 years agomod_motd: Strip indentation only, leave multiple newlines
Kim Alvefur [Thu, 6 Feb 2014 09:44:21 +0000 (10:44 +0100)]
mod_motd: Strip indentation only, leave multiple newlines

10 years agoMerge 0.9->0.10
Kim Alvefur [Mon, 3 Feb 2014 06:23:33 +0000 (07:23 +0100)]
Merge 0.9->0.10

10 years agomod_c2s: Break out stream opening into a separate function
Florian Zeitz [Fri, 31 Jan 2014 11:01:12 +0000 (12:01 +0100)]
mod_c2s: Break out stream opening into a separate function

10 years agoMUC: Tag PMs with <x>, like presence stanzas
Kim Alvefur [Tue, 28 Jan 2014 18:21:21 +0000 (19:21 +0100)]
MUC: Tag PMs with <x>, like presence stanzas

10 years agotools/ejabberd2prosody: Handle new room member format.
Kim Alvefur [Mon, 27 Jan 2014 15:47:54 +0000 (16:47 +0100)]
tools/ejabberd2prosody: Handle new room member format.

10 years agomodulemanager: Always load a platform-specific module, add stub modules for Windows...
Kim Alvefur [Sun, 26 Jan 2014 20:16:24 +0000 (21:16 +0100)]
modulemanager: Always load a platform-specific module, add stub modules for Windows and unknown platforms

10 years agomod_posix: Daemonize by default only when installed
Kim Alvefur [Sun, 26 Jan 2014 17:35:03 +0000 (18:35 +0100)]
mod_posix: Daemonize by default only when installed

10 years agoMerge 0.9->0.10
Matthew Wild [Tue, 21 Jan 2014 03:24:40 +0000 (03:24 +0000)]
Merge 0.9->0.10

10 years agomod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given
Kim Alvefur [Tue, 21 Jan 2014 00:51:13 +0000 (01:51 +0100)]
mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given

10 years agomod_storage_sql2: Fix another SQL syntax error that slipped trough
Kim Alvefur [Mon, 20 Jan 2014 23:51:31 +0000 (00:51 +0100)]
mod_storage_sql2: Fix another SQL syntax error that slipped trough

10 years agotools/ejabberd2prosody: Disable generating a config, as the format it generates is...
Waqas Hussain [Sat, 18 Jan 2014 22:26:02 +0000 (17:26 -0500)]
tools/ejabberd2prosody: Disable generating a config, as the format it generates is completely out of date.

10 years agotools/ejabberd2prosody: ?xmlelement? can be ?xmlel? in newer ejabberd (thanks cr).
Waqas Hussain [Sat, 18 Jan 2014 22:24:10 +0000 (17:24 -0500)]
tools/ejabberd2prosody: ?xmlelement? can be ?xmlel? in newer ejabberd (thanks cr).

10 years agoMUC: Fire muc-room-destroyed event when the last participant leaves a non-persistent...
Kim Alvefur [Sat, 18 Jan 2014 19:14:05 +0000 (20:14 +0100)]
MUC: Fire muc-room-destroyed event when the last participant leaves a non-persistent room

10 years agoMerge 0.9->0.10
Matthew Wild [Sat, 18 Jan 2014 18:46:12 +0000 (18:46 +0000)]
Merge 0.9->0.10

10 years agomod_storage_sql2: Fix SQL syntax
Kim Alvefur [Sat, 18 Jan 2014 18:33:33 +0000 (19:33 +0100)]
mod_storage_sql2: Fix SQL syntax

10 years agoMUC: Expose room metatable on module
Kim Alvefur [Sat, 18 Jan 2014 17:28:50 +0000 (18:28 +0100)]
MUC: Expose room metatable on module

10 years agoMUC: Split out sending of the topic into method separate from sending history
Kim Alvefur [Sat, 18 Jan 2014 17:11:13 +0000 (18:11 +0100)]
MUC: Split out sending of the topic into method separate from sending history

10 years agoMUC: Split saving to history into a separate method
Kim Alvefur [Sat, 18 Jan 2014 17:05:42 +0000 (18:05 +0100)]
MUC: Split saving to history into a separate method

10 years agotools/ejabberd2prosody: Add support for importing MUC rooms.
Waqas Hussain [Sat, 18 Jan 2014 15:37:12 +0000 (10:37 -0500)]
tools/ejabberd2prosody: Add support for importing MUC rooms.

10 years agotools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors.
Waqas Hussain [Thu, 16 Jan 2014 19:03:27 +0000 (14:03 -0500)]
tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors.

10 years agoMerge
Matthew Wild [Sun, 12 Jan 2014 11:19:55 +0000 (06:19 -0500)]
Merge

10 years agoMerge 0.9->0.10
Matthew Wild [Sun, 12 Jan 2014 11:19:37 +0000 (06:19 -0500)]
Merge 0.9->0.10

10 years agoTagging 0.9.3
Matthew Wild [Sun, 12 Jan 2014 11:17:40 +0000 (06:17 -0500)]
Tagging 0.9.3

10 years agomod_tls: Log error when TLS initialization fails
Matthew Wild [Sun, 12 Jan 2014 11:16:49 +0000 (06:16 -0500)]
mod_tls: Log error when TLS initialization fails

10 years agomod_storage_sql2: Fix syntax error in subquery (Thanks Lance)
Kim Alvefur [Sun, 5 Jan 2014 22:38:34 +0000 (23:38 +0100)]
mod_storage_sql2: Fix syntax error in subquery (Thanks Lance)

10 years agomod_s2s: Include IP in log messages, if host is unavailable
Florian Zeitz [Sun, 5 Jan 2014 21:21:50 +0000 (22:21 +0100)]
mod_s2s: Include IP in log messages, if host is unavailable

10 years agotools/migration/migrator/prosody_files: Fix undefined global access of ?error?, print...
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.

10 years agoutil.pubsub: Separate data from node configuration
Kim Alvefur [Mon, 30 Dec 2013 22:49:23 +0000 (23:49 +0100)]
util.pubsub: Separate data from node configuration

10 years agoutil.pubsub: Fire events on more actions
Kim Alvefur [Thu, 26 Dec 2013 17:14:34 +0000 (18:14 +0100)]
util.pubsub: Fire events on more actions

10 years agomod_pubsub: Don't sent error replies from service disco events, let mod_disco handle...
Kim Alvefur [Mon, 30 Dec 2013 20:49:17 +0000 (21:49 +0100)]
mod_pubsub: Don't sent error replies from service disco events, let mod_disco handle that

10 years agomod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. Conflicting...
Kim Alvefur [Wed, 25 Dec 2013 21:37:52 +0000 (22:37 +0100)]
mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. Conflicting items are removed.

10 years agomod_storage_sql2: Include user, host and store in id lookup
Kim Alvefur [Wed, 25 Dec 2013 14:28:55 +0000 (15:28 +0100)]
mod_storage_sql2: Include user, host and store in id lookup

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.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 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 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.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.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.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.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.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.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 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.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 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 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.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.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)