prosody.git
13 years agosessionmanager: Remove dependency on eventmanager
Matthew Wild [Tue, 3 Aug 2010 09:58:15 +0000 (10:58 +0100)]
sessionmanager: Remove dependency on eventmanager

13 years agos2smanager: Remove dependency on eventmanager
Matthew Wild [Tue, 3 Aug 2010 09:57:27 +0000 (10:57 +0100)]
s2smanager: Remove dependency on eventmanager

13 years agocomponentmanager: Remove dependency on eventmanager
Matthew Wild [Tue, 3 Aug 2010 09:56:17 +0000 (10:56 +0100)]
componentmanager: Remove dependency on eventmanager

13 years agohostmanager: Remove dependency on eventmanager
Matthew Wild [Tue, 3 Aug 2010 09:55:17 +0000 (10:55 +0100)]
hostmanager: Remove dependency on eventmanager

13 years agomodulemanager: Remove dependency on eventmanager
Matthew Wild [Tue, 3 Aug 2010 09:52:53 +0000 (10:52 +0100)]
modulemanager: Remove dependency on eventmanager

13 years agos2smanager: brackets, just to be sure :)
Matthew Wild [Tue, 3 Aug 2010 08:40:06 +0000 (09:40 +0100)]
s2smanager: brackets, just to be sure :)

13 years agos2smanager: Only bounce real stanzas on s2s failure, not dialback and friends (thanks...
Matthew Wild [Tue, 3 Aug 2010 08:39:05 +0000 (09:39 +0100)]
s2smanager: Only bounce real stanzas on s2s failure, not dialback and friends (thanks elghinn)

13 years agoutil.datetime: Added implementation for function parse().
Waqas Hussain [Mon, 2 Aug 2010 15:11:08 +0000 (20:11 +0500)]
util.datetime: Added implementation for function parse().

13 years agostorage/mod_ejabberd: Reorganized some code.
Waqas Hussain [Mon, 2 Aug 2010 14:04:52 +0000 (19:04 +0500)]
storage/mod_ejabberd: Reorganized some code.

13 years agoutil.sasl_cyrus: Cleanup.
Waqas Hussain [Mon, 2 Aug 2010 13:54:16 +0000 (18:54 +0500)]
util.sasl_cyrus: Cleanup.

13 years agoutil.sasl: Removed method:forbidden() and its side effects.
Waqas Hussain [Mon, 2 Aug 2010 13:47:33 +0000 (18:47 +0500)]
util.sasl: Removed method:forbidden() and its side effects.

13 years agoutil.sasl_cyrus: Removed method:forbidden().
Waqas Hussain [Mon, 2 Aug 2010 13:46:13 +0000 (18:46 +0500)]
util.sasl_cyrus: Removed method:forbidden().

13 years agomod_auth_*: Fixed copyright headers.
Waqas Hussain [Mon, 2 Aug 2010 13:44:08 +0000 (18:44 +0500)]
mod_auth_*: Fixed copyright headers.

13 years agoutil.xmppstream: Add set_session() method to change the session that a stream is...
Matthew Wild [Mon, 2 Aug 2010 09:21:26 +0000 (10:21 +0100)]
util.xmppstream: Add set_session() method to change the session that a stream is associated with

13 years agonet.xmppclient_listener: Add associate_session(conn, session) to change the session...
Matthew Wild [Mon, 2 Aug 2010 09:20:14 +0000 (10:20 +0100)]
net.xmppclient_listener: Add associate_session(conn, session) to change the session a connection is associated with

13 years agonet.server_event: Remove some debug messages
Matthew Wild [Mon, 2 Aug 2010 08:21:14 +0000 (09:21 +0100)]
net.server_event: Remove some debug messages

13 years agomod_version: Leave out the os element if hide_os_type is set
Kim Alvefur [Sun, 1 Aug 2010 13:58:10 +0000 (15:58 +0200)]
mod_version: Leave out the os element if hide_os_type is set

13 years agomod_version: Make the command used to get OS version configurable
Kim Alvefur [Sun, 1 Aug 2010 13:56:52 +0000 (15:56 +0200)]
mod_version: Make the command used to get OS version configurable

13 years agousermanager: Fix two nil global accesses
Matthew Wild [Sat, 31 Jul 2010 10:30:16 +0000 (11:30 +0100)]
usermanager: Fix two nil global accesses

13 years agomod_saslauth: Fixed a nil global access.
Waqas Hussain [Sat, 31 Jul 2010 10:16:15 +0000 (15:16 +0500)]
mod_saslauth: Fixed a nil global access.

13 years agomod_saslauth: Check for unencrypted PLAIN auth in mod_saslauth instead of the SASL...
Waqas Hussain [Sat, 31 Jul 2010 08:55:46 +0000 (13:55 +0500)]
mod_saslauth: Check for unencrypted PLAIN auth in mod_saslauth instead of the SASL handler (makes it work for Cyrus SASL).

13 years agomod_saslauth: Move mandatory encryption enforcement to before sasl_handler:select().
Waqas Hussain [Sat, 31 Jul 2010 08:49:22 +0000 (13:49 +0500)]
mod_saslauth: Move mandatory encryption enforcement to before sasl_handler:select().

13 years agostorage/mod_ejabberd (and associated library): Initial commit.
Waqas Hussain [Sat, 31 Jul 2010 08:32:57 +0000 (13:32 +0500)]
storage/mod_ejabberd (and associated library): Initial commit.

13 years agostorage/mod_xep0227: Initial commit.
Waqas Hussain [Sat, 31 Jul 2010 08:32:20 +0000 (13:32 +0500)]
storage/mod_xep0227: Initial commit.

13 years agoprosody: Enable storage manager.
Waqas Hussain [Sat, 31 Jul 2010 08:29:58 +0000 (13:29 +0500)]
prosody: Enable storage manager.

13 years agoprosody.cfg.lua.dist: Fixed trailing whitespace.
Waqas Hussain [Sat, 31 Jul 2010 07:33:34 +0000 (12:33 +0500)]
prosody.cfg.lua.dist: Fixed trailing whitespace.

13 years agoutil.pluginloader: Remove useless datamanager dependency.
Waqas Hussain [Sat, 31 Jul 2010 07:32:56 +0000 (12:32 +0500)]
util.pluginloader: Remove useless datamanager dependency.

13 years agoutil.pluginloader: Fix loading of plugins, plugin libraries and resources in subfolde...
Waqas Hussain [Sat, 31 Jul 2010 07:32:34 +0000 (12:32 +0500)]
util.pluginloader: Fix loading of plugins, plugin libraries and resources in subfolders (e.g., when loading 'a/b', load 'a/mod_b.lua', and not 'mod_a/b.lua').

13 years agoutil.roster: Remove, not going this route now
Matthew Wild [Mon, 26 Jul 2010 12:40:00 +0000 (13:40 +0100)]
util.roster: Remove, not going this route now

13 years agomod_message: Discard headline messages sent to offline full JIDs (to follow latest...
Waqas Hussain [Sun, 25 Jul 2010 21:18:03 +0000 (02:18 +0500)]
mod_message: Discard headline messages sent to offline full JIDs (to follow latest spec updates).

13 years agomod_console: Override dofile() in the console environment (this lets print() print...
Waqas Hussain [Sun, 25 Jul 2010 20:52:04 +0000 (01:52 +0500)]
mod_console: Override dofile() in the console environment (this lets print() print to the console session for example).

13 years agotests: Added tests for util.sasl.scram.Hi().
Waqas Hussain [Sun, 25 Jul 2010 20:12:52 +0000 (01:12 +0500)]
tests: Added tests for util.sasl.scram.Hi().

13 years agoutil.sasl.scram: Made function Hi public.
Waqas Hussain [Sun, 25 Jul 2010 20:00:46 +0000 (01:00 +0500)]
util.sasl.scram: Made function Hi public.

13 years agomod_console: Added support for multiple arguments to print().
Waqas Hussain [Sun, 25 Jul 2010 19:59:26 +0000 (00:59 +0500)]
mod_console: Added support for multiple arguments to print().

13 years agostoragemanager: Fixed a nil access.
Waqas Hussain [Sun, 25 Jul 2010 19:58:19 +0000 (00:58 +0500)]
storagemanager: Fixed a nil access.

13 years agoprosody.resolve_relative_path: Updated to take a parent path to resolve against.
Waqas Hussain [Fri, 23 Jul 2010 18:14:50 +0000 (23:14 +0500)]
prosody.resolve_relative_path: Updated to take a parent path to resolve against.

13 years agostoragemanager: Initial commit.
Waqas Hussain [Fri, 23 Jul 2010 18:09:58 +0000 (23:09 +0500)]
storagemanager: Initial commit.

13 years agoMerge 0.7->trunk
Matthew Wild [Fri, 23 Jul 2010 08:22:27 +0000 (09:22 +0100)]
Merge 0.7->trunk

13 years agocertmanager: Don't disable LuaSec and future cert loading on failure, and add error...
Matthew Wild [Fri, 23 Jul 2010 08:17:11 +0000 (09:17 +0100)]
certmanager: Don't disable LuaSec and future cert loading on failure, and add error messages to the no LuaSec/config cases (thanks Jakob)

13 years agonet.server_select: Remove 'now' parameter from starttls(), and base it on whether...
Matthew Wild [Thu, 22 Jul 2010 12:19:37 +0000 (13:19 +0100)]
net.server_select: Remove 'now' parameter from starttls(), and base it on whether the sendbuffer is empty instead

13 years agomod_tls: Remove extraneous flag to starttls() for s2sout connecections
Matthew Wild [Thu, 22 Jul 2010 12:13:28 +0000 (13:13 +0100)]
mod_tls: Remove extraneous flag to starttls() for s2sout connecections

13 years agonet.server_event: Fix to not call onconnect a second time after the SSL handshake...
Matthew Wild [Thu, 22 Jul 2010 10:43:42 +0000 (11:43 +0100)]
net.server_event: Fix to not call onconnect a second time after the SSL handshake for starttls connections (thanks Flo)

13 years agousermanager, mod_auth_internal_hashed, mod_legacyauth: New order of parameters for...
Matthew Wild [Wed, 21 Jul 2010 20:01:36 +0000 (21:01 +0100)]
usermanager, mod_auth_internal_hashed, mod_legacyauth: New order of parameters for usermanager.test_password - username, host, password

13 years agomod_register: Drop useless depencency on datamanager.
Waqas Hussain [Tue, 20 Jul 2010 12:42:44 +0000 (17:42 +0500)]
mod_register: Drop useless depencency on datamanager.

13 years agoMUC: Store the nick (full room JID) which set the subject, and send subject to occupa...
Waqas Hussain [Tue, 20 Jul 2010 12:39:02 +0000 (17:39 +0500)]
MUC: Store the nick (full room JID) which set the subject, and send subject to occupants from that JID.

13 years agoutil.iterators: Add skip() to skip the first n items of an iterator
Matthew Wild [Tue, 20 Jul 2010 11:37:28 +0000 (12:37 +0100)]
util.iterators: Add skip() to skip the first n items of an iterator

13 years agomod_saslauth: Got rid of undocumented and useless 'sasl_realm' config option (was...
Waqas Hussain [Sun, 18 Jul 2010 12:50:38 +0000 (17:50 +0500)]
mod_saslauth: Got rid of undocumented and useless 'sasl_realm' config option (was only used for anonymous auth, and that didn't make sense).

13 years agoMerge with trunk.
Waqas Hussain [Sat, 17 Jul 2010 14:36:14 +0000 (19:36 +0500)]
Merge with trunk.

13 years agomod_auth_internal_hashed: Fixed SCRAM-SHA-1 mechanism to not traceback on non-existen...
Waqas Hussain [Sat, 17 Jul 2010 14:34:06 +0000 (19:34 +0500)]
mod_auth_internal_hashed: Fixed SCRAM-SHA-1 mechanism to not traceback on non-existent users.

13 years agoMUC: No need to call is_admin twice now, global admins are admins on hosts
Matthew Wild [Sat, 17 Jul 2010 14:20:45 +0000 (15:20 +0100)]
MUC: No need to call is_admin twice now, global admins are admins on hosts

13 years agonet.server_event: Remove debug logging from dummy onstatus handler
Matthew Wild [Sat, 17 Jul 2010 14:17:02 +0000 (15:17 +0100)]
net.server_event: Remove debug logging from dummy onstatus handler

13 years agomod_saslauth: Cleaned up unused requires.
Waqas Hussain [Sat, 17 Jul 2010 14:02:56 +0000 (19:02 +0500)]
mod_saslauth: Cleaned up unused requires.

13 years agomod_saslauth: A little cleanup for anonymous_login.
Waqas Hussain [Sat, 17 Jul 2010 13:58:25 +0000 (18:58 +0500)]
mod_saslauth: A little cleanup for anonymous_login.

13 years agoconfigmanager: Remove dependency on eventmanager, and global 'prosody' object
Matthew Wild [Sat, 17 Jul 2010 13:50:16 +0000 (14:50 +0100)]
configmanager: Remove dependency on eventmanager, and global 'prosody' object

13 years agos2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild [Fri, 16 Jul 2010 21:47:26 +0000 (22:47 +0100)]
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing

13 years agonet.server_select: Ensure that onconnect is called for server sockets as well as...
Matthew Wild [Fri, 16 Jul 2010 21:28:50 +0000 (22:28 +0100)]
net.server_select: Ensure that onconnect is called for server sockets as well as clients, rather than onincoming. Fixes mod_console traceback, issue #197

13 years agoMerge Florob->trunk
Matthew Wild [Fri, 16 Jul 2010 15:53:54 +0000 (16:53 +0100)]
Merge Florob->trunk

13 years agoMerge Zash->trunk
Matthew Wild [Fri, 16 Jul 2010 14:19:44 +0000 (15:19 +0100)]
Merge Zash->trunk

13 years agomod_proxy65: Use util.jid.compare() and remove some clutter
Kim Alvefur [Fri, 16 Jul 2010 14:12:18 +0000 (16:12 +0200)]
mod_proxy65: Use util.jid.compare() and remove some clutter

13 years agoMerge Zash->trunk
Matthew Wild [Fri, 16 Jul 2010 14:10:45 +0000 (15:10 +0100)]
Merge Zash->trunk

13 years agoutil.jid: compare() added, with some tests.
Kim Alvefur [Thu, 15 Jul 2010 22:36:02 +0000 (00:36 +0200)]
util.jid: compare() added, with some tests.

13 years agoutil.dataforms: Add list-multi support
Florian Zeitz [Thu, 15 Jul 2010 20:58:10 +0000 (22:58 +0200)]
util.dataforms: Add list-multi support

13 years agoutil.dataforms: Capability to set default for list-single
Florian Zeitz [Thu, 15 Jul 2010 19:31:57 +0000 (21:31 +0200)]
util.dataforms: Capability to set default for list-single

13 years agoutil.sasl.scram: Reference actual RFC instead of the draft.
Tobias Markmann [Thu, 15 Jul 2010 19:14:07 +0000 (21:14 +0200)]
util.sasl.scram: Reference actual RFC instead of the draft.

13 years agoutil.sasl, util.sasl_cyrus: s/self.mechanisms()/self:mechanisms()/ in method:select().
Waqas Hussain [Thu, 15 Jul 2010 17:07:45 +0000 (22:07 +0500)]
util.sasl, util.sasl_cyrus: s/self.mechanisms()/self:mechanisms()/ in method:select().

13 years agoMerge with backout
Matthew Wild [Thu, 15 Jul 2010 07:27:56 +0000 (08:27 +0100)]
Merge with backout

13 years agoBacked out changeset 598c33a99a31 (already fixed a better way)
Matthew Wild [Thu, 15 Jul 2010 07:25:50 +0000 (08:25 +0100)]
Backed out changeset 598c33a99a31 (already fixed a better way)

13 years agocertmanager: Use an empty table as the default ssl config when a global 'ssl' config...
Waqas Hussain [Thu, 15 Jul 2010 06:25:41 +0000 (11:25 +0500)]
certmanager: Use an empty table as the default ssl config when a global 'ssl' config option isn't specified (fixes a top-level traceback on startup).

13 years agocertmanager: Fix to handle the case of no SSL configuration at all
Matthew Wild [Wed, 14 Jul 2010 15:24:15 +0000 (16:24 +0100)]
certmanager: Fix to handle the case of no SSL configuration at all

13 years agocertmanager: Added copyright header.
Waqas Hussain [Thu, 15 Jul 2010 06:28:31 +0000 (11:28 +0500)]
certmanager: Added copyright header.

13 years agocertmanager: Defined default_capath to prevent a global nil access.
Waqas Hussain [Thu, 15 Jul 2010 06:28:14 +0000 (11:28 +0500)]
certmanager: Defined default_capath to prevent a global nil access.

13 years agoutil.sasl, util.sasl_cyrus: Use method:mechanisms() in method:select(), instead of...
Waqas Hussain [Wed, 14 Jul 2010 15:21:51 +0000 (20:21 +0500)]
util.sasl, util.sasl_cyrus: Use method:mechanisms() in method:select(), instead of using the mechanisms list directly (fixes a traceback).

13 years agoutil.sasl, util.sasl_cyrus: Updated method:mechanisms() to cache and re-use list...
Waqas Hussain [Wed, 14 Jul 2010 15:10:35 +0000 (20:10 +0500)]
util.sasl, util.sasl_cyrus: Updated method:mechanisms() to cache and re-use list of mechanisms.

13 years agoutil.sasl: Use the proper session-specific table of mechanisms when selecting a mecha...
Waqas Hussain [Wed, 14 Jul 2010 15:05:25 +0000 (20:05 +0500)]
util.sasl: Use the proper session-specific table of mechanisms when selecting a mechanism, and not the global table.

13 years agoSASL: Simplified sasl_handler:mechanisms() to return a set, and not an array.
Waqas Hussain [Wed, 14 Jul 2010 14:56:57 +0000 (19:56 +0500)]
SASL: Simplified sasl_handler:mechanisms() to return a set, and not an array.

13 years agousermanager: Return a non-nil SASL handler from the null auth provider (fixes a trace...
Waqas Hussain [Wed, 14 Jul 2010 14:49:43 +0000 (19:49 +0500)]
usermanager: Return a non-nil SASL handler from the null auth provider (fixes a traceback).

13 years agoMUC: Fixed a traceback introduced in hg:bdc325ce9fbc.
Waqas Hussain [Wed, 14 Jul 2010 14:48:01 +0000 (19:48 +0500)]
MUC: Fixed a traceback introduced in hg:bdc325ce9fbc.

13 years agonet.dns: Call :cancel() on the current resolver instead of the prototype
Matthew Wild [Wed, 14 Jul 2010 14:32:14 +0000 (15:32 +0100)]
net.dns: Call :cancel() on the current resolver instead of the prototype

13 years agoutil.roster: Initial skeleton commit
Matthew Wild [Wed, 14 Jul 2010 00:36:08 +0000 (01:36 +0100)]
util.roster: Initial skeleton commit

13 years agologgingmanager: Add reload_logging() method, which gets called on any config reload...
Matthew Wild [Wed, 14 Jul 2010 00:25:32 +0000 (01:25 +0100)]
loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart.

13 years agoutil.logger: Add reset() method to clear all sinks
Matthew Wild [Wed, 14 Jul 2010 00:23:14 +0000 (01:23 +0100)]
util.logger: Add reset() method to clear all sinks

13 years agocertmanager: Remove debug logging accidentally committed
Matthew Wild [Tue, 13 Jul 2010 14:28:52 +0000 (15:28 +0100)]
certmanager: Remove debug logging accidentally committed

13 years agocertmanager: Adjust paths of SSL key/certs to be relative to the config file, fixes...
Matthew Wild [Tue, 13 Jul 2010 12:56:14 +0000 (13:56 +0100)]
certmanager: Adjust paths of SSL key/certs to be relative to the config file, fixes #147

13 years agoprosody: Add prosody.resolve_relative_path() helper to change relative paths to be...
Matthew Wild [Tue, 13 Jul 2010 12:55:18 +0000 (13:55 +0100)]
prosody: Add prosody.resolve_relative_path() helper to change relative paths to be relative to the config file

13 years agomod_httpserver: Serve index.html if a request is made for a directory and it contains...
Matthew Wild [Tue, 13 Jul 2010 08:25:45 +0000 (09:25 +0100)]
mod_httpserver: Serve index.html if a request is made for a directory and it contains one (thanks Brian Cully)

13 years agoconfigure: Make it possible to override ostype presets with values specified later...
Matthew Wild [Tue, 13 Jul 2010 07:59:00 +0000 (08:59 +0100)]
configure: Make it possible to override ostype presets with values specified later on the command-line

13 years agoconfigure: Fix ostype=freebsd for ./configure (thanks dersd for reporting and n0nsens...
Matthew Wild [Tue, 13 Jul 2010 00:16:15 +0000 (01:16 +0100)]
configure: Fix ostype=freebsd for ./configure (thanks dersd for reporting and n0nsense for testing the fix!)

13 years agomod_saslauth: Rename variable 'aret' to 'ok' as per convention
Matthew Wild [Mon, 12 Jul 2010 15:44:56 +0000 (16:44 +0100)]
mod_saslauth: Rename variable 'aret' to 'ok' as per convention

13 years agomod_disco: Reflect requested 'node' attribute in the disco#info reply.
Waqas Hussain [Sun, 11 Jul 2010 19:14:48 +0000 (00:14 +0500)]
mod_disco: Reflect requested 'node' attribute in the disco#info reply.

13 years agomod_disco: Respond to disco#info to the correct caps hash node ("node#ver").
Waqas Hussain [Sun, 11 Jul 2010 18:51:40 +0000 (23:51 +0500)]
mod_disco: Respond to disco#info to the correct caps hash node ("node#ver").

13 years agomod_disco: Cache disco#info reply and caps hash for host, return correct caps hash...
Waqas Hussain [Sun, 11 Jul 2010 16:21:38 +0000 (21:21 +0500)]
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.

13 years agomod_adhoc: Add capability to pass data to forms
Florian Zeitz [Fri, 9 Jul 2010 23:17:07 +0000 (01:17 +0200)]
mod_adhoc: Add capability to pass data to forms

13 years agoxmpp{client,server}_listener: Convert some calls to tail calls for efficiency
Matthew Wild [Fri, 9 Jul 2010 12:28:41 +0000 (13:28 +0100)]
xmpp{client,server}_listener: Convert some calls to tail calls for efficiency

13 years agomod_pep: Use util.caps
Matthew Wild [Fri, 9 Jul 2010 12:22:58 +0000 (13:22 +0100)]
mod_pep: Use util.caps

13 years agomod_disco: Support for putting the server's caps hash in stream:features to allow...
Matthew Wild [Fri, 9 Jul 2010 12:20:00 +0000 (13:20 +0100)]
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.

13 years agoutil.caps: Entity capabilities hash generation (moved from mod_pep)
Matthew Wild [Fri, 9 Jul 2010 12:18:42 +0000 (13:18 +0100)]
util.caps: Entity capabilities hash generation (moved from mod_pep)

13 years agomod_posix: Some (perhaps temporary) changes to re-lock the pidfile after truncating...
Matthew Wild [Fri, 9 Jul 2010 00:23:54 +0000 (01:23 +0100)]
mod_posix: Some (perhaps temporary) changes to re-lock the pidfile after truncating, to avoid breaking prosodyctl

13 years agomod_posix: Truncate the pidfile before writing to ensure that we never overwrite...
Brian Cully [Fri, 9 Jul 2010 00:16:09 +0000 (01:16 +0100)]
mod_posix: Truncate the pidfile before writing to ensure that we never overwrite with a PID shorter than the previous, and end with an invalid PID in the file.

13 years agoprosodyctl: Warn and exit if any log files are not writeable, fixes #94
Matthew Wild [Fri, 9 Jul 2010 00:09:57 +0000 (01:09 +0100)]
prosodyctl: Warn and exit if any log files are not writeable, fixes #94

13 years agoprosodyctl: Force log output always to the console instead of using the config, which...
Matthew Wild [Thu, 8 Jul 2010 22:56:53 +0000 (23:56 +0100)]
prosodyctl: Force log output always to the console instead of using the config, which avoids creating log files as the wrong user