prosody.git
11 years agoBacked out changeset 72a2eec4204a (incomplete fix)
Matthew Wild [Sun, 8 Jul 2012 17:48:22 +0000 (18:48 +0100)]
Backed out changeset 72a2eec4204a (incomplete fix)

11 years agomod_auth_anonymous: Attach a fake roster to the session, so the null storage backend...
Kim Alvefur [Sat, 7 Jul 2012 01:42:31 +0000 (03:42 +0200)]
mod_auth_anonymous: Attach a fake roster to the session, so the null storage backend can be used

11 years agousermanager: Pass session on to auth provider (missing half of commit 0545a574667b...
Matthew Wild [Sat, 7 Jul 2012 01:32:39 +0000 (02:32 +0100)]
usermanager: Pass session on to auth provider (missing half of commit 0545a574667b) (thanks Zash)

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 5 Jul 2012 16:42:19 +0000 (17:42 +0100)]
Merge 0.9->trunk

11 years agoMerge (some of) trunk -> 0.9
Matthew Wild [Thu, 5 Jul 2012 16:41:57 +0000 (17:41 +0100)]
Merge (some of) trunk -> 0.9

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 5 Jul 2012 16:40:12 +0000 (17:40 +0100)]
Merge 0.9->trunk

11 years agomod_saslauth: Pass session to usermanager.get_sasl_handler()
Matthew Wild [Wed, 4 Jul 2012 22:44:13 +0000 (23:44 +0100)]
mod_saslauth: Pass session to usermanager.get_sasl_handler()

11 years agoTODO: Add statistics
Matthew Wild [Wed, 4 Jul 2012 22:43:18 +0000 (23:43 +0100)]
TODO: Add statistics

11 years agomod_admin_web: Use util.dataforms' own error checking
Florian Zeitz [Wed, 4 Jul 2012 22:15:49 +0000 (00:15 +0200)]
mod_admin_web: Use util.dataforms' own error checking

12 years agoutil.logger: Remove some redundant code
Matthew Wild [Sun, 24 Jun 2012 23:16:08 +0000 (00:16 +0100)]
util.logger: Remove some redundant code

11 years agoutil.stanza: Make stanza:childtags() behave like :get_child()
Kim Alvefur [Thu, 5 Jul 2012 15:58:47 +0000 (17:58 +0200)]
util.stanza: Make stanza:childtags() behave like :get_child()

11 years agoprosodyctl: Fix typo
Kim Alvefur [Tue, 3 Jul 2012 13:56:32 +0000 (15:56 +0200)]
prosodyctl: Fix typo

11 years agoutil.pposix: Add setenv()
Kim Alvefur [Tue, 3 Jul 2012 13:43:46 +0000 (15:43 +0200)]
util.pposix: Add setenv()

12 years agoutil.sasl: Make registerMechanism a public function
Matthew Wild [Mon, 18 Jun 2012 15:57:46 +0000 (16:57 +0100)]
util.sasl: Make registerMechanism a public function

12 years agomod_dialback: Skip an unnecessary nameprep.
Waqas Hussain [Thu, 14 Jun 2012 21:53:57 +0000 (02:53 +0500)]
mod_dialback: Skip an unnecessary nameprep.

12 years agos2smanager: Fix a traceback when we close a s2s connection ourselves (thanks for...
Waqas Hussain [Wed, 13 Jun 2012 06:47:04 +0000 (11:47 +0500)]
s2smanager: Fix a traceback when we close a s2s connection ourselves (thanks for the testing Zash).

12 years agoMerge 0.9->trunk
Matthew Wild [Tue, 12 Jun 2012 16:31:55 +0000 (17:31 +0100)]
Merge 0.9->trunk

12 years agoutil.dataforms: Fix parsing of -multi fields
Florian Zeitz [Tue, 12 Jun 2012 16:29:58 +0000 (18:29 +0200)]
util.dataforms: Fix parsing of -multi fields

12 years agoMerge with trunk
Matthew Wild [Tue, 12 Jun 2012 12:55:56 +0000 (13:55 +0100)]
Merge with trunk

12 years agomod_adhoc, mod_admin_adhoc, mod_announce: Use module:provides() to manage Ad-Hoc...
Florian Zeitz [Tue, 12 Jun 2012 12:29:04 +0000 (14:29 +0200)]
mod_adhoc, mod_admin_adhoc, mod_announce: Use module:provides() to manage Ad-Hoc commands

12 years agocertmanager: Add quotes around cert file path when logging.
Waqas Hussain [Tue, 12 Jun 2012 12:02:35 +0000 (17:02 +0500)]
certmanager: Add quotes around cert file path when logging.

12 years agoMUC: Handle missing persistent room data.
Waqas Hussain [Tue, 12 Jun 2012 11:55:27 +0000 (16:55 +0500)]
MUC: Handle missing persistent room data.

12 years agomod_s2s: Remove check for socket.tcp6()
Kim Alvefur [Tue, 29 May 2012 16:04:29 +0000 (18:04 +0200)]
mod_s2s: Remove check for socket.tcp6()

12 years agomod_s2s: Only do AAAA lookup if IPv6 is available, and A if IPv4 is available.
Kim Alvefur [Tue, 29 May 2012 16:02:48 +0000 (18:02 +0200)]
mod_s2s: Only do AAAA lookup if IPv6 is available, and A if IPv4 is available.

12 years agomod_proxy65: Fix ACL
Kim Alvefur [Tue, 29 May 2012 15:20:02 +0000 (17:20 +0200)]
mod_proxy65: Fix ACL

12 years agoutil.sasl.plain: make it return "not-authorized" in case of non-existant accounts...
Marco Cirillo [Mon, 28 May 2012 15:59:10 +0000 (15:59 +0000)]
util.sasl.plain: make it return "not-authorized" in case of non-existant accounts instead of "account-disabled" to avoid enumeration.

12 years agostanza_router: Also don't bounce <iq type='result'>
Matthew Wild [Sun, 27 May 2012 10:57:56 +0000 (11:57 +0100)]
stanza_router: Also don't bounce <iq type='result'>

12 years agostanza_router: Don't bounce type=error stanzas
Kim Alvefur [Sun, 27 May 2012 02:01:34 +0000 (04:01 +0200)]
stanza_router: Don't bounce type=error stanzas

12 years agomod_proxy65: Add missing import of portmanager
Kim Alvefur [Sat, 26 May 2012 23:22:02 +0000 (01:22 +0200)]
mod_proxy65: Add missing import of portmanager

12 years agomod_proxy65: Warn about pre-0.9 config style (per host proxy65_port)
Kim Alvefur [Sat, 26 May 2012 23:17:59 +0000 (01:17 +0200)]
mod_proxy65: Warn about pre-0.9 config style (per host proxy65_port)

12 years agomod_http: Fix traceback when no HTTP services succeed in binding
Matthew Wild [Sat, 26 May 2012 18:49:43 +0000 (19:49 +0100)]
mod_http: Fix traceback when no HTTP services succeed in binding

12 years agoDEPENDS: Add luafilesystem (thanks Zash)
Matthew Wild [Sat, 26 May 2012 18:41:17 +0000 (19:41 +0100)]
DEPENDS: Add luafilesystem (thanks Zash)

12 years agomod_admin_telnet: More code found and updated, which depended on pre-8c5b5ebaacb0...
Kim Alvefur [Fri, 25 May 2012 10:50:58 +0000 (12:50 +0200)]
mod_admin_telnet: More code found and updated, which depended on pre-8c5b5ebaacb0 behaviour.

12 years agomod_admin_telnet: Code found and updated, which depended on pre-8c5b5ebaacb0 behaviour.
Kim Alvefur [Fri, 25 May 2012 05:08:12 +0000 (07:08 +0200)]
mod_admin_telnet: Code found and updated, which depended on pre-8c5b5ebaacb0 behaviour.

12 years agomod_http: Fix normalize_path('/') to not return an empty string, fixes module:http_url()
Kim Alvefur [Fri, 25 May 2012 01:39:45 +0000 (03:39 +0200)]
mod_http: Fix normalize_path('/') to not return an empty string, fixes module:http_url()

12 years agonet.http.parser: Break loop when no more usable data in buffer
Matthew Wild [Fri, 25 May 2012 01:32:33 +0000 (02:32 +0100)]
net.http.parser: Break loop when no more usable data in buffer

12 years agomod_watchregistrations: Convert JID list to a set, and prep before use to fix traceba...
Matthew Wild [Thu, 24 May 2012 17:52:47 +0000 (18:52 +0100)]
mod_watchregistrations: Convert JID list to a set, and prep before use to fix traceback on invalid JIDs (thanks sMi)

12 years agoutil.set: Change '/' operator from filter to map+filter (nil to drop from set, false...
Matthew Wild [Thu, 24 May 2012 17:51:18 +0000 (18:51 +0100)]
util.set: Change '/' operator from filter to map+filter (nil to drop from set, false is a valid item). No code found which depends on current behaviour.

12 years agonet.server_event: Internal changes to get plain-SSL outgoing connections working...
Matthew Wild [Thu, 24 May 2012 02:33:14 +0000 (03:33 +0100)]
net.server_event: Internal changes to get plain-SSL outgoing connections working (as for HTTPS)

12 years agomod_s2s, s2sout.lib: Send stream header in onconnect()
Matthew Wild [Thu, 24 May 2012 02:08:42 +0000 (03:08 +0100)]
mod_s2s, s2sout.lib: Send stream header in onconnect()

12 years agonet.server_event: Assume wrapclient() is taking a new connection, and call onconnect...
Matthew Wild [Thu, 24 May 2012 01:55:37 +0000 (02:55 +0100)]
net.server_event: Assume wrapclient() is taking a new connection, and call onconnect when appropriate (to match server_select)

12 years agonet.server_select: Don't close client connections when closing a server (it wasn...
Matthew Wild [Wed, 23 May 2012 01:20:32 +0000 (02:20 +0100)]
net.server_select: Don't close client connections when closing a server (it wasn't working anyway)

12 years agonet.server_select: Call ondisconnect handler, even if we closed the socket ourselves...
Matthew Wild [Wed, 23 May 2012 01:19:11 +0000 (02:19 +0100)]
net.server_select: Call ondisconnect handler, even if we closed the socket ourselves (fixes HTTP session hoarding, thanks Maranda)

12 years agoportmanager: Match service against service_info (:iter() doesn't match values)
Matthew Wild [Tue, 22 May 2012 13:33:06 +0000 (14:33 +0100)]
portmanager: Match service against service_info (:iter() doesn't match values)

12 years agoutil.multitable: Some fixes for iter()... always match against query, and pass value...
Matthew Wild [Tue, 22 May 2012 13:31:19 +0000 (14:31 +0100)]
util.multitable: Some fixes for iter()... always match against query, and pass value after path results

12 years agocertmanager: tonumber() (fix for 0b8134015635)
Matthew Wild [Sat, 19 May 2012 20:57:40 +0000 (21:57 +0100)]
certmanager: tonumber() (fix for 0b8134015635)

12 years agocertmanager: Don't use no_ticket option before LuaSec 0.4
Matthew Wild [Sat, 19 May 2012 20:53:43 +0000 (21:53 +0100)]
certmanager: Don't use no_ticket option before LuaSec 0.4

12 years agomod_compression: advertise/activate compression only for authenticated sessions in...
Tobias Markmann [Sat, 19 May 2012 20:05:23 +0000 (22:05 +0200)]
mod_compression: advertise/activate compression only for authenticated sessions in accordance to XEP-0170. (Thanks fippo)

12 years agoportmanager: Fix to deactivate services when they are unregistered (metatable:iter...
Matthew Wild [Sat, 19 May 2012 19:46:44 +0000 (20:46 +0100)]
portmanager: Fix to deactivate services when they are unregistered (metatable:iter() wins)

12 years agomodulemanager, moduleapi: Turn module.event_handlers into a multitable and track...
Matthew Wild [Sat, 19 May 2012 14:39:16 +0000 (15:39 +0100)]
modulemanager, moduleapi: Turn module.event_handlers into a multitable and track object->event->handler associations correctly (thanks Zash)

12 years agoutil.multitable: No longer use table.remove to drop elements from the stack, when...
Matthew Wild [Sat, 19 May 2012 14:35:49 +0000 (15:35 +0100)]
util.multitable: No longer use table.remove to drop elements from the stack, when key is nil immediately (on empty tables) the previous stack entry's key gets removed instead

12 years agoutil.multitable: Add :iter() method to iterate over results at a fixed depth (paramet...
Matthew Wild [Sat, 19 May 2012 03:12:41 +0000 (04:12 +0100)]
util.multitable: Add :iter() method to iterate over results at a fixed depth (parameters are equivalent to :search())

12 years agomoduleapi, modulemanager: Re-structure module.event_handlers so that the same handler...
Matthew Wild [Fri, 18 May 2012 22:53:02 +0000 (23:53 +0100)]
moduleapi, modulemanager: Re-structure module.event_handlers so that the same handler can harmlessly handle multiple events (thanks Zash)

12 years agomod_http: Add module:http_url([app_name,][default_path]) for a module to get a guess...
Matthew Wild [Fri, 18 May 2012 03:24:33 +0000 (04:24 +0100)]
mod_http: Add module:http_url([app_name,][default_path]) for a module to get a guess at its external URL

12 years agoutil.watchdog: Pass watchdog object to callback so that it doesn't always have to...
Matthew Wild [Fri, 18 May 2012 03:22:51 +0000 (04:22 +0100)]
util.watchdog: Pass watchdog object to callback so that it doesn't always have to be a closure

12 years agocertmanager: no_ticket is not a verification option (thanks Zash)
Matthew Wild [Fri, 18 May 2012 00:50:51 +0000 (01:50 +0100)]
certmanager: no_ticket is not a verification option (thanks Zash)

12 years agocertmanager: Add no_ticket option for OpenSSL (we don't support resumption yet)
Matthew Wild [Thu, 17 May 2012 23:31:23 +0000 (00:31 +0100)]
certmanager: Add no_ticket option for OpenSSL (we don't support resumption yet)

12 years agonet.server_select: Return error when SSL handshake fails immediately (thanks Zash)
Matthew Wild [Thu, 17 May 2012 23:27:06 +0000 (00:27 +0100)]
net.server_select: Return error when SSL handshake fails immediately (thanks Zash)

12 years agoutil.dataforms: Don't return invalid JIDs in jid-single.
Kim Alvefur [Thu, 17 May 2012 19:25:41 +0000 (21:25 +0200)]
util.dataforms: Don't return invalid JIDs in jid-single.

12 years agoutil.dataforms: Fix validation of booleans.
Kim Alvefur [Thu, 17 May 2012 19:18:35 +0000 (21:18 +0200)]
util.dataforms: Fix validation of booleans.

12 years agoINSTALL: Update with changes from wiki.
Kim Alvefur [Thu, 17 May 2012 19:04:31 +0000 (21:04 +0200)]
INSTALL: Update with changes from wiki.

12 years agoutil.dataforms: Do field validation and normalization in field readers.
Kim Alvefur [Thu, 17 May 2012 19:01:44 +0000 (21:01 +0200)]
util.dataforms: Do field validation and normalization in field readers.

12 years agomodulemanager: Components should inherit mod_s2s from global modules_enabled too
Matthew Wild [Wed, 16 May 2012 19:30:53 +0000 (20:30 +0100)]
modulemanager: Components should inherit mod_s2s from global modules_enabled too

12 years agoRemove util.broadcast
Matthew Wild [Wed, 16 May 2012 19:17:07 +0000 (20:17 +0100)]
Remove util.broadcast

12 years agoprosodyctl: Add duplicate code for getting version of prosody
Kim Alvefur [Tue, 15 May 2012 18:15:52 +0000 (20:15 +0200)]
prosodyctl: Add duplicate code for getting version of prosody

12 years agomod_bosh: Set Content-Type to text/html for GET response (thanks Medics)
Matthew Wild [Tue, 15 May 2012 12:35:09 +0000 (13:35 +0100)]
mod_bosh: Set Content-Type to text/html for GET response (thanks Medics)

12 years agonet.http.parser: Keep the Host header no host is present in the URI
Kim Alvefur [Tue, 15 May 2012 12:00:57 +0000 (14:00 +0200)]
net.http.parser: Keep the Host header no host is present in the URI

12 years agoprosodyctl: Fix for generating certs with UTF-8
Kim Alvefur [Mon, 14 May 2012 16:04:32 +0000 (18:04 +0200)]
prosodyctl: Fix for generating certs with UTF-8

12 years agoprosody, stanza_router: Load stanza_router earlier. Put routing functions in the...
Kim Alvefur [Mon, 14 May 2012 15:58:51 +0000 (17:58 +0200)]
prosody, stanza_router: Load stanza_router earlier. Put routing functions in the global prosody table. Fixes module:send()

12 years agomuc.lib: room:set_historylength(): Condense code, and don't store length when equal...
Matthew Wild [Sun, 13 May 2012 21:58:25 +0000 (22:58 +0100)]
muc.lib: room:set_historylength(): Condense code, and don't store length when equal to default

12 years agoMUC: Fix check for history length update.
Waqas Hussain [Sun, 13 May 2012 21:42:42 +0000 (02:42 +0500)]
MUC: Fix check for history length update.

12 years agomuc.lib: Fix for traceback when no history length is set for the room
Matthew Wild [Sun, 13 May 2012 20:07:00 +0000 (21:07 +0100)]
muc.lib: Fix for traceback when no history length is set for the room

12 years agomod_s2s: Only try next target if the stream didn't open
Matthew Wild [Sun, 13 May 2012 15:03:05 +0000 (16:03 +0100)]
mod_s2s: Only try next target if the stream didn't open

12 years agoprosodyctl: Improve help messages for cert commands
Kim Alvefur [Sun, 13 May 2012 13:02:38 +0000 (15:02 +0200)]
prosodyctl: Improve help messages for cert commands

12 years agoutil.timer: Always pass the current time to timer callbacks.
Waqas Hussain [Sat, 12 May 2012 16:46:54 +0000 (21:46 +0500)]
util.timer: Always pass the current time to timer callbacks.

12 years agomod_iq: Use "jabber:client" when the stanza payload namespace is nil.
Waqas Hussain [Sat, 12 May 2012 16:39:30 +0000 (21:39 +0500)]
mod_iq: Use "jabber:client" when the stanza payload namespace is nil.

12 years agoMerge with Zash
Matthew Wild [Sat, 12 May 2012 02:36:15 +0000 (03:36 +0100)]
Merge with Zash

12 years agostanza_router: Fix variable name
Matthew Wild [Sat, 12 May 2012 02:24:06 +0000 (03:24 +0100)]
stanza_router: Fix variable name

12 years agonet.http.parser: Do full URL decoding and parsing (e.g. adds request.url.query when...
Matthew Wild [Sat, 12 May 2012 02:09:52 +0000 (03:09 +0100)]
net.http.parser: Do full URL decoding and parsing (e.g. adds request.url.query when present)

12 years agonet.http: Fix urlencode to not encode unreserved characters, so I can guiltlessly...
Matthew Wild [Sat, 12 May 2012 01:50:38 +0000 (02:50 +0100)]
net.http: Fix urlencode to not encode unreserved characters, so I can guiltlessly rant about people  who do.

12 years agostanza_router: Close stream for unhandled stanzas from unauthenticated connections...
Matthew Wild [Sat, 12 May 2012 00:47:53 +0000 (01:47 +0100)]
stanza_router: Close stream for unhandled stanzas from unauthenticated connections (we can't reply)

12 years agomod_http_files: Respond with a 301 redirect for directories to append a / (fixes...
Kim Alvefur [Sat, 12 May 2012 00:17:08 +0000 (02:17 +0200)]
mod_http_files: Respond with a 301 redirect for directories to append a / (fixes relative links)

12 years agostanza_router: Remove FIXME comment and close stream with not-authorized for s2s...
Matthew Wild [Fri, 11 May 2012 23:33:04 +0000 (00:33 +0100)]
stanza_router: Remove FIXME comment and close stream with not-authorized for s2s stanzas from unauthed domains

12 years agostanza_router: Catch s2s stanzas to hosts we don't serve earlier, and close with...
Matthew Wild [Fri, 11 May 2012 23:31:48 +0000 (00:31 +0100)]
stanza_router: Catch s2s stanzas to hosts we don't serve earlier, and close with host-unknown (thanks darkrain)

12 years agoportmanager: Fix missing variable declaration
Matthew Wild [Fri, 11 May 2012 22:20:58 +0000 (23:20 +0100)]
portmanager: Fix missing variable declaration

12 years agoadhoc.lib: Default actions to 'complete' (replacement for rev 52b6901cabb0)
Kim Alvefur [Fri, 11 May 2012 20:41:47 +0000 (21:41 +0100)]
adhoc.lib: Default actions to 'complete' (replacement for rev 52b6901cabb0)

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