prosody.git
13 years agocerts/openssl.cnf: Specify output encoding.
Kim Alvefur [Sat, 8 Jan 2011 08:09:19 +0000 (09:09 +0100)]
certs/openssl.cnf: Specify output encoding.

13 years agoMerge 0.8->trunk
Matthew Wild [Fri, 7 Jan 2011 11:59:05 +0000 (11:59 +0000)]
Merge 0.8->trunk

13 years agomod_storage_sql: Make the 'database' value for the SQLite3 driver relative to the...
Matthew Wild [Fri, 7 Jan 2011 11:57:48 +0000 (11:57 +0000)]
mod_storage_sql: Make the 'database' value for the SQLite3 driver relative to the data path

13 years agoprosodyctl: Instead of calling datamanager.set_path(), just ensure prosody.paths...
Matthew Wild [Fri, 7 Jan 2011 11:56:52 +0000 (11:56 +0000)]
prosodyctl: Instead of calling  datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config)

13 years agoprosody: Instead of calling datamanager.set_path(), just ensure prosody.paths.data...
Matthew Wild [Fri, 7 Jan 2011 11:56:15 +0000 (11:56 +0000)]
prosody: Instead of calling  datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config)

13 years agoutil.datamanager: Use prosody.paths.data as the initial value for data_path
Matthew Wild [Fri, 7 Jan 2011 11:55:19 +0000 (11:55 +0000)]
util.datamanager: Use prosody.paths.data as the initial value for data_path

13 years agoMerge 0.8->trunk
Matthew Wild [Fri, 7 Jan 2011 05:11:17 +0000 (05:11 +0000)]
Merge 0.8->trunk

13 years agoprosody.cfg.lua: Give example for logging to console
Matthew Wild [Fri, 7 Jan 2011 05:11:00 +0000 (05:11 +0000)]
prosody.cfg.lua: Give example for logging to console

13 years agoprosody.cfg.lua: Improve comment about enabling debug logging
Matthew Wild [Fri, 7 Jan 2011 05:09:25 +0000 (05:09 +0000)]
prosody.cfg.lua: Improve comment about enabling debug logging

13 years agoprosody.cfg.lua: Add mod_offline to the list of modules that can be disabled, and...
Matthew Wild [Fri, 7 Jan 2011 05:08:09 +0000 (05:08 +0000)]
prosody.cfg.lua: Add mod_offline to the list of modules that can be disabled, and add comments for all auto-loaded modules

13 years agoMerge 0.8->trunk
Matthew Wild [Fri, 7 Jan 2011 04:42:01 +0000 (04:42 +0000)]
Merge 0.8->trunk

13 years agoprosody.cfg.lua.dist: Update to include storage configuration and examples for SQL
Matthew Wild [Fri, 7 Jan 2011 04:41:34 +0000 (04:41 +0000)]
prosody.cfg.lua.dist: Update to include storage configuration and examples for SQL

13 years agoprosody.cfg.lua.dist: Add note about the require_encryption options
Matthew Wild [Fri, 7 Jan 2011 04:32:27 +0000 (04:32 +0000)]
prosody.cfg.lua.dist: Add note about the require_encryption options

13 years agostoragemanager, mod_storage_internal: Split out default driver to mod_storage_interna...
Matthew Wild [Fri, 7 Jan 2011 04:22:28 +0000 (04:22 +0000)]
storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code

13 years agoprosody.cfg.lua.dist: Add motd plugin
Matthew Wild [Fri, 7 Jan 2011 03:47:15 +0000 (03:47 +0000)]
prosody.cfg.lua.dist: Add motd plugin

13 years agomod_motd: Process value to strip any indentation from the config
Matthew Wild [Fri, 7 Jan 2011 03:46:10 +0000 (03:46 +0000)]
mod_motd: Process value to strip any indentation from the config

13 years agoMerge 0.8->trunk
Matthew Wild [Fri, 7 Jan 2011 03:18:40 +0000 (03:18 +0000)]
Merge 0.8->trunk

13 years agoejabberdstore.lib.lua: Remove now needless library
Matthew Wild [Fri, 7 Jan 2011 03:17:36 +0000 (03:17 +0000)]
ejabberdstore.lib.lua: Remove now needless library

13 years agoejabberd_init.lib.lua: Remove now needless library
Matthew Wild [Fri, 7 Jan 2011 03:16:39 +0000 (03:16 +0000)]
ejabberd_init.lib.lua: Remove now needless library

13 years agomod_storage_sql_ejabberd: Remove (moving to prosody-modules)
Matthew Wild [Fri, 7 Jan 2011 03:12:26 +0000 (03:12 +0000)]
mod_storage_sql_ejabberd: Remove (moving to prosody-modules)

13 years agoMerge 0.8->trunk
Matthew Wild [Thu, 6 Jan 2011 14:46:59 +0000 (14:46 +0000)]
Merge 0.8->trunk

13 years agostoragemanager: Fix log message (s/internal/null/)
Matthew Wild [Thu, 6 Jan 2011 14:01:57 +0000 (14:01 +0000)]
storagemanager: Fix log message (s/internal/null/)

13 years agostoragemanager: Fix log message (s/internal/null/)
Matthew Wild [Thu, 6 Jan 2011 14:01:57 +0000 (14:01 +0000)]
storagemanager: Fix log message (s/internal/null/)

13 years agostoragemanager: Add new "null" provider to get used when loading a driver or opening...
Matthew Wild [Thu, 6 Jan 2011 13:56:39 +0000 (13:56 +0000)]
storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver

13 years agostoragemanager: Add new "null" provider to get used when loading a driver or opening...
Matthew Wild [Thu, 6 Jan 2011 13:56:39 +0000 (13:56 +0000)]
storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver

13 years agostoragemanager: Log host in message when loading storage provider fails
Matthew Wild [Thu, 6 Jan 2011 13:54:37 +0000 (13:54 +0000)]
storagemanager: Log host in message when loading storage provider fails

13 years agostoragemanager: Log host in message when loading storage provider fails
Matthew Wild [Thu, 6 Jan 2011 13:54:37 +0000 (13:54 +0000)]
storagemanager: Log host in message when loading storage provider fails

13 years agonet.server_event: Log interface and port number when binding fails
Matthew Wild [Thu, 6 Jan 2011 13:47:20 +0000 (13:47 +0000)]
net.server_event: Log interface and port number when binding fails

13 years agonet.server_event: Log interface and port number when binding fails
Matthew Wild [Thu, 6 Jan 2011 13:47:20 +0000 (13:47 +0000)]
net.server_event: Log interface and port number when binding fails

13 years agomod_storage_sql: Catch Lua errors during SQL transactions, and rollback.
Waqas Hussain [Wed, 5 Jan 2011 01:56:36 +0000 (06:56 +0500)]
mod_storage_sql: Catch Lua errors during SQL transactions, and rollback.

13 years agomod_storage_sql: Catch Lua errors during SQL transactions, and rollback.
Waqas Hussain [Wed, 5 Jan 2011 01:56:36 +0000 (06:56 +0500)]
mod_storage_sql: Catch Lua errors during SQL transactions, and rollback.

13 years agonet.httpserver: Removed unused import and variables.
Waqas Hussain [Wed, 5 Jan 2011 01:34:23 +0000 (06:34 +0500)]
net.httpserver: Removed unused import and variables.

13 years agonet.httpserver: Removed unused import and variables.
Waqas Hussain [Wed, 5 Jan 2011 01:34:23 +0000 (06:34 +0500)]
net.httpserver: Removed unused import and variables.

13 years agonet.httpserver: Changed an unnecessary global access.
Waqas Hussain [Wed, 5 Jan 2011 01:26:49 +0000 (06:26 +0500)]
net.httpserver: Changed an unnecessary global access.

13 years agonet.httpserver: Changed an unnecessary global access.
Waqas Hussain [Wed, 5 Jan 2011 01:26:49 +0000 (06:26 +0500)]
net.httpserver: Changed an unnecessary global access.

13 years agomod_storage_sql: Removed unnecessary initialization of a variable.
Waqas Hussain [Wed, 5 Jan 2011 01:23:58 +0000 (06:23 +0500)]
mod_storage_sql: Removed unnecessary initialization of a variable.

13 years agomod_storage_sql: Removed unnecessary initialization of a variable.
Waqas Hussain [Wed, 5 Jan 2011 01:23:58 +0000 (06:23 +0500)]
mod_storage_sql: Removed unnecessary initialization of a variable.

13 years agonet.httpserver: Decode percent-encoded characters in URL path.
Waqas Hussain [Wed, 5 Jan 2011 01:23:17 +0000 (06:23 +0500)]
net.httpserver: Decode percent-encoded characters in URL path.

13 years agonet.httpserver: Decode percent-encoded characters in URL path.
Waqas Hussain [Wed, 5 Jan 2011 01:23:17 +0000 (06:23 +0500)]
net.httpserver: Decode percent-encoded characters in URL path.

13 years agomodulemanager: Removed an unused variable.
Waqas Hussain [Wed, 5 Jan 2011 01:16:27 +0000 (06:16 +0500)]
modulemanager: Removed an unused variable.

13 years agomodulemanager: Removed an unused variable.
Waqas Hussain [Wed, 5 Jan 2011 01:16:27 +0000 (06:16 +0500)]
modulemanager: Removed an unused variable.

13 years agoconfigmanager: Added rawget().
Waqas Hussain [Wed, 5 Jan 2011 01:16:07 +0000 (06:16 +0500)]
configmanager: Added rawget().

13 years agoconfigmanager: Added rawget().
Waqas Hussain [Wed, 5 Jan 2011 01:16:07 +0000 (06:16 +0500)]
configmanager: Added rawget().

13 years agomod_bosh: Fix for miscalculating inactivity, causing disconnects under a steady strea...
Matthew Wild [Tue, 4 Jan 2011 21:38:14 +0000 (21:38 +0000)]
mod_bosh: Fix for miscalculating inactivity, causing disconnects under a steady stream of traffic

13 years agomod_bosh: Fix for miscalculating inactivity, causing disconnects under a steady strea...
Matthew Wild [Tue, 4 Jan 2011 21:38:14 +0000 (21:38 +0000)]
mod_bosh: Fix for miscalculating inactivity, causing disconnects under a steady stream of traffic

13 years agoprosody, prosodyctl: Filter out relative paths from package.(c)path when installed
Matthew Wild [Tue, 4 Jan 2011 21:19:28 +0000 (21:19 +0000)]
prosody, prosodyctl: Filter out relative paths from package.(c)path when installed

13 years agoprosody, prosodyctl: Filter out relative paths from package.(c)path when installed
Matthew Wild [Tue, 4 Jan 2011 21:19:28 +0000 (21:19 +0000)]
prosody, prosodyctl: Filter out relative paths from package.(c)path when installed

13 years agoprosody, prosodyctl: Create prosody object as a local before exporting as a global
Matthew Wild [Tue, 4 Jan 2011 21:18:35 +0000 (21:18 +0000)]
prosody, prosodyctl: Create prosody object as a local before exporting as a global

13 years agoprosody, prosodyctl: Create prosody object as a local before exporting as a global
Matthew Wild [Tue, 4 Jan 2011 21:18:35 +0000 (21:18 +0000)]
prosody, prosodyctl: Create prosody object as a local before exporting as a global

13 years agomod_register: Small code cleanup
Matthew Wild [Tue, 4 Jan 2011 17:21:58 +0000 (17:21 +0000)]
mod_register: Small code cleanup

13 years agomod_register: Small code cleanup
Matthew Wild [Tue, 4 Jan 2011 17:21:58 +0000 (17:21 +0000)]
mod_register: Small code cleanup

13 years agomod_register: Change to use new delete_user auth provider method
Matthew Wild [Tue, 4 Jan 2011 17:19:39 +0000 (17:19 +0000)]
mod_register: Change to use new delete_user auth provider method

13 years agomod_register: Change to use new delete_user auth provider method
Matthew Wild [Tue, 4 Jan 2011 17:19:39 +0000 (17:19 +0000)]
mod_register: Change to use new delete_user auth provider method

13 years agomod_register: Add registration_compat config option to allow account remove requests...
Matthew Wild [Tue, 4 Jan 2011 17:15:47 +0000 (17:15 +0000)]
mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true)

13 years agomod_register: Add registration_compat config option to allow account remove requests...
Matthew Wild [Tue, 4 Jan 2011 17:15:47 +0000 (17:15 +0000)]
mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true)

13 years agomod_auth_internal_*: Support for delete_user method
Matthew Wild [Tue, 4 Jan 2011 17:12:28 +0000 (17:12 +0000)]
mod_auth_internal_*: Support for delete_user method

13 years agomod_auth_internal_*: Support for delete_user method
Matthew Wild [Tue, 4 Jan 2011 17:12:28 +0000 (17:12 +0000)]
mod_auth_internal_*: Support for delete_user method

13 years agousermanager: Add delete_user method
Matthew Wild [Tue, 4 Jan 2011 17:11:51 +0000 (17:11 +0000)]
usermanager: Add delete_user method

13 years agousermanager: Add delete_user method
Matthew Wild [Tue, 4 Jan 2011 17:11:51 +0000 (17:11 +0000)]
usermanager: Add delete_user method

13 years agousermanager: Have methods not implemented in the active provider fall back to the...
Matthew Wild [Tue, 4 Jan 2011 17:11:37 +0000 (17:11 +0000)]
usermanager: Have methods not implemented in the active provider fall back to the null provider (later we can add support for chains of providers)

13 years agousermanager: Have methods not implemented in the active provider fall back to the...
Matthew Wild [Tue, 4 Jan 2011 17:11:37 +0000 (17:11 +0000)]
usermanager: Have methods not implemented in the active provider fall back to the null provider (later we can add support for chains of providers)

13 years agousermanager: Change dummy provider method to return an error string also (method...
Matthew Wild [Tue, 4 Jan 2011 17:10:56 +0000 (17:10 +0000)]
usermanager: Change dummy provider method to return an error string also (method not implemented)

13 years agousermanager: Change dummy provider method to return an error string also (method...
Matthew Wild [Tue, 4 Jan 2011 17:10:56 +0000 (17:10 +0000)]
usermanager: Change dummy provider method to return an error string also (method not implemented)

13 years agonet.adns: Log the DNS server that a query is sent to
Matthew Wild [Tue, 4 Jan 2011 16:37:57 +0000 (16:37 +0000)]
net.adns: Log the DNS server that a query is sent to

13 years agonet.adns: Log the DNS server that a query is sent to
Matthew Wild [Tue, 4 Jan 2011 16:37:57 +0000 (16:37 +0000)]
net.adns: Log the DNS server that a query is sent to

13 years agoMUC: Fix a pair of missing :up()
Kim Alvefur [Mon, 3 Jan 2011 08:40:45 +0000 (09:40 +0100)]
MUC: Fix a pair of missing :up()

13 years agoMUC: Fix a pair of missing :up()
Kim Alvefur [Mon, 3 Jan 2011 08:40:45 +0000 (09:40 +0100)]
MUC: Fix a pair of missing :up()

13 years agomod_pubsub: Correctly wrap the list of subscriptions in a pubsub element
Kim Alvefur [Wed, 29 Dec 2010 18:24:19 +0000 (19:24 +0100)]
mod_pubsub: Correctly wrap the list of subscriptions in a pubsub element

13 years agoutil.xmppstream: Optimized stanza building by bypassing the stanza API.
Waqas Hussain [Wed, 29 Dec 2010 13:49:59 +0000 (18:49 +0500)]
util.xmppstream: Optimized stanza building by bypassing the stanza API.

13 years agoutil.sasl: Cache the calculated mechanisms set for SASL profiles (profile.mechanisms...
Waqas Hussain [Wed, 29 Dec 2010 13:45:31 +0000 (18:45 +0500)]
util.sasl: Cache the calculated mechanisms set for SASL profiles (profile.mechanisms table).

13 years agoutil.sasl: Cache the calculated mechanisms set for SASL profiles (profile.mechanisms...
Waqas Hussain [Wed, 29 Dec 2010 13:45:31 +0000 (18:45 +0500)]
util.sasl: Cache the calculated mechanisms set for SASL profiles (profile.mechanisms table).

13 years agoprosody: Don't add a datamanager callback when anonymous_login=true (mod_auth_anonymo...
Waqas Hussain [Tue, 28 Dec 2010 04:59:27 +0000 (09:59 +0500)]
prosody: Don't add a datamanager callback when anonymous_login=true (mod_auth_anonymous does this now).

13 years agoprosody: Don't add a datamanager callback when anonymous_login=true (mod_auth_anonymo...
Waqas Hussain [Tue, 28 Dec 2010 04:59:27 +0000 (09:59 +0500)]
prosody: Don't add a datamanager callback when anonymous_login=true (mod_auth_anonymous does this now).

13 years agohostmanager: Don't set host.disallow_s2s when anonymous_login=true (mod_auth_anonymou...
Waqas Hussain [Tue, 28 Dec 2010 04:58:40 +0000 (09:58 +0500)]
hostmanager: Don't set host.disallow_s2s when anonymous_login=true (mod_auth_anonymous does this now).

13 years agohostmanager: Don't set host.disallow_s2s when anonymous_login=true (mod_auth_anonymou...
Waqas Hussain [Tue, 28 Dec 2010 04:58:40 +0000 (09:58 +0500)]
hostmanager: Don't set host.disallow_s2s when anonymous_login=true (mod_auth_anonymous does this now).

13 years agomod_saslauth: Remove special handling for SASL ANONYMOUS, and let mod_auth_anonymous...
Waqas Hussain [Tue, 28 Dec 2010 00:28:15 +0000 (05:28 +0500)]
mod_saslauth: Remove special handling for SASL ANONYMOUS, and let mod_auth_anonymous handle it.

13 years agomod_saslauth: Remove special handling for SASL ANONYMOUS, and let mod_auth_anonymous...
Waqas Hussain [Tue, 28 Dec 2010 00:28:15 +0000 (05:28 +0500)]
mod_saslauth: Remove special handling for SASL ANONYMOUS, and let mod_auth_anonymous handle it.

13 years agousermanager: Assume authentication="anonymous" when anonymous_login=true.
Waqas Hussain [Mon, 27 Dec 2010 15:46:01 +0000 (20:46 +0500)]
usermanager: Assume authentication="anonymous" when anonymous_login=true.

13 years agousermanager: Assume authentication="anonymous" when anonymous_login=true.
Waqas Hussain [Mon, 27 Dec 2010 15:46:01 +0000 (20:46 +0500)]
usermanager: Assume authentication="anonymous" when anonymous_login=true.

13 years agoutil.sasl.*, mod_auth_*, mod_saslauth: Pass SASL handler as first parameter to SASL...
Waqas Hussain [Mon, 27 Dec 2010 14:57:04 +0000 (19:57 +0500)]
util.sasl.*, mod_auth_*, mod_saslauth: Pass SASL handler as first parameter to SASL profile callbacks.

13 years agoutil.sasl.*, mod_auth_*, mod_saslauth: Pass SASL handler as first parameter to SASL...
Waqas Hussain [Mon, 27 Dec 2010 14:57:04 +0000 (19:57 +0500)]
util.sasl.*, mod_auth_*, mod_saslauth: Pass SASL handler as first parameter to SASL profile callbacks.

13 years agomod_storage_sql: Use util.json instead of util.serialization.
Waqas Hussain [Mon, 27 Dec 2010 14:43:57 +0000 (19:43 +0500)]
mod_storage_sql: Use util.json instead of util.serialization.

13 years agomod_storage_sql: Use util.json instead of util.serialization.
Waqas Hussain [Mon, 27 Dec 2010 14:43:57 +0000 (19:43 +0500)]
mod_storage_sql: Use util.json instead of util.serialization.

13 years agoutil.json: Initial commit.
Waqas Hussain [Mon, 27 Dec 2010 14:37:04 +0000 (19:37 +0500)]
util.json: Initial commit.

13 years agoutil.json: Initial commit.
Waqas Hussain [Mon, 27 Dec 2010 14:37:04 +0000 (19:37 +0500)]
util.json: Initial commit.

13 years agomod_storage_sql: Log an error on query failure.
Waqas Hussain [Mon, 27 Dec 2010 01:10:35 +0000 (06:10 +0500)]
mod_storage_sql: Log an error on query failure.

13 years agomod_storage_sql: Log an error on query failure.
Waqas Hussain [Mon, 27 Dec 2010 01:10:35 +0000 (06:10 +0500)]
mod_storage_sql: Log an error on query failure.

13 years agomod_storage_sql: Remove the subkey column from the Prosody table, and make the map...
Waqas Hussain [Mon, 27 Dec 2010 01:10:35 +0000 (06:10 +0500)]
mod_storage_sql: Remove the subkey column from the Prosody table, and make the map store compatible with the key-value store.

13 years agomod_storage_sql: Remove the subkey column from the Prosody table, and make the map...
Waqas Hussain [Mon, 27 Dec 2010 01:10:35 +0000 (06:10 +0500)]
mod_storage_sql: Remove the subkey column from the Prosody table, and make the map store compatible with the key-value store.

13 years agomod_storage_sql: Dynamically replace backquotes with double quotes when connecting...
Waqas Hussain [Mon, 27 Dec 2010 01:10:35 +0000 (06:10 +0500)]
mod_storage_sql: Dynamically replace backquotes with double quotes when connecting to PostgreSQL...

13 years agomod_storage_sql: Dynamically replace backquotes with double quotes when connecting...
Waqas Hussain [Mon, 27 Dec 2010 01:10:35 +0000 (06:10 +0500)]
mod_storage_sql: Dynamically replace backquotes with double quotes when connecting to PostgreSQL...

13 years agomod_storage_sql: Call commit() after all SQL statements, including SELECT, to get...
Waqas Hussain [Mon, 27 Dec 2010 01:10:35 +0000 (06:10 +0500)]
mod_storage_sql: Call commit() after all SQL statements, including SELECT, to get SQLite to drop its locks.

13 years agomod_storage_sql: Call commit() after all SQL statements, including SELECT, to get...
Waqas Hussain [Mon, 27 Dec 2010 01:10:35 +0000 (06:10 +0500)]
mod_storage_sql: Call commit() after all SQL statements, including SELECT, to get SQLite to drop its locks.

13 years agomod_storage_sql: Quote identifiers in SQL with backquotes, and use the empty string...
Waqas Hussain [Mon, 27 Dec 2010 01:10:35 +0000 (06:10 +0500)]
mod_storage_sql: Quote identifiers in SQL with backquotes, and use the empty string for NULL, and '=' instead of 'IS' for comparison, to work with MySQL's limitations...

13 years agomod_storage_sql: Quote identifiers in SQL with backquotes, and use the empty string...
Waqas Hussain [Mon, 27 Dec 2010 01:10:35 +0000 (06:10 +0500)]
mod_storage_sql: Quote identifiers in SQL with backquotes, and use the empty string for NULL, and '=' instead of 'IS' for comparison, to work with MySQL's limitations...

13 years agoDon't check priority in mod_offline
Robert Hoelz [Fri, 10 Dec 2010 05:25:16 +0000 (23:25 -0600)]
Don't check priority in mod_offline

13 years agoDon't check priority in mod_offline
Robert Hoelz [Fri, 10 Dec 2010 05:25:16 +0000 (23:25 -0600)]
Don't check priority in mod_offline

13 years agomod_message, mod_offline: Change message/offline/store -> message/offline/handle
Robert Hoelz [Thu, 9 Dec 2010 18:41:30 +0000 (12:41 -0600)]
mod_message, mod_offline: Change message/offline/store -> message/offline/handle

13 years agomod_message, mod_offline: Change message/offline/store -> message/offline/handle
Robert Hoelz [Thu, 9 Dec 2010 18:41:30 +0000 (12:41 -0600)]
mod_message, mod_offline: Change message/offline/store -> message/offline/handle

13 years agomod_offline: Make sure mod_offline's store handler reports success vs failure.
Robert Hoelz [Thu, 9 Dec 2010 18:38:33 +0000 (12:38 -0600)]
mod_offline: Make sure mod_offline's store handler reports success vs failure.