prosody.git
9 years agoMerge 0.10->trunk
Kim Alvefur [Tue, 19 May 2015 14:33:47 +0000 (16:33 +0200)]
Merge 0.10->trunk

9 years agoutil.interpolation: A template engine for text
Kim Alvefur [Tue, 19 May 2015 13:33:20 +0000 (15:33 +0200)]
util.interpolation: A template engine for text

9 years agologgingmanager: Rename function arguments to avoid name conflict [luacheck] (core...
Matthew Wild [Mon, 18 May 2015 18:09:07 +0000 (19:09 +0100)]
loggingmanager: Rename function arguments to avoid name conflict [luacheck] (core/ is now luacheck-clean!)

9 years agoconfigmanager: Refactor function to avoid re-declaring local variable [luacheck]
Matthew Wild [Mon, 18 May 2015 18:07:31 +0000 (19:07 +0100)]
configmanager: Refactor function to avoid re-declaring local variable [luacheck]

9 years agoconfigmanager: Rename unused function arguments [luacheck]
Matthew Wild [Mon, 18 May 2015 18:07:06 +0000 (19:07 +0100)]
configmanager: Rename unused function arguments [luacheck]

9 years agoconfigmanager: Rename variable to avoid name conflicts [luacheck]
Matthew Wild [Mon, 18 May 2015 18:06:34 +0000 (19:06 +0100)]
configmanager: Rename variable to avoid name conflicts [luacheck]

9 years agoconfigmanager: Rename unused function argument [luacheck]
Matthew Wild [Mon, 18 May 2015 18:05:26 +0000 (19:05 +0100)]
configmanager: Rename unused function argument [luacheck]

9 years agoconfigmanager: Remove unnecessary function localizations [luacheck]
Matthew Wild [Mon, 18 May 2015 18:05:08 +0000 (19:05 +0100)]
configmanager: Remove unnecessary function localizations [luacheck]

9 years agoconfigmanager: Rename variable to avoid name conflict [luacheck]
Matthew Wild [Mon, 18 May 2015 18:04:37 +0000 (19:04 +0100)]
configmanager: Rename variable to avoid name conflict [luacheck]

9 years agoconfigmanager: Rename variable to avoid name conflict [luacheck]
Matthew Wild [Mon, 18 May 2015 18:03:07 +0000 (19:03 +0100)]
configmanager: Rename variable to avoid name conflict [luacheck]

9 years agoprosodyctl: Soft-require LuaSec and LuaEvent so they show up in the module version...
Kim Alvefur [Mon, 18 May 2015 20:04:12 +0000 (22:04 +0200)]
prosodyctl: Soft-require LuaSec and LuaEvent so they show up in the module version listing

9 years agomod_tls: Treat session.ssl_ctx being false as a signal that TLS is disabled
Kim Alvefur [Mon, 18 May 2015 19:48:58 +0000 (21:48 +0200)]
mod_tls: Treat session.ssl_ctx being false as a signal that TLS is disabled

9 years agomod_tls: Build <starttls/> as a stanza instead of with string concatenation
Kim Alvefur [Mon, 18 May 2015 19:43:24 +0000 (21:43 +0200)]
mod_tls: Build <starttls/> as a stanza instead of with string concatenation

9 years agoutil.x509: Tell LuaSec we want UTF-8 data
Kim Alvefur [Mon, 18 May 2015 19:32:05 +0000 (21:32 +0200)]
util.x509: Tell LuaSec we want UTF-8 data

9 years agomod_auth_internal_hashed: Use util.hex
Kim Alvefur [Mon, 18 May 2015 19:00:41 +0000 (21:00 +0200)]
mod_auth_internal_hashed: Use util.hex

9 years agohostmanager: Metatable with __tostring on hosts
Kim Alvefur [Mon, 18 May 2015 18:50:50 +0000 (20:50 +0200)]
hostmanager: Metatable with __tostring on hosts

9 years agoMerge 0.10->trunk
Kim Alvefur [Fri, 15 May 2015 13:33:31 +0000 (15:33 +0200)]
Merge 0.10->trunk

9 years agomod_storage_xep0227: Silence luacheck warnings
Kim Alvefur [Fri, 15 May 2015 13:32:39 +0000 (15:32 +0200)]
mod_storage_xep0227: Silence luacheck warnings

9 years agomod_storage_xep0227: Store data from mod_auth_internal_hashed in a private namespace
Kim Alvefur [Fri, 15 May 2015 13:32:21 +0000 (15:32 +0200)]
mod_storage_xep0227: Store data from mod_auth_internal_hashed in a private namespace

9 years agomod_storage_xep0227: Use the registered namespace
Kim Alvefur [Fri, 15 May 2015 13:30:38 +0000 (15:30 +0200)]
mod_storage_xep0227: Use the registered namespace

9 years agomod_storage_xep0227: Update open method for current API
Kim Alvefur [Fri, 15 May 2015 13:29:05 +0000 (15:29 +0200)]
mod_storage_xep0227: Update open method for current API

9 years agomod_storage_xep0227: Return error from io.open if unable to open file for writing
Kim Alvefur [Fri, 15 May 2015 13:25:59 +0000 (15:25 +0200)]
mod_storage_xep0227: Return error from io.open if unable to open file for writing

9 years agomod_storage_xep0227: Open file for writing even if removing so os.remove has a file...
Kim Alvefur [Fri, 15 May 2015 13:25:37 +0000 (15:25 +0200)]
mod_storage_xep0227: Open file for writing even if removing so os.remove has a file to delete

9 years agomod_storage_xep0227: Close file handle after reading
Kim Alvefur [Fri, 15 May 2015 13:17:27 +0000 (15:17 +0200)]
mod_storage_xep0227: Close file handle after reading

9 years agomod_storage_xep0227: Use configured storage path
Kim Alvefur [Fri, 15 May 2015 13:16:03 +0000 (15:16 +0200)]
mod_storage_xep0227: Use configured storage path

9 years agomod_storage_xep0227: Rename to reflect current naming practices
Kim Alvefur [Fri, 15 May 2015 13:14:30 +0000 (15:14 +0200)]
mod_storage_xep0227: Rename to reflect current naming practices

9 years agoxep227store.lib.lua: Remove mostly duplicated code
Kim Alvefur [Fri, 15 May 2015 13:14:12 +0000 (15:14 +0200)]
xep227store.lib.lua: Remove mostly duplicated code

9 years agonet.http.codes: Update from registry
Kim Alvefur [Thu, 14 May 2015 18:47:37 +0000 (20:47 +0200)]
net.http.codes: Update from registry

9 years agoMerge 0.10->trunk
Kim Alvefur [Wed, 13 May 2015 22:24:21 +0000 (00:24 +0200)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Kim Alvefur [Wed, 13 May 2015 22:22:56 +0000 (00:22 +0200)]
Merge 0.9->0.10

9 years agos2smanager: Make sure destroyed sessions have a sends2s method
Kim Alvefur [Wed, 13 May 2015 22:22:13 +0000 (00:22 +0200)]
s2smanager: Make sure destroyed sessions have a sends2s method

9 years agoMerge 0.10->trunk
Kim Alvefur [Wed, 13 May 2015 20:33:40 +0000 (22:33 +0200)]
Merge 0.10->trunk

9 years agoMerge
Kim Alvefur [Wed, 13 May 2015 20:32:40 +0000 (22:32 +0200)]
Merge

9 years agoMerge 0.9->0.10
Kim Alvefur [Wed, 13 May 2015 20:31:59 +0000 (22:31 +0200)]
Merge 0.9->0.10

9 years agomod_s2s: Mark stream as opened directly after opening stream, prevents session.close...
Kim Alvefur [Wed, 13 May 2015 19:56:22 +0000 (21:56 +0200)]
mod_s2s: Mark stream as opened directly after opening stream, prevents session.close opening it again

9 years agomod_s2s: Don't cache session.sends2s (or do it later), prevents sending data after...
Kim Alvefur [Wed, 13 May 2015 19:55:08 +0000 (21:55 +0200)]
mod_s2s: Don't cache session.sends2s (or do it later), prevents sending data after session was closed

9 years agomod_s2s/s2sout: Use the local address assigned to UDP sockets instead of util.net...
Kim Alvefur [Wed, 13 May 2015 19:47:39 +0000 (21:47 +0200)]
mod_s2s/s2sout: Use the local address assigned to UDP sockets instead of util.net to enumerate possible source addresses

9 years agoutil.datamanager: Fix traceback from trying to purge when storage is empty or otherwi...
Kim Alvefur [Wed, 13 May 2015 19:44:13 +0000 (21:44 +0200)]
util.datamanager: Fix traceback from trying to purge when storage is empty or otherwise unaccessible (fixes #496)

9 years agomod_s2s/s2sout: Remove now unused config option dns_max_depth
Kim Alvefur [Wed, 13 May 2015 19:43:05 +0000 (21:43 +0200)]
mod_s2s/s2sout: Remove now unused config option dns_max_depth

9 years agoportmanager: Remove unused argument from function [luacheck]
Matthew Wild [Wed, 13 May 2015 16:08:34 +0000 (17:08 +0100)]
portmanager: Remove unused argument from function [luacheck]

9 years agoportmanager: Rename variable to avoid name conflict [luacheck]
Matthew Wild [Wed, 13 May 2015 16:08:20 +0000 (17:08 +0100)]
portmanager: Rename variable to avoid name conflict [luacheck]

9 years agoportmanager: Add luacheck annotations
Matthew Wild [Wed, 13 May 2015 16:07:30 +0000 (17:07 +0100)]
portmanager: Add luacheck annotations

9 years agoMerge 0.10->trunk
Matthew Wild [Wed, 13 May 2015 16:00:27 +0000 (17:00 +0100)]
Merge 0.10->trunk

9 years agoutil.queue: Small fast FIFO/ringbuffer/queue library
Matthew Wild [Wed, 13 May 2015 15:57:27 +0000 (16:57 +0100)]
util.queue: Small fast FIFO/ringbuffer/queue library

9 years agosessionmanager: Rename argument to avoid name clash with local variable [luacheck]
Matthew Wild [Wed, 6 May 2015 18:58:33 +0000 (19:58 +0100)]
sessionmanager: Rename argument to avoid name clash with local variable [luacheck]

9 years agosessionmanager: Rename unused loop variables to '_' [luacheck]
Matthew Wild [Wed, 6 May 2015 18:58:03 +0000 (19:58 +0100)]
sessionmanager: Rename unused loop variables to '_' [luacheck]

9 years agoutil.set: Rename method argument to avoid name clash [luacheck]
Matthew Wild [Wed, 6 May 2015 18:51:35 +0000 (19:51 +0100)]
util.set: Rename method argument to avoid name clash [luacheck]

9 years agoutil.set: Add luacheck annotation for methods not referencing 'self'
Matthew Wild [Wed, 6 May 2015 18:51:07 +0000 (19:51 +0100)]
util.set: Add luacheck annotation for methods not referencing 'self'

9 years agoutil.set: Remove unnecessary local declaration, arguments are already locals [luacheck]
Matthew Wild [Wed, 6 May 2015 18:50:40 +0000 (19:50 +0100)]
util.set: Remove unnecessary local declaration, arguments are already locals [luacheck]

9 years agoutil.dataforms: Rename unused loop counter to '_' [luacheck]
Matthew Wild [Wed, 6 May 2015 18:43:51 +0000 (19:43 +0100)]
util.dataforms: Rename unused loop counter to '_' [luacheck]

9 years agoutil.sslconfig: Rename variable to avoid name clash [luacheck]
Matthew Wild [Wed, 6 May 2015 18:43:28 +0000 (19:43 +0100)]
util.sslconfig: Rename variable to avoid name clash [luacheck]

9 years agoutil.serialization: Remove unused imports of error() and loadstring() [luacheck]
Matthew Wild [Wed, 6 May 2015 18:40:48 +0000 (19:40 +0100)]
util.serialization: Remove unused imports of error() and loadstring() [luacheck]

9 years agoutil.xml: Remove unused parameter (thanks, luacheck)
Matthew Wild [Wed, 6 May 2015 18:39:28 +0000 (19:39 +0100)]
util.xml: Remove unused parameter (thanks, luacheck)

9 years agoutil.dataforms: Remove unused import of pairs() (thanks luacheck)
Matthew Wild [Wed, 6 May 2015 18:38:29 +0000 (19:38 +0100)]
util.dataforms: Remove unused import of pairs() (thanks luacheck)

9 years ago.luacheckrc: Commit initial config for luacheck
Matthew Wild [Wed, 6 May 2015 18:35:35 +0000 (19:35 +0100)]
.luacheckrc: Commit initial config for luacheck

9 years agoMerge 0.10->trunk
Matthew Wild [Wed, 6 May 2015 18:26:53 +0000 (19:26 +0100)]
Merge 0.10->trunk

9 years agoMerge
Matthew Wild [Wed, 6 May 2015 18:21:29 +0000 (19:21 +0100)]
Merge

9 years agoutil.events: Add get_handlers() method
Matthew Wild [Wed, 6 May 2015 18:21:18 +0000 (19:21 +0100)]
util.events: Add get_handlers() method

9 years agoportmanager, s2smanager, sessionmanager, stanza_router, storagemanager, usermanager...
Matthew Wild [Wed, 6 May 2015 18:20:07 +0000 (19:20 +0100)]
portmanager, s2smanager, sessionmanager, stanza_router, storagemanager, usermanager, util.xml: Add luacheck annotations

9 years agorostermanager: Variable rename for clarity and to avoid name clash [luacheck]
Matthew Wild [Wed, 6 May 2015 18:17:59 +0000 (19:17 +0100)]
rostermanager: Variable rename for clarity and to avoid name clash [luacheck]

9 years agomodulemanager: Add luacheck annotations
Matthew Wild [Wed, 6 May 2015 18:16:16 +0000 (19:16 +0100)]
modulemanager: Add luacheck annotations

9 years agomodulemanager: Remove unused import of pcall #luacheck
Matthew Wild [Wed, 6 May 2015 18:15:35 +0000 (19:15 +0100)]
modulemanager: Remove unused import of pcall #luacheck

9 years agomoduleapi: Import util.stanza required for module:broadcast()
Matthew Wild [Wed, 6 May 2015 18:11:27 +0000 (19:11 +0100)]
moduleapi: Import util.stanza required for module:broadcast()

9 years agomoduleapi: Add luacheck annotation
Matthew Wild [Wed, 6 May 2015 18:02:44 +0000 (19:02 +0100)]
moduleapi: Add luacheck annotation

9 years agomoduleapi: Minor variable renaming to avoid clashes with the 'type' function
Matthew Wild [Wed, 6 May 2015 18:02:07 +0000 (19:02 +0100)]
moduleapi: Minor variable renaming to avoid clashes with the 'type' function

9 years agomoduleapi: Clear self.event_handlers when unhooking an event, to prevent leaks
Matthew Wild [Wed, 6 May 2015 18:01:16 +0000 (19:01 +0100)]
moduleapi: Clear self.event_handlers when unhooking an event, to prevent leaks

9 years agomoduleapi: module:measure_event(), module:measure_global_event(): Fix copy/paste...
Matthew Wild [Wed, 6 May 2015 18:00:05 +0000 (19:00 +0100)]
moduleapi: module:measure_event(), module:measure_global_event(): Fix copy/paste error

9 years agomoduleapi: Remove accidental use of undefined and unnecessary 'priority' variable
Matthew Wild [Wed, 6 May 2015 17:58:29 +0000 (18:58 +0100)]
moduleapi: Remove accidental use of undefined and unnecessary 'priority' variable

9 years agomoduleapi: Add module:broadcast() to send a stanza to a list of JIDs
Matthew Wild [Wed, 6 May 2015 17:37:46 +0000 (18:37 +0100)]
moduleapi: Add module:broadcast() to send a stanza to a list of JIDs

9 years agomod_s2s: Fire read timeout event on correct virtualhost for incoming connections
Kim Alvefur [Wed, 6 May 2015 11:35:34 +0000 (13:35 +0200)]
mod_s2s: Fire read timeout event on correct virtualhost for incoming connections

9 years agomod_pubsub: Add option for default affiliation of non-existent nodes (thanks Flow)
Kim Alvefur [Tue, 5 May 2015 10:21:32 +0000 (12:21 +0200)]
mod_pubsub: Add option for default affiliation of non-existent nodes (thanks Flow)

9 years agoMerge 0.10->trunk
Kim Alvefur [Mon, 4 May 2015 23:34:20 +0000 (01:34 +0200)]
Merge 0.10->trunk

9 years agoutil.statistics: Collect duration sample even if run fewer times than the sample...
Kim Alvefur [Mon, 4 May 2015 22:48:55 +0000 (00:48 +0200)]
util.statistics: Collect duration sample even if run fewer times than the sample interval

9 years agoutil.events: Add local reference to table.remove (fixes traceback)
Kim Alvefur [Mon, 4 May 2015 22:41:39 +0000 (00:41 +0200)]
util.events: Add local reference to table.remove (fixes traceback)

9 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 3 May 2015 16:39:27 +0000 (18:39 +0200)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Kim Alvefur [Sun, 3 May 2015 16:38:39 +0000 (18:38 +0200)]
Merge 0.9->0.10

9 years agoutil.encodings: Move declarations to top of function [pedantic]
Kim Alvefur [Sat, 2 May 2015 12:52:51 +0000 (14:52 +0200)]
util.encodings: Move declarations to top of function [pedantic]

9 years agoutil.pposix: Return error from ftruncate if that fails too (but what would we do...
Kim Alvefur [Sat, 2 May 2015 12:41:56 +0000 (14:41 +0200)]
util.pposix: Return error from ftruncate if that fails too (but what would we do here?)

9 years agoutil.events: Change from nil to false to indicate adding a global wrapper
Matthew Wild [Tue, 28 Apr 2015 13:19:28 +0000 (14:19 +0100)]
util.events: Change from nil to false to indicate adding a global wrapper

9 years agomoduleapi: New methods for modules to conveniently wrap events
Matthew Wild [Tue, 28 Apr 2015 13:18:43 +0000 (14:18 +0100)]
moduleapi: New methods for modules to conveniently wrap events

9 years agomoduleapi: Experimental API for modules to measure the rate+duration of events
Matthew Wild [Tue, 28 Apr 2015 12:52:07 +0000 (13:52 +0100)]
moduleapi: Experimental API for modules to measure the rate+duration of events

9 years agoutil.events: Add support for event wrappers, functions which can wrap the calling...
Matthew Wild [Tue, 28 Apr 2015 12:42:59 +0000 (13:42 +0100)]
util.events: Add support for event wrappers, functions which can wrap the calling of event handlers to run code before/after an event (for debugging, statistics, logging purposes, etc.)

9 years agoprosodyctl: check certs: Correctly check that certificates are valid for s2s
Kim Alvefur [Mon, 27 Apr 2015 19:52:16 +0000 (21:52 +0200)]
prosodyctl: check certs: Correctly check that certificates are valid for s2s

9 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 26 Apr 2015 22:03:14 +0000 (00:03 +0200)]
Merge 0.10->trunk

9 years agoconfigure: Set default compiler and linker to cc and ld on *bsd (thanks Tobias)
Kim Alvefur [Sun, 26 Apr 2015 21:25:47 +0000 (23:25 +0200)]
configure: Set default compiler and linker to cc and ld on *bsd (thanks Tobias)

9 years agoconfigure: Mention openbsd preset in --help
Kim Alvefur [Sun, 26 Apr 2015 21:23:33 +0000 (23:23 +0200)]
configure: Mention openbsd preset in --help

9 years agonet.dns: Make sure argument to math.randomseed does not overflow a 32 bit *signed...
Kim Alvefur [Sun, 26 Apr 2015 17:50:24 +0000 (19:50 +0200)]
net.dns: Make sure argument to math.randomseed does not overflow a 32 bit *signed* int (blame Lua). Closes #439

9 years agoMerge 0.10->trunk
Kim Alvefur [Sat, 25 Apr 2015 22:07:36 +0000 (00:07 +0200)]
Merge 0.10->trunk

9 years agoMerge 0.9->0.10
Kim Alvefur [Sat, 25 Apr 2015 22:06:44 +0000 (00:06 +0200)]
Merge 0.9->0.10

9 years agomod_c2s, mod_s2s: Collect statistics on number of connections
Kim Alvefur [Sat, 25 Apr 2015 22:06:11 +0000 (00:06 +0200)]
mod_c2s, mod_s2s: Collect statistics on number of connections

9 years agomod_blocklist: Some cleanup [luacheck]
Kim Alvefur [Sat, 25 Apr 2015 12:57:52 +0000 (14:57 +0200)]
mod_blocklist: Some cleanup [luacheck]

9 years agousermanager: Capitalize log message
Kim Alvefur [Sat, 25 Apr 2015 12:22:59 +0000 (14:22 +0200)]
usermanager: Capitalize log message

9 years agomod_admin_adhoc: Remove special treatment of the "pending" roster entry
Kim Alvefur [Sat, 25 Apr 2015 12:21:40 +0000 (14:21 +0200)]
mod_admin_adhoc: Remove special treatment of the "pending" roster entry

9 years agonet.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
Kim Alvefur [Fri, 24 Apr 2015 12:14:01 +0000 (14:14 +0200)]
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s

9 years agomod_s2s: Catch attempt to close dummy origin of s2s error replies (fixes a top level...
Kim Alvefur [Sun, 5 Apr 2015 14:47:49 +0000 (16:47 +0200)]
mod_s2s: Catch attempt to close dummy origin of s2s error replies (fixes a top level error)

9 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 5 Apr 2015 14:24:10 +0000 (16:24 +0200)]
Merge 0.10->trunk

9 years agorostermanager: Fix roster upgrade code (thanks mva)
Kim Alvefur [Sun, 5 Apr 2015 14:19:02 +0000 (16:19 +0200)]
rostermanager: Fix roster upgrade code (thanks mva)

9 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 5 Apr 2015 13:22:33 +0000 (15:22 +0200)]
Merge 0.10->trunk

9 years agorostermanager: Add missing import of `type()`
Florian Zeitz [Fri, 3 Apr 2015 19:42:30 +0000 (21:42 +0200)]
rostermanager: Add missing import of `type()`

9 years agoMerge 0.10->trunk
Matthew Wild [Fri, 3 Apr 2015 18:34:47 +0000 (19:34 +0100)]
Merge 0.10->trunk