Kim Alvefur [Fri, 22 Jan 2016 14:03:02 +0000 (15:03 +0100)]
Merge 0.10->trunk
Kim Alvefur [Fri, 22 Jan 2016 13:49:05 +0000 (14:49 +0100)]
Merge 0.9->0.10
Matthew Wild [Fri, 22 Jan 2016 13:22:50 +0000 (13:22 +0000)]
Merge 0.10->trunk
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)
Kim Alvefur [Fri, 22 Jan 2016 01:00:43 +0000 (02:00 +0100)]
server_select: Add logging of when servers are paused and resumed
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)
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)
Kim Alvefur [Fri, 22 Jan 2016 00:58:39 +0000 (01:58 +0100)]
server_select: Keep track of which server listeners are full
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)
Kim Alvefur [Thu, 21 Jan 2016 21:21:19 +0000 (22:21 +0100)]
Backout
63f5870f9afe, no longer needed since Windows is currently unsupported
Kim Alvefur [Wed, 20 Jan 2016 14:04:42 +0000 (15:04 +0100)]
MUC: Add luacheck annotations, remove unused vars, rename conflicting vars etc
Kim Alvefur [Wed, 20 Jan 2016 13:46:27 +0000 (14:46 +0100)]
Merge 0.10->trunk
Kim Alvefur [Wed, 20 Jan 2016 13:46:06 +0000 (14:46 +0100)]
MUC: Rename variables to please luacheck
Kim Alvefur [Tue, 19 Jan 2016 20:31:02 +0000 (21:31 +0100)]
mod_dialback: Follow XEP-0185 and use HMAC
Kim Alvefur [Sat, 16 Jan 2016 21:44:43 +0000 (22:44 +0100)]
Merge 0.10->trunk
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
Kim Alvefur [Tue, 12 Jan 2016 22:48:16 +0000 (23:48 +0100)]
util.random: Open /dev/urandom read-only, make seed() a noop
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
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)
Kim Alvefur [Tue, 12 Jan 2016 00:13:57 +0000 (01:13 +0100)]
prosodyctl check: Fix traceback if the global modules_enabled is unset
Kim Alvefur [Mon, 11 Jan 2016 14:35:51 +0000 (15:35 +0100)]
mod_blocklist: Clear second level cache correctly on user deletion
Kim Alvefur [Mon, 11 Jan 2016 14:33:18 +0000 (15:33 +0100)]
Merge 0.9->0.10
Kim Alvefur [Mon, 11 Jan 2016 12:44:48 +0000 (13:44 +0100)]
MUC: Fix global access when setting 'whois', probably resulted in wrong status code return (thanks EmilyRose)
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)
Kim Alvefur [Sun, 10 Jan 2016 22:21:34 +0000 (23:21 +0100)]
util.uuid: Open /dev/urandom read-only, make seed() a noop
Kim Alvefur [Sun, 10 Jan 2016 02:57:17 +0000 (03:57 +0100)]
Merge 0.10->trunk
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)
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
Kim Alvefur [Sat, 9 Jan 2016 23:17:54 +0000 (00:17 +0100)]
Makefile: Add 'test' target that runs tests
Kim Alvefur [Sat, 9 Jan 2016 23:00:22 +0000 (00:00 +0100)]
mod_admin_telnet: c2s:count in less lines
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
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
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
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)
Kim Alvefur [Sat, 9 Jan 2016 15:58:39 +0000 (16:58 +0100)]
prosodyctl: Show an example ssl config after generating a certificate
Kim Alvefur [Sat, 9 Jan 2016 14:18:46 +0000 (15:18 +0100)]
rostermanager: Rename variable to avoid name clash [luacheck]
Kim Alvefur [Fri, 8 Jan 2016 15:21:05 +0000 (16:21 +0100)]
Merge 0.10->trunk
Kim Alvefur [Fri, 8 Jan 2016 15:20:02 +0000 (16:20 +0100)]
tests: Fix merge, modulemanager test was removed
Kim Alvefur [Fri, 8 Jan 2016 15:16:08 +0000 (16:16 +0100)]
Merge 0.9->0.10
Matthew Wild [Fri, 8 Jan 2016 13:01:32 +0000 (13:01 +0000)]
Added tag 0.9.9 for changeset
7ec52755622f
Matthew Wild [Fri, 8 Jan 2016 13:01:27 +0000 (13:01 +0000)]
Backout
88d54bec26b7 prior to release, as it certainly requires more testing
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
Kim Alvefur [Wed, 6 Jan 2016 02:28:56 +0000 (03:28 +0100)]
util.random: Use /dev/urandom
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
Kim Alvefur [Wed, 6 Jan 2016 01:46:47 +0000 (02:46 +0100)]
util.uuid: Use /dev/urandom
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)
Kim Alvefur [Mon, 4 Jan 2016 16:47:40 +0000 (17:47 +0100)]
util.ip: Support zone id syntax in IPv6 addresses
Matthew Wild [Mon, 4 Jan 2016 09:14:57 +0000 (09:14 +0000)]
Merge 0.10->trunk
Matthew Wild [Mon, 4 Jan 2016 09:14:30 +0000 (09:14 +0000)]
mod_bosh: Fire event when BOSH session is created
Matthew Wild [Mon, 4 Jan 2016 09:09:15 +0000 (09:09 +0000)]
Merge 0.10->trunk
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
Kim Alvefur [Sun, 3 Jan 2016 16:22:58 +0000 (17:22 +0100)]
mod_admin_adhoc: Remove extra ) that should not be there
Kim Alvefur [Sun, 3 Jan 2016 16:19:14 +0000 (17:19 +0100)]
server_select: Forward the actual TLS handshake error message
Matthew Wild [Sat, 2 Jan 2016 20:42:53 +0000 (20:42 +0000)]
Merge 0.10->trunk
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
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() )
Kim Alvefur [Fri, 1 Jan 2016 22:31:13 +0000 (23:31 +0100)]
Merge 0.10->trunk
Kim Alvefur [Fri, 1 Jan 2016 18:53:45 +0000 (19:53 +0100)]
mod_register: Fix typo
Kim Alvefur [Sun, 27 Dec 2015 11:29:28 +0000 (12:29 +0100)]
Merge 0.10->trunk
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)
Kim Alvefur [Wed, 23 Dec 2015 13:21:20 +0000 (14:21 +0100)]
man prosodyctl: Add information about the 'about' and 'check' commands
Kim Alvefur [Wed, 23 Dec 2015 13:20:57 +0000 (14:20 +0100)]
man prosodyctl: Add missing 'reload' command
Kim Alvefur [Wed, 23 Dec 2015 13:19:01 +0000 (14:19 +0100)]
man prosodyctl: Accidentally markdown
Matthew Wild [Wed, 23 Dec 2015 11:17:26 +0000 (11:17 +0000)]
util.events: Document data structures
Kim Alvefur [Wed, 23 Dec 2015 11:11:07 +0000 (12:11 +0100)]
Merge 0.9->0.10
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
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)
Kim Alvefur [Wed, 23 Dec 2015 10:43:39 +0000 (11:43 +0100)]
util.timer: Reschedule timers from stop() if the next pending event is stopped
Kim Alvefur [Wed, 23 Dec 2015 10:42:14 +0000 (11:42 +0100)]
mod_admin_telnet: Make timer:info command more robust
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
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
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
Kim Alvefur [Wed, 23 Dec 2015 07:49:38 +0000 (08:49 +0100)]
tests: Add small test for util.throttle
Kim Alvefur [Wed, 23 Dec 2015 07:47:57 +0000 (08:47 +0100)]
util.openssl: Fix style / whitespace
Kim Alvefur [Wed, 23 Dec 2015 07:46:54 +0000 (08:46 +0100)]
util.openssl: Rename variables for readability
Kim Alvefur [Wed, 23 Dec 2015 07:42:02 +0000 (08:42 +0100)]
util.openssl: Move quoting and tostring call into escape function
Kim Alvefur [Wed, 23 Dec 2015 07:39:22 +0000 (08:39 +0100)]
util.array: Just use table.remove as array:pop()
Kim Alvefur [Wed, 23 Dec 2015 07:32:13 +0000 (08:32 +0100)]
util.array: Fix minory style issues
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)
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
Kim Alvefur [Mon, 21 Dec 2015 13:41:38 +0000 (14:41 +0100)]
mod_register: Use session log instance to ease indentification
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)
Matthew Wild [Wed, 16 Dec 2015 16:47:34 +0000 (16:47 +0000)]
Merge 0.10->trunk
Matthew Wild [Wed, 16 Dec 2015 16:45:57 +0000 (16:45 +0000)]
Merge 0.9->0.10
Matthew Wild [Wed, 16 Dec 2015 16:44:40 +0000 (16:44 +0000)]
Merge
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)
Matthew Wild [Wed, 16 Dec 2015 02:22:16 +0000 (02:22 +0000)]
util.dependencies: Use prosody.log() instead of global log()
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)
Kim Alvefur [Sun, 13 Dec 2015 20:22:26 +0000 (21:22 +0100)]
Merge 0.10->trunk
Kim Alvefur [Sun, 13 Dec 2015 20:21:09 +0000 (21:21 +0100)]
util.sslconfig: More descriptive variable names and also comments
Kim Alvefur [Sat, 12 Dec 2015 01:33:15 +0000 (02:33 +0100)]
Merge 0.10->trunk
Kim Alvefur [Fri, 11 Dec 2015 19:31:55 +0000 (20:31 +0100)]
util.datamanager: Add append to public api
Kim Alvefur [Fri, 11 Dec 2015 19:31:19 +0000 (20:31 +0100)]
util.datamanager: Return extra location info
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()
Kim Alvefur [Fri, 11 Dec 2015 19:29:55 +0000 (20:29 +0100)]
util.datamanager: Add some comments about the append function
Kim Alvefur [Fri, 11 Dec 2015 19:26:04 +0000 (20:26 +0100)]
util.datamanager: Handle potential error from :write() call
Kim Alvefur [Fri, 11 Dec 2015 19:24:36 +0000 (20:24 +0100)]
util.datamanager: Handle potential issues from fallocate
Kim Alvefur [Fri, 11 Dec 2015 19:22:54 +0000 (20:22 +0100)]
util.datamanager: No shadowing of variable [luacheck]
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
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)