prosody.git
8 years agotests: Use util.envload to load chunks (fixes #608)
Kim Alvefur [Thu, 28 Jan 2016 13:45:44 +0000 (14:45 +0100)]
tests: Use util.envload to load chunks (fixes #608)

8 years agoMerge 0.9->0.10
Matthew Wild [Wed, 27 Jan 2016 20:32:01 +0000 (20:32 +0000)]
Merge 0.9->0.10

8 years agoAdded tag 0.9.10 for changeset 352270bc0439
Matthew Wild [Wed, 27 Jan 2016 13:05:58 +0000 (13:05 +0000)]
Added tag 0.9.10 for changeset 352270bc0439

8 years agoMerge
Kim Alvefur [Tue, 26 Jan 2016 23:06:30 +0000 (00:06 +0100)]
Merge

8 years agoMerge 0.9->0.10
Kim Alvefur [Tue, 26 Jan 2016 13:15:00 +0000 (14:15 +0100)]
Merge 0.9->0.10

8 years agomod_c2s, mod_s2s: Lower priority of session shutdown to negative, so that plugins...
Kim Alvefur [Mon, 25 Jan 2016 23:28:07 +0000 (00:28 +0100)]
mod_c2s, mod_s2s: Lower priority of session shutdown to negative, so that plugins hooking at the default priority run first (fixes #601)

8 years agoMerge 0.9->0.10
Kim Alvefur [Fri, 22 Jan 2016 13:49:05 +0000 (14:49 +0100)]
Merge 0.9->0.10

8 years agomod_admin_telnet: Fix sorting of JIDs in c2s:show() family of functions (thanks looks...
Matthew Wild [Fri, 22 Jan 2016 13:20:00 +0000 (13:20 +0000)]
mod_admin_telnet: Fix sorting of JIDs in c2s:show() family of functions (thanks lookshe and Zash)

8 years agoserver_select: Add logging of when servers are paused and resumed
Kim Alvefur [Fri, 22 Jan 2016 01:00:43 +0000 (02:00 +0100)]
server_select: Add logging of when servers are paused and resumed

8 years agoserver_select: Pause and mark server as full if accepting a client fails (fixes ...
Kim Alvefur [Fri, 22 Jan 2016 01:00:27 +0000 (02:00 +0100)]
server_select: Pause and mark server as full if accepting a client fails (fixes #597)

8 years agoserver_select: Retry accepting clients from full servers after 10s (matches libevent...
Kim Alvefur [Fri, 22 Jan 2016 00:59:25 +0000 (01:59 +0100)]
server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour)

8 years agoserver_select: Keep track of which server listeners are full
Kim Alvefur [Fri, 22 Jan 2016 00:58:39 +0000 (01:58 +0100)]
server_select: Keep track of which server listeners are full

8 years agonet.dns: Remember query only after it was sent, in case it was not (fixes #598)
Kim Alvefur [Thu, 21 Jan 2016 21:26:46 +0000 (22:26 +0100)]
net.dns: Remember query only after it was sent, in case it was not (fixes #598)

8 years agoBackout 63f5870f9afe, no longer needed since Windows is currently unsupported
Kim Alvefur [Thu, 21 Jan 2016 21:21:19 +0000 (22:21 +0100)]
Backout 63f5870f9afe, no longer needed since Windows is currently unsupported

8 years agomod_dialback: Follow XEP-0185 and use HMAC
Kim Alvefur [Tue, 19 Jan 2016 20:31:02 +0000 (21:31 +0100)]
mod_dialback: Follow XEP-0185 and use HMAC

8 years agomod_dialback: Follow XEP-0185 and use HMAC
Kim Alvefur [Tue, 19 Jan 2016 20:31:02 +0000 (21:31 +0100)]
mod_dialback: Follow XEP-0185 and use HMAC

8 years agonet.http.server: Return from listen_on() whatever net.server.addserver() returns
Kim Alvefur [Sat, 16 Jan 2016 21:43:11 +0000 (22:43 +0100)]
net.http.server: Return from listen_on() whatever net.server.addserver() returns

8 years agoutil.random: Open /dev/urandom read-only, make seed() a noop
Kim Alvefur [Tue, 12 Jan 2016 22:48:16 +0000 (23:48 +0100)]
util.random: Open /dev/urandom read-only, make seed() a noop

8 years agoprosodyctl: check config: Suggest moving modules enabled on all hosts to a global_mod...
Kim Alvefur [Tue, 12 Jan 2016 22:47:30 +0000 (23:47 +0100)]
prosodyctl: check config: Suggest moving modules enabled on all hosts to a global_modules enabled if that is unset

8 years agoprosody: Allow prosody.shutdown() to take an exit code for the process (thanks daurni...
Matthew Wild [Fri, 15 Jan 2016 00:51:01 +0000 (00:51 +0000)]
prosody: Allow prosody.shutdown() to take an exit code for the process (thanks daurnimator)

8 years agoprosodyctl check: Fix traceback if the global modules_enabled is unset
Kim Alvefur [Tue, 12 Jan 2016 00:13:57 +0000 (01:13 +0100)]
prosodyctl check: Fix traceback if the global modules_enabled is unset

8 years agomod_blocklist: Clear second level cache correctly on user deletion
Kim Alvefur [Mon, 11 Jan 2016 14:35:51 +0000 (15:35 +0100)]
mod_blocklist: Clear second level cache correctly on user deletion

8 years agoMerge 0.9->0.10
Kim Alvefur [Mon, 11 Jan 2016 14:33:18 +0000 (15:33 +0100)]
Merge 0.9->0.10

8 years agocore: Increase default read size to "all of it", in practice 8K (size of LuaSockets...
Kim Alvefur [Sun, 10 Jan 2016 22:25:00 +0000 (23:25 +0100)]
core: Increase default read size to "all of it", in practice 8K (size of LuaSockets buffer)

8 years agoutil.uuid: Open /dev/urandom read-only, make seed() a noop
Kim Alvefur [Sun, 10 Jan 2016 22:21:34 +0000 (23:21 +0100)]
util.uuid: Open /dev/urandom read-only, make seed() a noop

8 years agotests: Add test for util.uuid (checks that the output format is correct)
Kim Alvefur [Sun, 10 Jan 2016 02:35:00 +0000 (03:35 +0100)]
tests: Add test for util.uuid (checks that the output format is correct)

8 years agotests: Correct mistake from latst merge, use the same variable name in all 3 places...
Kim Alvefur [Sun, 10 Jan 2016 02:25:16 +0000 (03:25 +0100)]
tests: Correct mistake from latst merge, use the same variable name in all 3 places where it matters

8 years agoMakefile: Add 'test' target that runs tests
Kim Alvefur [Sat, 9 Jan 2016 23:17:54 +0000 (00:17 +0100)]
Makefile: Add 'test' target that runs tests

8 years agomod_admin_telnet: c2s:count in less lines
Kim Alvefur [Sat, 9 Jan 2016 23:00:22 +0000 (00:00 +0100)]
mod_admin_telnet: c2s:count in less lines

8 years agomod_admin_telnet: Show unauthenticated clients identified by local/remote IP and...
Kim Alvefur [Sat, 9 Jan 2016 22:59:31 +0000 (23:59 +0100)]
mod_admin_telnet: Show unauthenticated clients identified by local/remote IP and port

8 years agomod_admin_telnet: c2s:show() etc, list all sessions including unauthenticated or...
Kim Alvefur [Sat, 9 Jan 2016 22:58:43 +0000 (23:58 +0100)]
mod_admin_telnet: c2s:show() etc, list all sessions including unauthenticated or not with no stream opened

8 years agomod_admin_telnet: Remove compat warning about 'console_banner' as a function
Kim Alvefur [Sat, 9 Jan 2016 23:01:28 +0000 (00:01 +0100)]
mod_admin_telnet: Remove compat warning about 'console_banner' as a function

8 years agonet.server_select: Add 'server' method to client connections (present in server_event)
Kim Alvefur [Sat, 9 Jan 2016 22:54:19 +0000 (23:54 +0100)]
net.server_select: Add 'server' method to client connections (present in server_event)

8 years agoprosodyctl: Show an example ssl config after generating a certificate
Kim Alvefur [Sat, 9 Jan 2016 15:58:39 +0000 (16:58 +0100)]
prosodyctl: Show an example ssl config after generating a certificate

8 years agorostermanager: Rename variable to avoid name clash [luacheck]
Kim Alvefur [Sat, 9 Jan 2016 14:18:46 +0000 (15:18 +0100)]
rostermanager: Rename variable to avoid name clash [luacheck]

8 years agotests: Fix merge, modulemanager test was removed
Kim Alvefur [Fri, 8 Jan 2016 15:20:02 +0000 (16:20 +0100)]
tests: Fix merge, modulemanager test was removed

8 years agoMerge 0.9->0.10
Kim Alvefur [Fri, 8 Jan 2016 15:16:08 +0000 (16:16 +0100)]
Merge 0.9->0.10

8 years agoAdded tag 0.9.9 for changeset 7ec52755622f
Matthew Wild [Fri, 8 Jan 2016 13:01:32 +0000 (13:01 +0000)]
Added tag 0.9.9 for changeset 7ec52755622f

8 years agoBackout 88d54bec26b7 prior to release, as it certainly requires more testing
Matthew Wild [Fri, 8 Jan 2016 13:01:27 +0000 (13:01 +0000)]
Backout 88d54bec26b7 prior to release, as it certainly requires more testing

8 years agomod_http_files: Santize the path relative to our base URL before translating it to...
Matthew Wild [Thu, 7 Jan 2016 15:37:47 +0000 (15:37 +0000)]
mod_http_files: Santize the path relative to our base URL before translating it to a filesystem path, fixes a relative path traversal vulnerability

8 years agoutil.random: Use /dev/urandom
Kim Alvefur [Wed, 6 Jan 2016 02:28:56 +0000 (03:28 +0100)]
util.random: Use /dev/urandom

8 years agoutil.uuid: Take random byte directly instead of the low bits from the ascii value...
Kim Alvefur [Wed, 6 Jan 2016 02:28:31 +0000 (03:28 +0100)]
util.uuid: Take random byte directly instead of the low bits from the ascii value of a hex nibble

8 years agoutil.uuid: Use /dev/urandom
Kim Alvefur [Wed, 6 Jan 2016 01:46:47 +0000 (02:46 +0100)]
util.uuid: Use /dev/urandom

8 years agonet.dns: Allow a zone id in resolv.conf (eg like %eth0)
Kim Alvefur [Mon, 4 Jan 2016 14:46:06 +0000 (15:46 +0100)]
net.dns: Allow a zone id in resolv.conf (eg like %eth0)

8 years agoutil.ip: Support zone id syntax in IPv6 addresses
Kim Alvefur [Mon, 4 Jan 2016 16:47:40 +0000 (17:47 +0100)]
util.ip: Support zone id syntax in IPv6 addresses

8 years agomod_bosh: Fire event when BOSH session is created
Matthew Wild [Mon, 4 Jan 2016 09:14:30 +0000 (09:14 +0000)]
mod_bosh: Fire event when BOSH session is created

8 years agomod_admin_adhoc: Show only connections to/from the host the command was run on
Kim Alvefur [Sun, 3 Jan 2016 16:48:36 +0000 (17:48 +0100)]
mod_admin_adhoc: Show only connections to/from the host the command was run on

8 years agomod_admin_adhoc: Remove extra ) that should not be there
Kim Alvefur [Sun, 3 Jan 2016 16:22:58 +0000 (17:22 +0100)]
mod_admin_adhoc: Remove extra ) that should not be there

8 years agoserver_select: Forward the actual TLS handshake error message
Kim Alvefur [Sun, 3 Jan 2016 16:19:14 +0000 (17:19 +0100)]
server_select: Forward the actual TLS handshake error message

8 years agonet.server_select: Close all connections when quitting (and not just stepping), match...
Matthew Wild [Sat, 2 Jan 2016 20:42:20 +0000 (20:42 +0000)]
net.server_select: Close all connections when quitting (and not just stepping), matches server_event

8 years agonet.server_event: Add conn.type == 'server' for server sockets (fixes closeallservers() )
Matthew Wild [Sat, 2 Jan 2016 20:40:34 +0000 (20:40 +0000)]
net.server_event: Add conn.type == 'server' for server sockets (fixes closeallservers() )

8 years agoutil.events: Document data structures
Matthew Wild [Wed, 23 Dec 2015 11:17:26 +0000 (11:17 +0000)]
util.events: Document data structures

8 years agomod_register: Fix typo
Kim Alvefur [Fri, 1 Jan 2016 18:53:45 +0000 (19:53 +0100)]
mod_register: Fix typo

8 years agocerts/Makefile: Fix generating cert from only a key (no config then)
Kim Alvefur [Thu, 24 Dec 2015 09:39:13 +0000 (10:39 +0100)]
certs/Makefile: Fix generating cert from only a key (no config then)

8 years agoman prosodyctl: Add information about the 'about' and 'check' commands
Kim Alvefur [Wed, 23 Dec 2015 13:21:20 +0000 (14:21 +0100)]
man prosodyctl: Add information about the 'about' and 'check' commands

8 years agoman prosodyctl: Add missing 'reload' command
Kim Alvefur [Wed, 23 Dec 2015 13:20:57 +0000 (14:20 +0100)]
man prosodyctl: Add missing 'reload' command

8 years agoman prosodyctl: Accidentally markdown
Kim Alvefur [Wed, 23 Dec 2015 13:19:01 +0000 (14:19 +0100)]
man prosodyctl: Accidentally markdown

8 years agoMerge 0.9->0.10
Kim Alvefur [Wed, 23 Dec 2015 11:11:07 +0000 (12:11 +0100)]
Merge 0.9->0.10

8 years agocerts/Makefile: Add targets for any combination of already existing config, key file
Kim Alvefur [Wed, 23 Dec 2015 11:10:26 +0000 (12:10 +0100)]
certs/Makefile: Add targets for any combination of already existing config, key file

8 years agocerts/Makefile: Run key generation with a stricter umask (fixes a race condition)
Kim Alvefur [Wed, 23 Dec 2015 11:07:03 +0000 (12:07 +0100)]
certs/Makefile: Run key generation with a stricter umask (fixes a race condition)

8 years agomod_register: Support for blacklisting ips that are still over limit when they get...
Kim Alvefur [Wed, 23 Dec 2015 08:00:03 +0000 (09:00 +0100)]
mod_register: Support for blacklisting ips that are still over limit when they get pushed out of the cache

8 years agomod_register: Use util.cache to limit the number of per-ip throttles kept
Kim Alvefur [Wed, 23 Dec 2015 07:58:34 +0000 (08:58 +0100)]
mod_register: Use util.cache to limit the number of per-ip throttles kept

8 years agomod_register: Switch to using util.throttle for limiting registrations per ip per...
Kim Alvefur [Wed, 23 Dec 2015 07:57:12 +0000 (08:57 +0100)]
mod_register: Switch to using util.throttle for limiting registrations per ip per time

8 years agotests: Add small test for util.throttle
Kim Alvefur [Wed, 23 Dec 2015 07:49:38 +0000 (08:49 +0100)]
tests: Add small test for util.throttle

8 years agoutil.openssl: Fix style / whitespace
Kim Alvefur [Wed, 23 Dec 2015 07:47:57 +0000 (08:47 +0100)]
util.openssl: Fix style / whitespace

8 years agoutil.openssl: Rename variables for readability
Kim Alvefur [Wed, 23 Dec 2015 07:46:54 +0000 (08:46 +0100)]
util.openssl: Rename variables for readability

8 years agoutil.openssl: Move quoting and tostring call into escape function
Kim Alvefur [Wed, 23 Dec 2015 07:42:02 +0000 (08:42 +0100)]
util.openssl: Move quoting and tostring call into escape function

8 years agoutil.array: Just use table.remove as array:pop()
Kim Alvefur [Wed, 23 Dec 2015 07:39:22 +0000 (08:39 +0100)]
util.array: Just use table.remove as array:pop()

8 years agoutil.array: Fix minory style issues
Kim Alvefur [Wed, 23 Dec 2015 07:32:13 +0000 (08:32 +0100)]
util.array: Fix minory style issues

8 years agomod_admin_telnet: Backport 06696882d972 from 0.10 (this command greatly helps with...
Matthew Wild [Tue, 22 Dec 2015 14:15:09 +0000 (14:15 +0000)]
mod_admin_telnet: Backport 06696882d972 from 0.10 (this command greatly helps with debugging HTTP issues)

8 years agomod_register: Add comment explaining the workaround for replying when the account...
Kim Alvefur [Mon, 21 Dec 2015 13:48:33 +0000 (14:48 +0100)]
mod_register: Add comment explaining the workaround for replying when the account is being deleted

8 years agomod_register: Use session log instance to ease indentification
Kim Alvefur [Mon, 21 Dec 2015 13:41:38 +0000 (14:41 +0100)]
mod_register: Use session log instance to ease indentification

8 years agoutil.cache (and tests): Call on_evict after insertion of the new key, so inside on_ev...
Matthew Wild [Tue, 22 Dec 2015 20:10:07 +0000 (20:10 +0000)]
util.cache (and tests): Call on_evict after insertion of the new key, so inside on_evict we can be more certain about the current state of the cache (i.e. full, new item added, old item removed)

8 years agoMerge 0.9->0.10
Matthew Wild [Wed, 16 Dec 2015 16:45:57 +0000 (16:45 +0000)]
Merge 0.9->0.10

8 years agoMerge
Matthew Wild [Wed, 16 Dec 2015 16:44:40 +0000 (16:44 +0000)]
Merge

8 years agoMUC: Fix incorrect nesting of status codes when room config changes (fixes #579)
Matthew Wild [Wed, 16 Dec 2015 16:41:48 +0000 (16:41 +0000)]
MUC: Fix incorrect nesting of status codes when room config changes (fixes #579)

8 years agoutil.dependencies: Use prosody.log() instead of global log()
Matthew Wild [Wed, 16 Dec 2015 02:22:16 +0000 (02:22 +0000)]
util.dependencies: Use prosody.log() instead of global log()

8 years agomod_storage_sql: Fix use of SQLite3 in-memory database (no path expansion)
Kim Alvefur [Tue, 15 Dec 2015 12:15:30 +0000 (13:15 +0100)]
mod_storage_sql: Fix use of SQLite3 in-memory database (no path expansion)

8 years agoutil.sslconfig: More descriptive variable names and also comments
Kim Alvefur [Sun, 13 Dec 2015 20:21:09 +0000 (21:21 +0100)]
util.sslconfig: More descriptive variable names and also comments

8 years agoutil.datamanager: Add append to public api
Kim Alvefur [Fri, 11 Dec 2015 19:31:55 +0000 (20:31 +0100)]
util.datamanager: Add append to public api

8 years agoutil.datamanager: Return extra location info
Kim Alvefur [Fri, 11 Dec 2015 19:31:19 +0000 (20:31 +0100)]
util.datamanager: Return extra location info

8 years agoutil.datamanager: Make sure only strings are passed as data to append()
Kim Alvefur [Fri, 11 Dec 2015 19:30:39 +0000 (20:30 +0100)]
util.datamanager: Make sure only strings are passed as data to append()

8 years agoutil.datamanager: Add some comments about the append function
Kim Alvefur [Fri, 11 Dec 2015 19:29:55 +0000 (20:29 +0100)]
util.datamanager: Add some comments about the append function

8 years agoutil.datamanager: Handle potential error from :write() call
Kim Alvefur [Fri, 11 Dec 2015 19:26:04 +0000 (20:26 +0100)]
util.datamanager: Handle potential error from :write() call

8 years agoutil.datamanager: Handle potential issues from fallocate
Kim Alvefur [Fri, 11 Dec 2015 19:24:36 +0000 (20:24 +0100)]
util.datamanager: Handle potential issues from fallocate

8 years agoutil.datamanager: No shadowing of variable [luacheck]
Kim Alvefur [Fri, 11 Dec 2015 19:22:54 +0000 (20:22 +0100)]
util.datamanager: No shadowing of variable [luacheck]

8 years agoutil.datamanager: Skip past second check if first attemtp to open file succeeds
Kim Alvefur [Fri, 11 Dec 2015 19:18:24 +0000 (20:18 +0100)]
util.datamanager: Skip past second check if first attemtp to open file succeeds

8 years agoutil.datamanager: In append() collect status when closing file handle as it may fail...
Kim Alvefur [Fri, 11 Dec 2015 19:13:37 +0000 (20:13 +0100)]
util.datamanager: In append() collect status when closing file handle as it may fail (eg the implied flush)

8 years agoutil.datamanager: Overwrite 'data' variable instead of shadownig it [luacheck]
Kim Alvefur [Fri, 11 Dec 2015 19:11:48 +0000 (20:11 +0100)]
util.datamanager: Overwrite 'data' variable instead of shadownig it [luacheck]

8 years agoutil.datamanager: Factor out code for appending bytes to a file
Kim Alvefur [Fri, 11 Dec 2015 19:07:22 +0000 (20:07 +0100)]
util.datamanager: Factor out code for appending bytes to a file

8 years agologgingmanager: Add prosody.log (intended to be used instead of _G.log now)
Matthew Wild [Fri, 11 Dec 2015 14:00:42 +0000 (14:00 +0000)]
loggingmanager: Add prosody.log (intended to be used instead of _G.log now)

8 years agomod_admin_telnet: Add http:list() command to get info about current HTTP endpoints...
Matthew Wild [Thu, 10 Dec 2015 18:00:08 +0000 (18:00 +0000)]
mod_admin_telnet: Add http:list() command to get info about current HTTP endpoints on the server

8 years ago.luacheckrc: Whitelist import() global function
Matthew Wild [Thu, 10 Dec 2015 17:58:52 +0000 (17:58 +0000)]
.luacheckrc: Whitelist import() global function

8 years agoprosody: Don't silently ignore unknown command-line options
Matthew Wild [Thu, 10 Dec 2015 13:33:14 +0000 (13:33 +0000)]
prosody: Don't silently ignore unknown command-line options

8 years agomod_compression: Remove FIXMEs, mod_c2s and mod_s2s checks if TLS compression is...
Kim Alvefur [Thu, 10 Dec 2015 14:16:49 +0000 (15:16 +0100)]
mod_compression: Remove FIXMEs, mod_c2s and mod_s2s checks if TLS compression is used and sets a flag since 969e0a054795

8 years agoMUC: Fix previous commit
Kim Alvefur [Wed, 9 Dec 2015 15:33:43 +0000 (16:33 +0100)]
MUC: Fix previous commit

8 years agoutil.uuid: Remove unused import
Kim Alvefur [Tue, 8 Dec 2015 22:20:37 +0000 (23:20 +0100)]
util.uuid: Remove unused import

8 years agoMUC: Process only options that are included in a form (Fixes #521)
Kim Alvefur [Tue, 8 Dec 2015 19:19:30 +0000 (20:19 +0100)]
MUC: Process only options that are included in a form (Fixes #521)

8 years agoutil.dataforms: Track which fields are included in a form
Kim Alvefur [Tue, 8 Dec 2015 19:16:49 +0000 (20:16 +0100)]
util.dataforms: Track which fields are included in a form

8 years agoportmanager: Lower the priority of module-supplied TLS options
Kim Alvefur [Tue, 8 Dec 2015 19:12:38 +0000 (20:12 +0100)]
portmanager: Lower the priority of module-supplied TLS options