prosody.git
12 years agoMerge with backout
Matthew Wild [Fri, 11 May 2012 20:35:08 +0000 (21:35 +0100)]
Merge with backout

12 years agoBacked out changeset 52b6901cabb0 (to be replaced)
Matthew Wild [Fri, 11 May 2012 20:35:02 +0000 (21:35 +0100)]
Backed out changeset 52b6901cabb0 (to be replaced)

12 years agoportmanager: Remove unused import of 'package'
Matthew Wild [Fri, 11 May 2012 20:27:42 +0000 (21:27 +0100)]
portmanager: Remove unused import of 'package'

12 years agoportmanager: Support for per-port SSL certificates
Matthew Wild [Fri, 11 May 2012 20:24:43 +0000 (21:24 +0100)]
portmanager: Support for per-port SSL certificates

12 years agocertmanager: Adjust error messages to be non-specific about 'host' (so we can specify...
Matthew Wild [Fri, 11 May 2012 19:24:15 +0000 (20:24 +0100)]
certmanager: Adjust error messages to be non-specific about 'host' (so we can specify a service name instead ffor SSL)

12 years agomoduleapi: Don't auto-reload self when already reloading (fixes reload of modules...
Matthew Wild [Fri, 11 May 2012 17:55:23 +0000 (18:55 +0100)]
moduleapi: Don't auto-reload self when already reloading (fixes reload of modules with cyclic dependencies)

12 years agomodulemanager: Set module.reloading = true when firing module-reloaded event
Matthew Wild [Fri, 11 May 2012 17:54:17 +0000 (18:54 +0100)]
modulemanager: Set module.reloading = true when firing module-reloaded event

12 years agomod_c2s: Another lurking string.format squashed.
Matthew Wild [Fri, 11 May 2012 13:57:29 +0000 (14:57 +0100)]
mod_c2s: Another lurking string.format squashed.

12 years agomod_dialback: Remove a remaining usage of string.format, ick.
Matthew Wild [Fri, 11 May 2012 13:24:05 +0000 (14:24 +0100)]
mod_dialback: Remove a remaining usage of string.format, ick.

12 years agomod_http_errors: Fix cyclic dependency - mod_http depends on us now, no need to depen...
Matthew Wild [Fri, 11 May 2012 01:36:26 +0000 (02:36 +0100)]
mod_http_errors: Fix cyclic dependency - mod_http depends on us now, no need to depend on it (-1 line) (thanks Maranda)

12 years agomod_s2s: Remove TODO comment for SASL/TLS on s2s (thanks Florob)
Matthew Wild [Fri, 11 May 2012 01:17:20 +0000 (02:17 +0100)]
mod_s2s: Remove TODO comment for SASL/TLS on s2s (thanks Florob)

12 years agomod_dialback: Final sweep to get nameprep + error handling in order (hopefully)
Matthew Wild [Fri, 11 May 2012 01:04:29 +0000 (02:04 +0100)]
mod_dialback: Final sweep to get nameprep + error handling in order (hopefully)

12 years agomod_dialback: Fix logic bug - we should have both a to and from at this point
Matthew Wild [Fri, 11 May 2012 00:54:36 +0000 (01:54 +0100)]
mod_dialback: Fix logic bug - we should have both a to and from at this point

12 years agoMerge with Maranda
Matthew Wild [Fri, 11 May 2012 00:53:32 +0000 (01:53 +0100)]
Merge with Maranda

12 years agoMerge with backout
Matthew Wild [Fri, 11 May 2012 00:46:41 +0000 (01:46 +0100)]
Merge with backout

12 years agoBacked out changeset 661752889535 - obsoleted by 878f75ccc4fb.
Matthew Wild [Fri, 11 May 2012 00:46:35 +0000 (01:46 +0100)]
Backed out changeset 661752889535 - obsoleted by 878f75ccc4fb.

12 years agoMerge with backout
Matthew Wild [Fri, 11 May 2012 00:45:36 +0000 (01:45 +0100)]
Merge with backout

12 years agoBacked out changeset 9f1fb34cd7f8 - obsoleted by 5ef05f32bc42.
Matthew Wild [Fri, 11 May 2012 00:39:52 +0000 (01:39 +0100)]
Backed out changeset 9f1fb34cd7f8 - obsoleted by 5ef05f32bc42.

12 years agoMerge with backout
Matthew Wild [Fri, 11 May 2012 00:32:46 +0000 (01:32 +0100)]
Merge with backout

12 years agoBacked out changeset 751510cd558d - obsoleted by 5ef05f32bc42.
Matthew Wild [Fri, 11 May 2012 00:29:30 +0000 (01:29 +0100)]
Backed out changeset 751510cd558d - obsoleted by 5ef05f32bc42.

12 years agomod_s2s, mod_auth_anonymous, hostmanager: Remove disallow_s2s flag, deprecate the...
Matthew Wild [Thu, 10 May 2012 23:56:18 +0000 (00:56 +0100)]
mod_s2s, mod_auth_anonymous, hostmanager: Remove disallow_s2s flag, deprecate the config option of the same name (disable mod_s2s instead), and add 'allow_anonymous_s2s' to separately control s2s for anonymous users

12 years agomuc.lib: return feature-not-implemented when a foregoing discovery node is specified...
Marco Cirillo [Thu, 10 May 2012 23:37:36 +0000 (23:37 +0000)]
muc.lib: return feature-not-implemented when a foregoing discovery node is specified in a disco#info request.

12 years agoMerge with Zash
Matthew Wild [Thu, 10 May 2012 22:10:56 +0000 (23:10 +0100)]
Merge with Zash

12 years agomod_s2s, s2smanager, mod_dialback: Move addition of session.send() on s2sin to after...
Matthew Wild [Thu, 10 May 2012 21:59:01 +0000 (22:59 +0100)]
mod_s2s, s2smanager, mod_dialback: Move addition of session.send() on s2sin to after they are authenticated (thus from mod_s2s to s2smanager). Update mod_dialback to fire route/remote directly, as session.send() is no longer available for s2sin_unauthed. Fixes #291.

12 years agos2smanager, mod_s2s: Move checking DNS timeout option to mod_s2s
Kim Alvefur [Thu, 10 May 2012 21:05:03 +0000 (23:05 +0200)]
s2smanager, mod_s2s: Move checking DNS timeout option to mod_s2s

12 years agos2smanager: Clean up unused imports.
Kim Alvefur [Thu, 10 May 2012 21:01:10 +0000 (23:01 +0200)]
s2smanager: Clean up unused imports.

12 years agoutil.rfc3484: Don't pollute the global scope.
Kim Alvefur [Thu, 10 May 2012 21:00:45 +0000 (23:00 +0200)]
util.rfc3484: Don't pollute the global scope.

12 years agomod_auth_anonymous: add disallow_s2s to the host object if s2s communication is disal...
Marco Cirillo [Thu, 10 May 2012 12:54:37 +0000 (12:54 +0000)]
mod_auth_anonymous: add disallow_s2s to the host object if s2s communication is disallowed.

12 years agoutil.hashes: Add sha224, sha384, sha512
Kim Alvefur [Thu, 10 May 2012 03:57:24 +0000 (05:57 +0200)]
util.hashes: Add sha224, sha384, sha512

12 years agomod_dialback: make change a bit more wide, encompass to and from and reject with...
Marco Cirillo [Wed, 9 May 2012 23:09:06 +0000 (23:09 +0000)]
mod_dialback: make change a bit more wide, encompass to and from and reject with proper addressing when neither are there.

12 years agomod_dialback: add better safe then sorry nameprepping to the from attribute.
Marco Cirillo [Wed, 9 May 2012 11:25:22 +0000 (11:25 +0000)]
mod_dialback: add better safe then sorry nameprepping to the from attribute.

12 years agomod_dialback: COMPAT reset session.send function for servers (e.g. ejabberd) which...
Marco Cirillo [Wed, 9 May 2012 02:56:22 +0000 (02:56 +0000)]
mod_dialback: COMPAT reset session.send function for servers (e.g. ejabberd) which don't include a from attr when opening the stream.

12 years agoutil.hashes: Use defined hash function output lengths.
Kim Alvefur [Tue, 8 May 2012 23:26:56 +0000 (01:26 +0200)]
util.hashes: Use defined hash function output lengths.

12 years agoprosodyctl: Show an error if the user doesn't supply a hostname to the certificate...
Kim Alvefur [Tue, 8 May 2012 23:11:27 +0000 (01:11 +0200)]
prosodyctl: Show an error if the user doesn't supply a hostname to the certificate commands

12 years agoprosodyctl: Replace hack with lfs for checking if a file exists
Kim Alvefur [Tue, 8 May 2012 23:02:00 +0000 (01:02 +0200)]
prosodyctl: Replace hack with lfs for checking if a file exists

12 years agoutil.x509: Remove logic for generating certificate configs
Kim Alvefur [Tue, 8 May 2012 22:34:24 +0000 (00:34 +0200)]
util.x509: Remove logic for generating certificate configs

12 years agoprosodyctl: Use util.openssl in certificate helpers. Improve feedback
Kim Alvefur [Tue, 8 May 2012 22:33:55 +0000 (00:33 +0200)]
prosodyctl: Use util.openssl in certificate helpers. Improve feedback

12 years agoutil.openssl: Add wrapper for the openssl cli tool and move certificate config logic...
Kim Alvefur [Tue, 8 May 2012 22:12:53 +0000 (00:12 +0200)]
util.openssl: Add wrapper for the openssl cli tool and move certificate config logic from util.x509 into it.

12 years agomod_auth_anonymous: Block s2s when enabled on a host (and disallow_s2s ~= false)
Matthew Wild [Fri, 4 May 2012 01:28:10 +0000 (02:28 +0100)]
mod_auth_anonymous: Block s2s when enabled on a host (and disallow_s2s ~= false)

12 years agomod_s2s: Cache to_host and from_host in local variables, and use these instead of...
Matthew Wild [Fri, 4 May 2012 01:27:26 +0000 (02:27 +0100)]
mod_s2s: Cache to_host and from_host in local variables, and use these instead of repeated lookups

12 years agomod_s2s: Add session.send() only to incoming streams, and fire the route/remote event...
Matthew Wild [Fri, 4 May 2012 01:22:26 +0000 (02:22 +0100)]
mod_s2s: Add session.send() only to incoming streams, and fire the route/remote event on the host (not global anymore)

12 years agomod_s2s: Become a shared module (yay)
Matthew Wild [Fri, 4 May 2012 00:50:17 +0000 (01:50 +0100)]
mod_s2s: Become a shared module (yay)

12 years agostanza_router: Fire route/remote per-host
Matthew Wild [Fri, 4 May 2012 00:49:13 +0000 (01:49 +0100)]
stanza_router: Fire route/remote per-host

12 years agostanza_router: Allow route/remote handlers to return false to block a stanza
Matthew Wild [Fri, 4 May 2012 00:46:54 +0000 (01:46 +0100)]
stanza_router: Allow route/remote handlers to return false to block a stanza

12 years agoprosodyctl: Fix import of util.iterators
Kim Alvefur [Thu, 3 May 2012 23:13:33 +0000 (01:13 +0200)]
prosodyctl: Fix import of util.iterators

12 years agoRename plugins/s2s/ to plugins/mod_s2s/
Matthew Wild [Thu, 3 May 2012 23:05:15 +0000 (00:05 +0100)]
Rename plugins/s2s/ to plugins/mod_s2s/

12 years agosessionmanager: Remove max_resources config option and check, incorrect anyway (thank...
Matthew Wild [Thu, 3 May 2012 22:18:56 +0000 (23:18 +0100)]
sessionmanager: Remove max_resources config option and check, incorrect anyway (thanks Zash)

12 years agoutil.timer: Remove unnecessary require calls, fixes a traceback (thanks nulani)
Matthew Wild [Thu, 3 May 2012 17:59:06 +0000 (18:59 +0100)]
util.timer: Remove unnecessary require calls, fixes a traceback (thanks nulani)

12 years agonet.server: server_select != server_event (thanks Nulani, Florob)
Matthew Wild [Thu, 3 May 2012 17:53:36 +0000 (18:53 +0100)]
net.server: server_select != server_event (thanks Nulani, Florob)

12 years agoMerge with Zash
Matthew Wild [Thu, 3 May 2012 15:52:04 +0000 (16:52 +0100)]
Merge with Zash

12 years agonet.server, net.timer, net.server_select: Rearrange dependencies between these three...
Matthew Wild [Thu, 3 May 2012 15:48:34 +0000 (16:48 +0100)]
net.server, net.timer, net.server_select: Rearrange dependencies between these three modules. server.addtimer() is no longer a public function (renamed to _addtimer) and is not available at all from server_event (compat code removed to prevent traceback) (thanks Nulani)

12 years agoportmanager: Import pairs
Kim Alvefur [Thu, 3 May 2012 13:38:12 +0000 (15:38 +0200)]
portmanager: Import pairs

12 years agomod_admin_telnet: Add muc:room(jid) command to get the MUC room object
Matthew Wild [Wed, 2 May 2012 17:21:47 +0000 (18:21 +0100)]
mod_admin_telnet: Add muc:room(jid) command to get the MUC room object

12 years agomod_component: Allow unauthenticated components to authenticate (thanks Maranda)
Matthew Wild [Mon, 30 Apr 2012 00:20:13 +0000 (01:20 +0100)]
mod_component: Allow unauthenticated components to authenticate (thanks Maranda)

12 years agomod_component: Components start out as component_unauthed until successful authentica...
Matthew Wild [Mon, 30 Apr 2012 00:02:39 +0000 (01:02 +0100)]
mod_component: Components start out as component_unauthed until successful authentication (thanks xnyhps)

12 years agomodulemanager: Pass the module's final host (e.g. '*') to the module-loaded event
Matthew Wild [Sun, 29 Apr 2012 23:52:43 +0000 (00:52 +0100)]
modulemanager: Pass the module's final host (e.g. '*') to the module-loaded event

12 years agomod_component: Send <?xml on initial stream (thanks xnyhps)
Matthew Wild [Sun, 29 Apr 2012 23:42:02 +0000 (00:42 +0100)]
mod_component: Send <?xml on initial stream (thanks xnyhps)

12 years agoutil.xmlrpc: Remove (unused)
Matthew Wild [Sun, 29 Apr 2012 20:20:35 +0000 (21:20 +0100)]
util.xmlrpc: Remove (unused)

12 years agomodulemanager: Hide deprecation warning for modules loaded on '*' directly (e.g....
Matthew Wild [Sun, 29 Apr 2012 18:36:11 +0000 (19:36 +0100)]
modulemanager: Hide deprecation warning for modules loaded on '*' directly (e.g. prosodyctl mod_<command>) (thanks Zash)

12 years agoportmanager: Import ipairs (thanks Maranda)
Matthew Wild [Sun, 29 Apr 2012 18:31:44 +0000 (19:31 +0100)]
portmanager: Import ipairs (thanks Maranda)

12 years agoMerge with Zash
Matthew Wild [Sun, 29 Apr 2012 01:44:09 +0000 (02:44 +0100)]
Merge with Zash

12 years agoMerge 0.9->trunk
Matthew Wild [Sun, 29 Apr 2012 01:10:55 +0000 (02:10 +0100)]
Merge 0.9->trunk

12 years agoMerge with Zash
Matthew Wild [Sun, 29 Apr 2012 01:09:12 +0000 (02:09 +0100)]
Merge with Zash

12 years agomod_s2s: Don't try to continue attempting to connect when an s2sin is closed
Kim Alvefur [Sun, 29 Apr 2012 00:24:00 +0000 (02:24 +0200)]
mod_s2s: Don't try to continue attempting to connect when an s2sin is closed

12 years agonet.connlisteners: Add COMPAT stub, use portmanager!
Matthew Wild [Sat, 28 Apr 2012 22:13:49 +0000 (23:13 +0100)]
net.connlisteners: Add COMPAT stub, use portmanager!

12 years agos2sout.lib: Check whether lua-socket supports IPv6
Florian Zeitz [Sat, 28 Apr 2012 20:34:05 +0000 (22:34 +0200)]
s2sout.lib: Check whether lua-socket supports IPv6

12 years agomoduleapi: Add module:get_directory() to get module file's directory, and module...
Matthew Wild [Sat, 28 Apr 2012 18:41:04 +0000 (19:41 +0100)]
moduleapi: Add module:get_directory() to get module file's directory, and module:load_resource() to load a file relative to that directory

12 years agoportmanager: Import tonumber (thanks Zash)
Matthew Wild [Sat, 28 Apr 2012 18:38:51 +0000 (19:38 +0100)]
portmanager: Import tonumber (thanks Zash)

12 years agonet.http.server: Code cleanup/adjustment now that send_response() accepts response...
Matthew Wild [Sat, 28 Apr 2012 18:36:57 +0000 (19:36 +0100)]
net.http.server: Code cleanup/adjustment now that send_response() accepts response.body

12 years agonet.http.server: Use response.body if it exists and body is not specified to send_res...
Matthew Wild [Sat, 28 Apr 2012 18:36:09 +0000 (19:36 +0100)]
net.http.server: Use response.body if it exists and body is not specified to send_response

12 years agoportmanager: Ensure port is always a number (thanks Zash)
Matthew Wild [Sat, 28 Apr 2012 17:45:04 +0000 (18:45 +0100)]
portmanager: Ensure port is always a number (thanks Zash)

12 years agomod_muc/muc.lib: Fall back to default_history_length if no length in config
Matthew Wild [Sat, 28 Apr 2012 17:36:03 +0000 (18:36 +0100)]
mod_muc/muc.lib: Fall back to default_history_length if no length in config

12 years agonet.httpserver: Add compatibility stub
Matthew Wild [Sat, 28 Apr 2012 15:41:35 +0000 (16:41 +0100)]
net.httpserver: Add compatibility stub

12 years agomod_s2s: Log certificate errors, for troubleshooting goodness
Paul Aurich [Sat, 28 Apr 2012 15:35:34 +0000 (08:35 -0700)]
mod_s2s: Log certificate errors, for troubleshooting goodness

12 years agomod_s2s: Fix import of core_process_stanza. I don't know why I thought it was there...
Matthew Wild [Sat, 28 Apr 2012 15:29:00 +0000 (16:29 +0100)]
mod_s2s: Fix import of core_process_stanza. I don't know why I thought it was there (thanks Zash)

12 years agoMerge with Zash
Matthew Wild [Sat, 28 Apr 2012 15:22:17 +0000 (16:22 +0100)]
Merge with Zash

12 years agomod_admin_adhoc: Small style fix
Matthew Wild [Sat, 28 Apr 2012 15:21:57 +0000 (16:21 +0100)]
mod_admin_adhoc: Small style fix

12 years agoutil.debug: Add +1 to level when getting locals table, to account for current function
Matthew Wild [Sat, 28 Apr 2012 15:21:19 +0000 (16:21 +0100)]
util.debug: Add +1 to level when getting locals table, to account for current function

12 years agoutil.debug: Re-fix parameter handling (I think it matches debug.traceback() more...
Matthew Wild [Sat, 28 Apr 2012 15:20:26 +0000 (16:20 +0100)]
util.debug: Re-fix parameter handling (I think it matches debug.traceback() more accurately now) and document level fudge

12 years agomod_admin_telnet: Add c2s:count() which shows number of connected users.
Kim Alvefur [Sat, 28 Apr 2012 15:18:03 +0000 (17:18 +0200)]
mod_admin_telnet: Add c2s:count() which shows number of connected users.

12 years agomodulemanager: Fixes to handle circular dependencies in module:depends()
Matthew Wild [Sat, 28 Apr 2012 14:47:43 +0000 (15:47 +0100)]
modulemanager: Fixes to handle circular dependencies in module:depends()

12 years agoprosody.cfg.lua.dist: Rename mod_httpserver to mod_http_files, and move both it and...
Matthew Wild [Sat, 28 Apr 2012 13:48:12 +0000 (14:48 +0100)]
prosody.cfg.lua.dist: Rename mod_httpserver to mod_http_files, and move both it and mod_bosh to a new 'HTTP modules' category

12 years agomod_http: Depend on mod_http_errors
Matthew Wild [Sat, 28 Apr 2012 13:46:36 +0000 (14:46 +0100)]
mod_http: Depend on mod_http_errors

12 years agousermanager: Add log error for use of COMPAT config option 'anonymous_login'. To...
Matthew Wild [Sat, 28 Apr 2012 13:35:52 +0000 (14:35 +0100)]
usermanager: Add log error for use of COMPAT config option 'anonymous_login'. To be removed in next version.

12 years agoutil.httpstream: Remove COMPAT properties from request
Matthew Wild [Sat, 28 Apr 2012 13:31:02 +0000 (14:31 +0100)]
util.httpstream: Remove COMPAT properties from request

12 years agonet.http.server: Remove unused imports and variables (fixes traceback due to removed...
Matthew Wild [Sat, 28 Apr 2012 13:27:48 +0000 (14:27 +0100)]
net.http.server: Remove unused imports and variables (fixes traceback due to removed net.httpserver)

12 years agonet.httpserver, net.httpserver_listener: Remove (obsoleted by net.http.* and mod_http...
Matthew Wild [Sat, 28 Apr 2012 13:13:51 +0000 (14:13 +0100)]
net.httpserver, net.httpserver_listener: Remove (obsoleted by net.http.* and mod_http, see prosody.im/doc/developers/http )

12 years agomod_bosh: Remove unused send_buffer variable
Matthew Wild [Sat, 28 Apr 2012 13:03:39 +0000 (14:03 +0100)]
mod_bosh: Remove unused send_buffer variable

12 years agomod_bosh: Fix request/response mixup
Matthew Wild [Sat, 28 Apr 2012 12:58:37 +0000 (13:58 +0100)]
mod_bosh: Fix request/response mixup

12 years agomod_bosh: Remove unused import of util.timer
Matthew Wild [Sat, 28 Apr 2012 12:58:13 +0000 (13:58 +0100)]
mod_bosh: Remove unused import of util.timer

12 years agomod_muc/muc.lib.lua: Remove unused imports and variables
Matthew Wild [Sat, 28 Apr 2012 03:12:34 +0000 (04:12 +0100)]
mod_muc/muc.lib.lua: Remove unused imports and variables

12 years agomod_auth_anonymous: Remove unused logger init
Matthew Wild [Sat, 28 Apr 2012 03:01:59 +0000 (04:01 +0100)]
mod_auth_anonymous: Remove unused logger init

12 years agomod_auth_internal_hashed: Remove COMPAT code (upgrading old hashed storage format...
Matthew Wild [Sat, 28 Apr 2012 02:59:31 +0000 (03:59 +0100)]
mod_auth_internal_hashed: Remove COMPAT code (upgrading old hashed storage format from pre-0.8)

12 years agomod_auth_internal_hashed: Remove unused imports
Matthew Wild [Sat, 28 Apr 2012 02:55:25 +0000 (03:55 +0100)]
mod_auth_internal_hashed: Remove unused imports

12 years agomod_auth_internal_plain: Remove unused imports
Matthew Wild [Sat, 28 Apr 2012 02:49:13 +0000 (03:49 +0100)]
mod_auth_internal_plain: Remove unused imports

12 years agomod_dialback: Remove unused declaration of xmlns_dialback
Matthew Wild [Sat, 28 Apr 2012 02:43:27 +0000 (03:43 +0100)]
mod_dialback: Remove unused declaration of xmlns_dialback

12 years agomod_iq: Remove unused import of jid.split, bare_sessions and don't unpack event.origi...
Matthew Wild [Sat, 28 Apr 2012 02:39:12 +0000 (03:39 +0100)]
mod_iq: Remove unused import of jid.split, bare_sessions and don't unpack event.origin when it isn't used. Waqas.

12 years agomod_message: Remove unused import of table.insert
Matthew Wild [Sat, 28 Apr 2012 02:34:58 +0000 (03:34 +0100)]
mod_message: Remove unused import of table.insert

12 years agostoragemanager: Fix incorrect variable name
Matthew Wild [Sat, 28 Apr 2012 02:25:40 +0000 (03:25 +0100)]
storagemanager: Fix incorrect variable name

12 years agomod_component: Remove unused variable
Matthew Wild [Sat, 28 Apr 2012 02:13:59 +0000 (03:13 +0100)]
mod_component: Remove unused variable