prosody.git
10 years agoMerge 0.9->trunk
Matthew Wild [Sat, 24 Aug 2013 22:16:08 +0000 (23:16 +0100)]
Merge 0.9->trunk

10 years agomod_pep: Update COMPAT comment, it seems Asterisk 1.8 also suffers from this issue...
Matthew Wild [Sat, 24 Aug 2013 22:15:24 +0000 (23:15 +0100)]
mod_pep: Update COMPAT comment, it seems Asterisk 1.8 also suffers from this issue (thanks Lonnie Abelbeck)

10 years agoAdded tag 0.9.0 for changeset 6ef79af0c445
Matthew Wild [Mon, 19 Aug 2013 19:36:04 +0000 (20:36 +0100)]
Added tag 0.9.0 for changeset 6ef79af0c445

10 years agomod_c2s: Move another log message to debug level
Kim Alvefur [Wed, 14 Aug 2013 13:38:56 +0000 (15:38 +0200)]
mod_c2s: Move another log message to debug level

10 years agomod_c2s, mod_s2s: Log cipher and encryption info in a more compact and (hopefully...
Kim Alvefur [Wed, 14 Aug 2013 13:00:36 +0000 (15:00 +0200)]
mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and (hopefully) less confusing way

10 years agomod_s2s: Captitalize log messages that begin with a stream direction
Kim Alvefur [Wed, 14 Aug 2013 12:53:50 +0000 (14:53 +0200)]
mod_s2s: Captitalize log messages that begin with a stream direction

10 years agomod_s2s: Lower "Beginning new connection attempt" message from info to debug level
Kim Alvefur [Wed, 14 Aug 2013 12:44:56 +0000 (14:44 +0200)]
mod_s2s: Lower "Beginning new connection attempt" message from info to debug level

10 years agomod_s2s/s2sout.lib: Improve error message logged at 'info' level when failing to...
Matthew Wild [Tue, 13 Aug 2013 23:18:39 +0000 (00:18 +0100)]
mod_s2s/s2sout.lib: Improve error message logged at 'info' level when failing to connect to a host. Now 'Failed in all attempts to connect to XYZ'

10 years agoutil.async: Make guarder() local
Matthew Wild [Tue, 13 Aug 2013 22:38:50 +0000 (23:38 +0100)]
util.async: Make guarder() local

10 years agoutil.async: Add guarder method, to create guards to ensure only a single runner can...
Matthew Wild [Tue, 13 Aug 2013 20:26:53 +0000 (21:26 +0100)]
util.async: Add guarder method, to create guards to ensure only a single runner can pass through a section of code at a time

10 years agousermanager: Remove unused import of pairs()
Matthew Wild [Tue, 13 Aug 2013 18:38:05 +0000 (19:38 +0100)]
usermanager: Remove unused import of pairs()

10 years agoutil.async: Fix logic bug that prevented error watcher being called for runners
Matthew Wild [Tue, 13 Aug 2013 18:23:00 +0000 (19:23 +0100)]
util.async: Fix logic bug that prevented error watcher being called for runners

10 years agoutil.async: waiter: Throw error if done() called too many times
Kim Alvefur [Mon, 12 Aug 2013 11:22:27 +0000 (13:22 +0200)]
util.async: waiter: Throw error if done() called too many times

10 years agoutil.async: waiter: Remove restriction about wait() being called before done()
Matthew Wild [Mon, 12 Aug 2013 11:08:51 +0000 (12:08 +0100)]
util.async: waiter: Remove restriction about wait() being called before done()

10 years agoutil.async: runner: Fix check for new state to recognise transition to 'waiting'
Matthew Wild [Mon, 12 Aug 2013 10:50:27 +0000 (11:50 +0100)]
util.async: runner: Fix check for new state to recognise transition to 'waiting'

10 years agoutil.async: Make functions local
Matthew Wild [Mon, 12 Aug 2013 09:27:08 +0000 (10:27 +0100)]
util.async: Make functions local

10 years agomod_c2s: Port coroutine code to util.async
Matthew Wild [Sun, 11 Aug 2013 13:46:27 +0000 (14:46 +0100)]
mod_c2s: Port coroutine code to util.async

10 years agoutil.async: New library to provide support around coroutine-based non-blocking functions
Matthew Wild [Sun, 11 Aug 2013 13:46:07 +0000 (14:46 +0100)]
util.async: New library to provide support around coroutine-based non-blocking functions

10 years agoutil.debug: Fix level of locals when inspecting a coroutine
Matthew Wild [Sun, 11 Aug 2013 09:42:58 +0000 (10:42 +0100)]
util.debug: Fix level of locals when inspecting a coroutine

10 years agoutil.debug: Further fix to display locals in extended tracebacks
Matthew Wild [Sat, 10 Aug 2013 19:40:45 +0000 (20:40 +0100)]
util.debug: Further fix to display locals in extended tracebacks

10 years agoutil.debug: Fixes to make coroutine tracebacks work properly
Matthew Wild [Sat, 10 Aug 2013 19:30:40 +0000 (20:30 +0100)]
util.debug: Fixes to make coroutine tracebacks work properly

10 years agomod_auth_internal_hashed: Log calls to provider methods and be consistent with mod_au...
Kim Alvefur [Sat, 10 Aug 2013 18:19:40 +0000 (20:19 +0200)]
mod_auth_internal_hashed: Log calls to provider methods and be consistent with mod_auth_internal_plain

10 years agomod_auth_internal_hashed: Use logger setup by moduleapi instead of going for util...
Kim Alvefur [Sat, 10 Aug 2013 18:17:45 +0000 (20:17 +0200)]
mod_auth_internal_hashed: Use logger setup by moduleapi instead of going for util.logger directly

10 years agomod_auth_internal_hashed: Remove this 'initializing' message too
Kim Alvefur [Sat, 10 Aug 2013 18:15:25 +0000 (20:15 +0200)]
mod_auth_internal_hashed: Remove this 'initializing' message too

10 years agomod_auth_internal_plain: Remove "initializing" log message, hostmanager logs this too
Kim Alvefur [Sat, 10 Aug 2013 18:10:30 +0000 (20:10 +0200)]
mod_auth_internal_plain: Remove "initializing" log message, hostmanager logs this too

10 years agomod_auth_internal_plain: Log a debug message when changing password to be consistent...
Kim Alvefur [Sat, 10 Aug 2013 18:09:33 +0000 (20:09 +0200)]
mod_auth_internal_plain: Log a debug message when changing password to be consistent with the other methods

10 years agomod_auth_internal_plain: Remove redundant hostname from log messages
Kim Alvefur [Sat, 10 Aug 2013 18:06:51 +0000 (20:06 +0200)]
mod_auth_internal_plain: Remove redundant hostname from log messages

10 years agomod_dialback: Change level of some log statements to be more appropriate
Kim Alvefur [Sat, 10 Aug 2013 17:53:22 +0000 (19:53 +0200)]
mod_dialback: Change level of some log statements to be more appropriate

10 years agoutil.pposix: Fix overflow in rlimit argument conversion (thanks gcc, now be quiet...
Kim Alvefur [Sat, 10 Aug 2013 17:02:52 +0000 (19:02 +0200)]
util.pposix: Fix overflow in rlimit argument conversion (thanks gcc, now be quiet please)

10 years agoRemove all trailing whitespace
Florian Zeitz [Fri, 9 Aug 2013 15:48:21 +0000 (17:48 +0200)]
Remove all trailing whitespace

10 years agoMerge 0.9->trunk
Kim Alvefur [Fri, 9 Aug 2013 14:03:48 +0000 (16:03 +0200)]
Merge 0.9->trunk

10 years agoutil.hashes: Silence compiler warning about pointer signedness
Kim Alvefur [Fri, 9 Aug 2013 14:03:17 +0000 (16:03 +0200)]
util.hashes: Silence compiler warning about pointer signedness

10 years agomod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waitin...
Matthew Wild [Fri, 9 Aug 2013 10:10:22 +0000 (11:10 +0100)]
mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing.

10 years agomod_disco: Check for host type == 'local' ('normal' never existed)
Matthew Wild [Tue, 6 Aug 2013 16:18:39 +0000 (17:18 +0100)]
mod_disco: Check for host type == 'local' ('normal' never existed)

10 years agomoduleapi: module:get_host_type() now returns 'global' for * and 'local' for non...
Matthew Wild [Tue, 6 Aug 2013 16:17:23 +0000 (17:17 +0100)]
moduleapi: module:get_host_type() now returns 'global' for * and 'local' for non-components

10 years agoMerge 0.9->trunk
Kim Alvefur [Tue, 6 Aug 2013 12:35:03 +0000 (14:35 +0200)]
Merge 0.9->trunk

10 years agomod_admin_telnet, mod_s2s: Fix reporting of certificate chain validation details
Kim Alvefur [Tue, 6 Aug 2013 12:32:31 +0000 (14:32 +0200)]
mod_admin_telnet, mod_s2s: Fix reporting of certificate chain validation details

10 years agoutil.hashes: Correct argument order
Kim Alvefur [Tue, 6 Aug 2013 12:31:20 +0000 (14:31 +0200)]
util.hashes: Correct argument order

10 years agomod_s2s: Improve policy check
Kim Alvefur [Mon, 5 Aug 2013 18:47:38 +0000 (20:47 +0200)]
mod_s2s: Improve policy check

10 years agomod_s2s: Log certificate identity validation result
Kim Alvefur [Sun, 4 Aug 2013 15:33:00 +0000 (17:33 +0200)]
mod_s2s: Log certificate identity validation result

10 years agomod_storage_sql2: Do an early return and drop an indentation level
Kim Alvefur [Fri, 2 Aug 2013 13:40:21 +0000 (15:40 +0200)]
mod_storage_sql2: Do an early return and drop an indentation level

10 years agomod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some...
Kim Alvefur [Fri, 2 Aug 2013 13:12:24 +0000 (15:12 +0200)]
mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some details

10 years agomod_register: Use more specific get_option variants
Kim Alvefur [Fri, 2 Aug 2013 12:44:56 +0000 (14:44 +0200)]
mod_register: Use more specific get_option variants

10 years agomod_adhoc: Add local_user permission
Florian Zeitz [Wed, 24 Jul 2013 21:30:32 +0000 (23:30 +0200)]
mod_adhoc: Add local_user permission

10 years agomod_adhoc: Use mod_disco for disco handling
Florian Zeitz [Wed, 24 Jul 2013 20:58:44 +0000 (22:58 +0200)]
mod_adhoc: Use mod_disco for disco handling

10 years agomod_adhoc: Sort commands by node. This guarantees the order remains the same across...
Florian Zeitz [Wed, 24 Jul 2013 20:08:07 +0000 (22:08 +0200)]
mod_adhoc: Sort commands by node. This guarantees the order remains the same across restarts etc.

10 years agoMerge 0.9->trunk
Kim Alvefur [Wed, 24 Jul 2013 19:50:38 +0000 (21:50 +0200)]
Merge 0.9->trunk

10 years agoadhoc.lib: Don't build error reply from reply stanza
Kim Alvefur [Wed, 24 Jul 2013 19:49:36 +0000 (21:49 +0200)]
adhoc.lib: Don't build error reply from reply stanza

10 years agomod_c2s: Change default of tcp_keepalives to true, and make it individually configura...
Kim Alvefur [Wed, 24 Jul 2013 13:28:36 +0000 (15:28 +0200)]
mod_c2s: Change default of tcp_keepalives to true, and make it individually configurable through c2s_tcp_keepalives

10 years agoMerge 0.9->trunk
Kim Alvefur [Mon, 22 Jul 2013 18:29:41 +0000 (20:29 +0200)]
Merge 0.9->trunk

10 years agonet.server_event: Pass ondrain handler from listener
Kim Alvefur [Mon, 22 Jul 2013 16:17:30 +0000 (18:17 +0200)]
net.server_event: Pass ondrain handler from listener

10 years agonet.http.server: Fix Keep-Alive requests with HTTP 1.0
Kim Alvefur [Mon, 22 Jul 2013 15:28:37 +0000 (17:28 +0200)]
net.http.server: Fix Keep-Alive requests with HTTP 1.0

10 years agoMerge 0.9->trunk
Matthew Wild [Mon, 15 Jul 2013 22:43:37 +0000 (23:43 +0100)]
Merge 0.9->trunk

10 years agoutil.net: Fix compilation on Windows (outputs an empty list of addresses for now...
Matthew Wild [Mon, 15 Jul 2013 22:43:20 +0000 (23:43 +0100)]
util.net: Fix compilation on Windows (outputs an empty list of addresses for now) (tested only in my head)

10 years agoMerge 0.9->trunk
Matthew Wild [Mon, 15 Jul 2013 22:35:49 +0000 (23:35 +0100)]
Merge 0.9->trunk

10 years agoutil.net: Include missing header needed for successful compiltion on FreeBSD
Matthew Wild [Mon, 15 Jul 2013 22:34:59 +0000 (23:34 +0100)]
util.net: Include missing header needed for successful compiltion on FreeBSD

10 years agoutil.events: Remove varargs, event handlers can now only accept a single parameter
Matthew Wild [Mon, 15 Jul 2013 11:15:51 +0000 (12:15 +0100)]
util.events: Remove varargs, event handlers can now only accept a single parameter

10 years agomod_bosh, mod_c2s: No longer fire stream-features globally (nobody uses it, and share...
Matthew Wild [Mon, 15 Jul 2013 10:44:49 +0000 (11:44 +0100)]
mod_bosh, mod_c2s: No longer fire stream-features globally (nobody uses it, and shared modules make it easy for global modules to hook per-host now)

10 years agorostermanager, mod_groups: Change roster-load event to pass an event table for consis...
Matthew Wild [Mon, 15 Jul 2013 10:43:23 +0000 (11:43 +0100)]
rostermanager, mod_groups: Change roster-load event to pass an event table for consistency

10 years agoMerge 0.9->trunk
Matthew Wild [Sat, 13 Jul 2013 12:17:53 +0000 (13:17 +0100)]
Merge 0.9->trunk

10 years agocertmanager: Set our own default cipher string, which includes only ciphers regarded...
Matthew Wild [Sat, 13 Jul 2013 12:15:24 +0000 (13:15 +0100)]
certmanager: Set our own default cipher string, which includes only ciphers regarded as 'HIGH' strength (by OpenSSL). In particular this disables RC4.

10 years agoutil.sql: Do lazy fetching of affected/rowcount
Kim Alvefur [Fri, 12 Jul 2013 15:44:30 +0000 (17:44 +0200)]
util.sql: Do lazy fetching of affected/rowcount

10 years agoBacked out changeset 3c57c2281087
Kim Alvefur [Fri, 12 Jul 2013 15:41:54 +0000 (17:41 +0200)]
Backed out changeset 3c57c2281087

10 years agoutil.sql: Don't fetch row count of result sets for queries that don't have result...
Kim Alvefur [Fri, 12 Jul 2013 15:03:09 +0000 (17:03 +0200)]
util.sql: Don't fetch row count of result sets for queries that don't have result sets

10 years agomod_storage_sql2: Add archive store with append and find methods
Kim Alvefur [Fri, 12 Jul 2013 00:53:24 +0000 (02:53 +0200)]
mod_storage_sql2: Add archive store with append and find methods

10 years agomod_storage_sql2: Create an additional table `prosodyarchive` for chronological colle...
Kim Alvefur [Thu, 11 Jul 2013 23:34:38 +0000 (01:34 +0200)]
mod_storage_sql2: Create an additional table `prosodyarchive` for chronological collections

10 years agoutil.sql: Set charset and collation for MySQL when creating tables
Kim Alvefur [Thu, 11 Jul 2013 20:07:55 +0000 (22:07 +0200)]
util.sql: Set charset and collation for MySQL when creating tables

10 years agoRemove plugins/storage/sqlbasic.lib.lua, which seems obsolete
Matthew Wild [Thu, 11 Jul 2013 14:13:45 +0000 (15:13 +0100)]
Remove plugins/storage/sqlbasic.lib.lua, which seems obsolete

10 years agoMerge 0.9->trunk
Matthew Wild [Thu, 11 Jul 2013 14:10:04 +0000 (15:10 +0100)]
Merge 0.9->trunk

10 years agomod_storage_sql2: Remove from 0.9
Matthew Wild [Thu, 11 Jul 2013 14:08:47 +0000 (15:08 +0100)]
mod_storage_sql2: Remove from 0.9

10 years agomod_storage_sql2: Support XML serialization for stanzas.
Kim Alvefur [Wed, 10 Jul 2013 11:19:33 +0000 (13:19 +0200)]
mod_storage_sql2: Support XML serialization for stanzas.

10 years agomod_storage_sql2: Keep available store types in a table
Kim Alvefur [Wed, 10 Jul 2013 11:18:10 +0000 (13:18 +0200)]
mod_storage_sql2: Keep available store types in a table

10 years agomod_storage_sql2: Fix iteration over users and stores
Kim Alvefur [Wed, 10 Jul 2013 10:08:44 +0000 (12:08 +0200)]
mod_storage_sql2: Fix iteration over users and stores

10 years agomod_storage_sql2: Make sure the user field is not NULL
Kim Alvefur [Wed, 10 Jul 2013 10:01:23 +0000 (12:01 +0200)]
mod_storage_sql2: Make sure the user field is not NULL

10 years agoMerge 0.9->trunk
Kim Alvefur [Wed, 10 Jul 2013 05:47:54 +0000 (07:47 +0200)]
Merge 0.9->trunk

10 years agonet.dns, net.adns: Make sure errors from net.server are propagated (thanks asterix)
Kim Alvefur [Wed, 10 Jul 2013 05:45:10 +0000 (07:45 +0200)]
net.dns, net.adns: Make sure errors from net.server are propagated (thanks asterix)

10 years agoMerge 0.9->trunk
Matthew Wild [Mon, 8 Jul 2013 23:04:30 +0000 (00:04 +0100)]
Merge 0.9->trunk

10 years agomod_component: Local imports for some functions, including xpcall
Matthew Wild [Mon, 8 Jul 2013 22:59:51 +0000 (23:59 +0100)]
mod_component: Local imports for some functions, including xpcall

10 years agomod_bosh: pcall() core_process_stanza per stanza, to bring in line with other listene...
Matthew Wild [Mon, 8 Jul 2013 22:59:27 +0000 (23:59 +0100)]
mod_bosh: pcall() core_process_stanza per stanza, to bring in line with other listeners. This ensures that stanzas following a traceback-causing stanza in a request will still be processed (as would happen on normal c2s).

10 years agomod_bosh: Only pass stanza to core_process_stanza if it wasn't dropped by filters
Matthew Wild [Mon, 8 Jul 2013 22:42:54 +0000 (23:42 +0100)]
mod_bosh: Only pass stanza to core_process_stanza if it wasn't dropped by filters

10 years agoMerge 0.9->trunk
Matthew Wild [Mon, 8 Jul 2013 20:41:31 +0000 (21:41 +0100)]
Merge 0.9->trunk

10 years agomod_component: xpcall() stanza processing, as per other listeners, preventing potenti...
Matthew Wild [Mon, 8 Jul 2013 20:38:08 +0000 (21:38 +0100)]
mod_component: xpcall() stanza processing, as per other listeners, preventing potentially harmful 'top-level errors'

10 years agoprosodyctl: Import local_addresses from the new util.net intead of luasocket
Kim Alvefur [Mon, 1 Jul 2013 20:17:31 +0000 (22:17 +0200)]
prosodyctl: Import local_addresses from the new util.net intead of luasocket

11 years agoMerge 0.9->trunk
Kim Alvefur [Sat, 29 Jun 2013 20:49:56 +0000 (22:49 +0200)]
Merge 0.9->trunk

11 years agomod_admin_adhoc: Fix node of the "Get List of Online Users" command
Florian Zeitz [Sat, 29 Jun 2013 20:40:10 +0000 (22:40 +0200)]
mod_admin_adhoc: Fix node of the "Get List of Online Users" command

11 years agoMerge
Matthew Wild [Sat, 29 Jun 2013 13:45:47 +0000 (14:45 +0100)]
Merge

11 years agoutil.pposix: Correctly handle 'unlimited' limits (RLIM_INFINITY), by returning and...
Matthew Wild [Sat, 29 Jun 2013 13:45:38 +0000 (14:45 +0100)]
util.pposix: Correctly handle 'unlimited' limits (RLIM_INFINITY), by returning and accepting the string 'unlimited' in get/setrlimit()

11 years agoMerge 0.9->trunk
Matthew Wild [Sat, 29 Jun 2013 09:11:55 +0000 (10:11 +0100)]
Merge 0.9->trunk

11 years agoutil.pposix: setrlimit(): Add missing return on error when an incorrect number of...
Matthew Wild [Fri, 28 Jun 2013 19:16:43 +0000 (20:16 +0100)]
util.pposix: setrlimit(): Add missing return on error when an incorrect number of arguments are passed

11 years agomod_http_files: Put the MIME type map in a global shared table instead of per-host
Kim Alvefur [Fri, 28 Jun 2013 17:34:57 +0000 (19:34 +0200)]
mod_http_files: Put the MIME type map in a global shared table instead of per-host

11 years agoMerge 0.9->trunk
Matthew Wild [Wed, 26 Jun 2013 20:40:33 +0000 (21:40 +0100)]
Merge 0.9->trunk

11 years agonet.http: Include port number (when non-standard) in the Host header of outgoing...
Matthew Wild [Wed, 26 Jun 2013 20:40:01 +0000 (21:40 +0100)]
net.http: Include port number (when non-standard) in the Host header of outgoing requests, as per the HTTP RFC

11 years agomod_s2s: Add missing global hook for read-timeout
Kim Alvefur [Wed, 26 Jun 2013 11:35:38 +0000 (13:35 +0200)]
mod_s2s: Add missing global hook for read-timeout

11 years agoMerge 0.9->trunk
Matthew Wild [Mon, 24 Jun 2013 17:29:04 +0000 (18:29 +0100)]
Merge 0.9->trunk

11 years agomod_storage_sql2: Use correct variable (Thanks SkyBlue and Florob)
Kim Alvefur [Sun, 23 Jun 2013 17:27:49 +0000 (19:27 +0200)]
mod_storage_sql2: Use correct variable (Thanks SkyBlue and Florob)

11 years agomod_admin_telnet: Refactor s2s:show()
Kim Alvefur [Thu, 20 Jun 2013 19:47:38 +0000 (21:47 +0200)]
mod_admin_telnet: Refactor s2s:show()

11 years agomod_admin_telnet: Generate session names the same way as in s2smanager
Kim Alvefur [Thu, 20 Jun 2013 19:47:28 +0000 (21:47 +0200)]
mod_admin_telnet: Generate session names the same way as in s2smanager

11 years agomod_admin_telnet: Refactor s2s:close and s2s:closeall
Kim Alvefur [Thu, 20 Jun 2013 18:53:29 +0000 (20:53 +0200)]
mod_admin_telnet: Refactor s2s:close and s2s:closeall

11 years agomod_register: Fix indentation
Kim Alvefur [Wed, 19 Jun 2013 14:35:19 +0000 (16:35 +0200)]
mod_register: Fix indentation

11 years agomod_admin_telnet: Refactor s2s:showcert()
Kim Alvefur [Wed, 19 Jun 2013 14:20:33 +0000 (16:20 +0200)]
mod_admin_telnet: Refactor s2s:showcert()