prosody.git
14 years agosessionmanager: Rename filters_initialize->initialize_filters
Matthew Wild [Wed, 2 Jun 2010 17:22:23 +0000 (18:22 +0100)]
sessionmanager: Rename filters_initialize->initialize_filters

14 years agoxmppclient_listener: Add filters for incoming bytes and stanzas
Matthew Wild [Wed, 2 Jun 2010 16:51:39 +0000 (17:51 +0100)]
xmppclient_listener: Add filters for incoming bytes and stanzas

14 years agosessionmanager: Initialize new sessions for filtering, and add filters for outgoing...
Matthew Wild [Wed, 2 Jun 2010 16:51:14 +0000 (17:51 +0100)]
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas

14 years agoutil.filters: Ensure initialize() never initializes an object twice - and return...
Matthew Wild [Wed, 2 Jun 2010 16:23:57 +0000 (17:23 +0100)]
util.filters: Ensure initialize() never initializes an object twice - and return the filter function to the caller

14 years agoxmppserver_listener: Port to util.xmppstream \o/
Matthew Wild [Wed, 2 Jun 2010 15:53:40 +0000 (16:53 +0100)]
xmppserver_listener: Port to util.xmppstream \o/

14 years agoutil.filters: Break processing if a filterer returns nil
Matthew Wild [Wed, 2 Jun 2010 12:31:36 +0000 (13:31 +0100)]
util.filters: Break processing if a filterer returns nil

14 years agoutil.filters: Don't traceback with no filters of a type added
Matthew Wild [Wed, 2 Jun 2010 12:03:55 +0000 (13:03 +0100)]
util.filters: Don't traceback with no filters of a type added

14 years agonet.multiplex_listener: Test to make sure listener.onconnect isn't nil.
Waqas Hussain [Wed, 2 Jun 2010 12:25:01 +0000 (17:25 +0500)]
net.multiplex_listener: Test to make sure listener.onconnect isn't nil.

14 years agonet.multiplex_listener: Call listener.onconnect(conn) when swapping listeners.
Waqas Hussain [Wed, 2 Jun 2010 12:06:23 +0000 (17:06 +0500)]
net.multiplex_listener: Call listener.onconnect(conn) when swapping listeners.

14 years agoxmppclient_listener: Port to onconnect handler
Matthew Wild [Wed, 2 Jun 2010 11:32:24 +0000 (12:32 +0100)]
xmppclient_listener: Port to onconnect handler

14 years agoutil.filters: Don't traceback when trying to remove a filter from an uninitialized...
Matthew Wild [Wed, 2 Jun 2010 11:24:07 +0000 (12:24 +0100)]
util.filters: Don't traceback when trying to remove a filter from an uninitialized object

14 years agoutil.filters: Expose the initialization function
Matthew Wild [Wed, 2 Jun 2010 11:23:07 +0000 (12:23 +0100)]
util.filters: Expose the initialization function

14 years agoutil.filters: New utility library for managing filters on an object
Matthew Wild [Wed, 2 Jun 2010 11:20:29 +0000 (12:20 +0100)]
util.filters: New utility library for managing filters on an object

14 years agomod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain [Tue, 1 Jun 2010 20:54:17 +0000 (01:54 +0500)]
mod_pep: Corrected and optimized handling of non-available presence stanzas.

14 years agomod_iq: Removed a check for user existance when firing iq/bare/* sub-events.
Waqas Hussain [Sun, 30 May 2010 18:01:34 +0000 (23:01 +0500)]
mod_iq: Removed a check for user existance when firing iq/bare/* sub-events.

14 years agomod_pep: Use is_contact_subscribed (which uses the new rostermanager fix to avoid...
Matthew Wild [Tue, 1 Jun 2010 19:10:17 +0000 (20:10 +0100)]
mod_pep: Use is_contact_subscribed (which uses the new rostermanager fix to avoid unnecessary roster loads)

14 years agorostermanager: Optimisation to avoid unnecessarily loading rosters for offline contac...
Waqas Hussain [Tue, 1 Jun 2010 19:09:31 +0000 (20:09 +0100)]
rostermanager: Optimisation to avoid unnecessarily loading rosters for offline contacts on probes, etc.

14 years agoMerge compression fix
Matthew Wild [Sat, 29 May 2010 01:08:56 +0000 (02:08 +0100)]
Merge compression fix

14 years agomod_compression: Update for new session.data() syntax, fixes invalid XML errors after...
Matthew Wild [Sat, 29 May 2010 01:08:11 +0000 (02:08 +0100)]
mod_compression: Update for new session.data() syntax, fixes invalid XML errors after compression negotiation (thanks hg bisect)

14 years agoMerge 0.7->trunk
Matthew Wild [Wed, 26 May 2010 12:38:22 +0000 (13:38 +0100)]
Merge 0.7->trunk

14 years agomod_groups: Check for existence of roster[false] before clearing version (thanks...
Matthew Wild [Wed, 26 May 2010 12:38:00 +0000 (13:38 +0100)]
mod_groups: Check for existence of roster[false] before clearing version (thanks Flo)

14 years agoMerge 0.7->trunk
Matthew Wild [Mon, 24 May 2010 18:46:12 +0000 (19:46 +0100)]
Merge 0.7->trunk

14 years agoutil.sasl.scram: Fix remaining - in profile name
Matthew Wild [Mon, 24 May 2010 18:44:27 +0000 (19:44 +0100)]
util.sasl.scram: Fix remaining - in profile name

14 years agoMerge trunk/Tobias->trunk
Matthew Wild [Mon, 24 May 2010 18:39:07 +0000 (19:39 +0100)]
Merge trunk/Tobias->trunk

14 years agoutil.sasl.*: Adjusting authentication provider names. All '-' replaced with '_'
Tobias Markmann [Mon, 24 May 2010 16:15:16 +0000 (18:15 +0200)]
util.sasl.*: Adjusting authentication provider names. All '-' replaced with '_'

14 years agoutil.sasl.*: Adjusting authentication provider names. All '-' replaced with '_'
Tobias Markmann [Mon, 24 May 2010 16:15:16 +0000 (18:15 +0200)]
util.sasl.*: Adjusting authentication provider names. All '-' replaced with '_'

14 years agoMerge 0.7->trunk
Matthew Wild [Mon, 24 May 2010 15:52:12 +0000 (16:52 +0100)]
Merge 0.7->trunk

14 years agoutil.sasl.scram: Fixing logic error in argument checking.
Tobias Markmann [Mon, 24 May 2010 15:44:13 +0000 (17:44 +0200)]
util.sasl.scram: Fixing logic error in argument checking.

14 years agoutil.sasl.scram: Fixing logic error in argument checking.
Tobias Markmann [Mon, 24 May 2010 15:44:13 +0000 (17:44 +0200)]
util.sasl.scram: Fixing logic error in argument checking.

14 years agoMerge 0.7->trunk
Matthew Wild [Sun, 23 May 2010 22:11:00 +0000 (23:11 +0100)]
Merge 0.7->trunk

14 years agoMerge 0.7/waqas->0.7/MattJ
Matthew Wild [Sun, 23 May 2010 22:05:01 +0000 (23:05 +0100)]
Merge 0.7/waqas->0.7/MattJ

14 years agomod_private: Detect datamanager read errors, and respond with 'internal-server-error'.
Waqas Hussain [Sun, 23 May 2010 20:00:30 +0000 (01:00 +0500)]
mod_private: Detect datamanager read errors, and respond with 'internal-server-error'.

14 years agousermanager: Take datamanager errors into account when determining account existance.
Waqas Hussain [Sun, 23 May 2010 19:49:12 +0000 (00:49 +0500)]
usermanager: Take datamanager errors into account when determining account existance.

14 years agomod_presence: Don't send 'unsubscribed' in response to probes when roster loading...
Waqas Hussain [Sun, 23 May 2010 19:37:15 +0000 (00:37 +0500)]
mod_presence: Don't send 'unsubscribed' in response to probes when roster loading fails.

14 years agorostermanager: Return an error string when subscription test fails due to an error.
Waqas Hussain [Sun, 23 May 2010 19:35:08 +0000 (00:35 +0500)]
rostermanager: Return an error string when subscription test fails due to an error.

14 years agorostermanager: Mark rosters which fail to load as broken, and never save them.
Waqas Hussain [Sun, 23 May 2010 19:29:45 +0000 (00:29 +0500)]
rostermanager: Mark rosters which fail to load as broken, and never save them.

14 years agomod_presence: Removed a useless check when handling incoming presence probes and...
Waqas Hussain [Sun, 23 May 2010 19:04:22 +0000 (00:04 +0500)]
mod_presence: Removed a useless check when handling incoming presence probes and subscriptions.

14 years agoutil.datamanager: Return an error string when failing to save.
Waqas Hussain [Sun, 23 May 2010 18:55:01 +0000 (23:55 +0500)]
util.datamanager: Return an error string when failing to save.

14 years agorostermanager: Correctly clear the bare_sessions table on roster load errors during...
Waqas Hussain [Sun, 23 May 2010 00:46:52 +0000 (05:46 +0500)]
rostermanager: Correctly clear the bare_sessions table on roster load errors during bind.

14 years agoutil.sasl.scram: Fixing issue #177.
Tobias Markmann [Sat, 22 May 2010 18:51:01 +0000 (20:51 +0200)]
util.sasl.scram: Fixing issue #177.

14 years agoutil.sasl.plain: Typo.
Tobias Markmann [Sat, 22 May 2010 18:34:32 +0000 (20:34 +0200)]
util.sasl.plain: Typo.

14 years agoutil.sasl.scram: Providing an API function to generate a salted password for the...
Tobias Markmann [Sat, 22 May 2010 17:04:53 +0000 (19:04 +0200)]
util.sasl.scram: Providing an API function to generate a salted password for the SCRAM-SHA-1 mechanism.

14 years agoutil.sasl.scram: Split up long line.
Tobias Markmann [Sat, 22 May 2010 12:58:24 +0000 (14:58 +0200)]
util.sasl.scram: Split up long line.

14 years agoutil.sasl.scram: Parsing client-final-message in a more strict way. (thanks Marc...
Tobias Markmann [Sat, 22 May 2010 12:47:21 +0000 (14:47 +0200)]
util.sasl.scram: Parsing client-final-message in a more strict way.  (thanks Marc Santamaria)

14 years agoutil.sasl.scram: Fix in nonce check of client-final-message.
Tobias Markmann [Sat, 22 May 2010 11:59:58 +0000 (13:59 +0200)]
util.sasl.scram: Fix in nonce check of client-final-message.

14 years agoutil.sasl.scram: Parsing client-first-message in a more strict way. (thanks Marc...
Tobias Markmann [Sat, 22 May 2010 11:58:15 +0000 (13:58 +0200)]
util.sasl.scram: Parsing client-first-message in a more strict way.  (thanks Marc Santamaria)

14 years agorostermanager: Don't fire roster-load event if there was an error loading the roster
Matthew Wild [Sat, 22 May 2010 11:20:22 +0000 (12:20 +0100)]
rostermanager: Don't fire roster-load event if there was an error loading the roster

14 years agosessionmanager: Change error for reaching resource limit from 'conflict' to 'resource...
Waqas Hussain [Sat, 22 May 2010 00:53:27 +0000 (05:53 +0500)]
sessionmanager: Change error for reaching resource limit from 'conflict' to 'resource-constraint' during session bind.

14 years agosessionmanager: If roster loading fails during resource bind, kick the user with...
Waqas Hussain [Sat, 22 May 2010 00:52:24 +0000 (05:52 +0500)]
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.

14 years agorostermanager: When loading the roster, also return a datamanager error if available.
Waqas Hussain [Sat, 22 May 2010 00:50:47 +0000 (05:50 +0500)]
rostermanager: When loading the roster, also return a datamanager error if available.

14 years agoutil.datamanager: When failing to load a file, and the file exists, return nil, error.
Waqas Hussain [Sat, 22 May 2010 00:49:21 +0000 (05:49 +0500)]
util.datamanager: When failing to load a file, and the file exists, return nil, error.

14 years agoutil.sasl.scram: Check nonce in client final message. Check channel binding flag...
Tobias Markmann [Fri, 21 May 2010 23:48:31 +0000 (01:48 +0200)]
util.sasl.scram: Check nonce in client final message. Check channel binding flag in client first message. Adding some TODOs on more strict parsing. (thanks Marc Santamaria)

14 years agomod_privacy: Improved logging.
Waqas Hussain [Fri, 21 May 2010 22:54:50 +0000 (03:54 +0500)]
mod_privacy: Improved logging.

14 years agomod_presence: Added option 'ignore_presence_priority'.
Waqas Hussain [Fri, 21 May 2010 22:20:43 +0000 (03:20 +0500)]
mod_presence: Added option 'ignore_presence_priority'.

14 years agoutil.sasl.plain: Removing plain_hashed authentication provider. Just do hashing and...
Tobias Markmann [Fri, 21 May 2010 21:40:29 +0000 (23:40 +0200)]
util.sasl.plain: Removing plain_hashed authentication provider. Just do hashing and comparison yourself in a plain_test authentication provider.

14 years agoMerge with backout
Matthew Wild [Fri, 21 May 2010 18:45:33 +0000 (19:45 +0100)]
Merge with backout

14 years agoBacked out changeset c75c22c316d6 (the XMPP spec now gives a better way to do this)
Matthew Wild [Fri, 21 May 2010 18:44:31 +0000 (19:44 +0100)]
Backed out changeset c75c22c316d6 (the XMPP spec now gives a better way to do this)

14 years agoMerge 0.7->trunk
Matthew Wild [Fri, 21 May 2010 18:28:56 +0000 (19:28 +0100)]
Merge 0.7->trunk

14 years agomod_bosh: Re-layout session object creation to make lines shorter
Matthew Wild [Fri, 21 May 2010 18:27:06 +0000 (19:27 +0100)]
mod_bosh: Re-layout session object creation to make lines shorter

14 years agomod_bosh: Add option consider_bosh_secure to treat BOSH sessions as encrypted even...
Matthew Wild [Fri, 21 May 2010 18:24:50 +0000 (19:24 +0100)]
mod_bosh: Add option consider_bosh_secure to treat BOSH sessions as encrypted even if they don't use HTTP (useful for when secure requests are proxied to Prosody over HTTP)

14 years agomod_privacy: Fix several possible tracebacks when either the contact is a host JID...
Matthew Wild [Fri, 21 May 2010 18:20:21 +0000 (19:20 +0100)]
mod_privacy: Fix several possible tracebacks when either the contact is a host JID, or the contact isn't in your roster and you have roster group/subscription rules in place

14 years agomod_privacy: Remove validation that checks a roster group you block actually exists...
Matthew Wild [Fri, 21 May 2010 18:19:29 +0000 (19:19 +0100)]
mod_privacy: Remove validation that checks a roster group you block actually exists - it would be time-consuming on large rosters, and isn't important (or correct?) anyway.

14 years agoMerge 0.7->trunk
Matthew Wild [Thu, 20 May 2010 10:52:20 +0000 (11:52 +0100)]
Merge 0.7->trunk

14 years agomod_saslauth: Split out cyrus SASL config options into locals, and add support for...
Matthew Wild [Thu, 20 May 2010 10:51:55 +0000 (11:51 +0100)]
mod_saslauth: Split out cyrus SASL config options into locals, and add support for cyrus_application_name (default: 'prosody')

14 years agoMerge 0.7->trunk
Matthew Wild [Thu, 20 May 2010 10:44:41 +0000 (11:44 +0100)]
Merge 0.7->trunk

14 years agousermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional (default...
Matthew Wild [Thu, 20 May 2010 10:32:24 +0000 (11:32 +0100)]
usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional (default: not required)

14 years agoutil.sasl_cyrus: Support for specifying the application name (to pass to Cyrus SASL...
Matthew Wild [Thu, 20 May 2010 10:13:51 +0000 (11:13 +0100)]
util.sasl_cyrus: Support for specifying the application name (to pass to Cyrus SASL's init())

14 years agomod_saslauth: Add return value and error message to the Cyrus SASL handle_status...
Matthew Wild [Thu, 20 May 2010 10:08:51 +0000 (11:08 +0100)]
mod_saslauth: Add return value and error message to the Cyrus SASL handle_status callback

14 years agomod_saslauth: Allow the Cyrus SASL realm to be configurable
Matthew Wild [Thu, 20 May 2010 10:05:43 +0000 (11:05 +0100)]
mod_saslauth: Allow the Cyrus SASL realm to be configurable

14 years agoMerge 0.7->trunk
Matthew Wild [Thu, 20 May 2010 09:48:44 +0000 (10:48 +0100)]
Merge 0.7->trunk

14 years agonet.dns: Remove redundant locals declaration
Matthew Wild [Thu, 20 May 2010 09:46:08 +0000 (10:46 +0100)]
net.dns: Remove redundant locals declaration

14 years agonet.dns: Remove redundant locals declaration
Matthew Wild [Thu, 20 May 2010 09:46:08 +0000 (10:46 +0100)]
net.dns: Remove redundant locals declaration

14 years agonet.dns: Fix dns.lookup from commit e54774bd73a7
Matthew Wild [Thu, 20 May 2010 09:45:29 +0000 (10:45 +0100)]
net.dns: Fix dns.lookup from commit e54774bd73a7

14 years agonet.dns: Fix dns.lookup from commit e54774bd73a7
Matthew Wild [Thu, 20 May 2010 09:45:29 +0000 (10:45 +0100)]
net.dns: Fix dns.lookup from commit e54774bd73a7

14 years agoMerge 0.7->trunk
Matthew Wild [Thu, 20 May 2010 08:41:27 +0000 (09:41 +0100)]
Merge 0.7->trunk

14 years agomod_groups: Remove potentially verbose per-contact logging (thanks Flo)
Matthew Wild [Thu, 20 May 2010 08:40:33 +0000 (09:40 +0100)]
mod_groups: Remove potentially verbose per-contact logging (thanks Flo)

14 years agousermanager: Changed auth provider functions to methods.
Waqas Hussain [Wed, 19 May 2010 05:49:27 +0000 (10:49 +0500)]
usermanager: Changed auth provider functions to methods.

14 years agoMerge 0.7->trunk
Matthew Wild [Tue, 18 May 2010 22:29:44 +0000 (23:29 +0100)]
Merge 0.7->trunk

14 years agoMerge 0.6->0.7
Matthew Wild [Tue, 18 May 2010 22:29:21 +0000 (23:29 +0100)]
Merge 0.6->0.7

14 years agoconfigure: Fix to allow option values containing '=' (thanks Jakub)
Matthew Wild [Tue, 18 May 2010 22:28:36 +0000 (23:28 +0100)]
configure: Fix to allow option values containing '=' (thanks Jakub)

14 years agoMerge 0.7->trunk
Matthew Wild [Mon, 17 May 2010 23:47:35 +0000 (00:47 +0100)]
Merge 0.7->trunk

14 years agoMerge 0.6->0.7
Matthew Wild [Mon, 17 May 2010 23:47:06 +0000 (00:47 +0100)]
Merge 0.6->0.7

14 years agoMerge 0.7->trunk
Matthew Wild [Mon, 17 May 2010 10:58:00 +0000 (11:58 +0100)]
Merge 0.7->trunk

14 years agoMerge 0.7/MattJ with 0.7
Matthew Wild [Mon, 17 May 2010 10:57:01 +0000 (11:57 +0100)]
Merge 0.7/MattJ with 0.7

14 years agoMerge with 0.6
Matthew Wild [Mon, 17 May 2010 10:56:36 +0000 (11:56 +0100)]
Merge with 0.6

14 years agomod_bosh: Always give requests a destroy handler, so that the management of each...
Matthew Wild [Mon, 17 May 2010 10:49:24 +0000 (11:49 +0100)]
mod_bosh: Always give requests a destroy handler, so that the management of each session's request array and the inactive_sessions logic can happen in one place. Simplifies everything and concludes this series of BOSH fixes.

14 years agomod_bosh: Fix handling of rids by not dropping requests with repeated rids (assign...
Matthew Wild [Mon, 17 May 2010 10:46:54 +0000 (11:46 +0100)]
mod_bosh: Fix handling of rids by not dropping requests with repeated rids (assign them their sid instead), and always starting a session with first_rid-1.

14 years agomod_bosh: Remove some hacky code for pruning dead requests that hopefully never gets...
Matthew Wild [Mon, 17 May 2010 10:45:11 +0000 (11:45 +0100)]
mod_bosh: Remove some hacky code for pruning dead requests that hopefully never gets executed - if it does there's a bug anyway.

14 years agomod_bosh: Remove requests from the session table using table.remove(), prevents the...
Matthew Wild [Mon, 17 May 2010 10:42:53 +0000 (11:42 +0100)]
mod_bosh: Remove requests from the session table using table.remove(), prevents the possibility of holes in the array.

14 years agoprosodyctl: Support for the new usermanager, refactor host creation and fail if a...
Matthew Wild [Sat, 15 May 2010 18:38:40 +0000 (19:38 +0100)]
prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola)

14 years agousermanager: Export new_default_provider()
Matthew Wild [Sat, 15 May 2010 18:31:58 +0000 (19:31 +0100)]
usermanager: Export new_default_provider()

14 years agousermanager: Handle auth providers for components.
Waqas Hussain [Thu, 13 May 2010 16:18:03 +0000 (21:18 +0500)]
usermanager: Handle auth providers for components.

14 years agousermanager: Fix logic for per-host admin tables (thanks Maranda)
Matthew Wild [Wed, 12 May 2010 22:06:46 +0000 (23:06 +0100)]
usermanager: Fix logic for per-host admin tables (thanks Maranda)

14 years agonet.xmppclient_listener: Port to util.xmppstream \o/
Matthew Wild [Sun, 9 May 2010 19:48:21 +0000 (20:48 +0100)]
net.xmppclient_listener: Port to util.xmppstream \o/

14 years agoprosody: Load util.xmppstream :(
Matthew Wild [Sun, 9 May 2010 19:46:24 +0000 (20:46 +0100)]
prosody: Load util.xmppstream :(

14 years agoutil.xmppstream: Stream objects now just have feed/reset methods
Matthew Wild [Sun, 9 May 2010 19:45:53 +0000 (20:45 +0100)]
util.xmppstream: Stream objects now just have feed/reset methods

14 years agousermanager: Bump log level of incorrect config option warnings
Matthew Wild [Fri, 7 May 2010 20:43:37 +0000 (21:43 +0100)]
usermanager: Bump log level of incorrect config option warnings

14 years agousermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild [Fri, 7 May 2010 20:42:45 +0000 (21:42 +0100)]
usermanager: Fix for is_admin to work with the new auth provider architecture

14 years agoMerge 0.7->trunk
Waqas Hussain [Fri, 7 May 2010 11:21:04 +0000 (16:21 +0500)]
Merge 0.7->trunk

14 years agoMerge 0.6->0.7
Waqas Hussain [Fri, 7 May 2010 11:17:48 +0000 (16:17 +0500)]
Merge 0.6->0.7