prosody.git
8 years agoMerge 0.9->0.10
Kim Alvefur [Sun, 11 Oct 2015 18:00:15 +0000 (20:00 +0200)]
Merge 0.9->0.10

8 years agocore.certmanager: Remove non-string filenames (allows setting eg capath to false...
Kim Alvefur [Sun, 11 Oct 2015 17:44:15 +0000 (19:44 +0200)]
core.certmanager: Remove non-string filenames (allows setting eg capath to false to disable the built in default)

8 years agoutil.openssl: Separate extension sections into one for self-signed certs and one...
Kim Alvefur [Sun, 11 Oct 2015 16:49:14 +0000 (18:49 +0200)]
util.openssl: Separate extension sections into one for self-signed certs and one for requests

8 years agomod_s2s: Fire global event for stream features where the remote server has not sent...
Kim Alvefur [Sun, 11 Oct 2015 12:03:53 +0000 (14:03 +0200)]
mod_s2s: Fire global event for stream features where the remote server has not sent the 'to' stream attribute

8 years agonet.websocket.frames: Fix syntax error due to code copy pasting
Kim Alvefur [Tue, 6 Oct 2015 16:08:58 +0000 (18:08 +0200)]
net.websocket.frames: Fix syntax error due to code copy pasting

8 years agonet.websocket.frames: Use struct packing in Lua 5.3 or struct lib if available
Kim Alvefur [Tue, 6 Oct 2015 16:05:27 +0000 (18:05 +0200)]
net.websocket.frames: Use struct packing in Lua 5.3 or struct lib if available

8 years agonet.websocket.frames: Pack and unpack 64bit ints without overflows (lua-bitop/bit32...
Kim Alvefur [Tue, 6 Oct 2015 16:03:04 +0000 (18:03 +0200)]
net.websocket.frames: Pack and unpack 64bit ints without overflows (lua-bitop/bit32 are 32bit)

8 years agonet.websocket.frames: Link to documentation when bitop is missing
Kim Alvefur [Tue, 6 Oct 2015 14:49:01 +0000 (16:49 +0200)]
net.websocket.frames: Link to documentation when bitop is missing

8 years agonet.websocket.frames: Throw an error if no bit lib is found
Kim Alvefur [Tue, 6 Oct 2015 14:26:23 +0000 (16:26 +0200)]
net.websocket.frames: Throw an error if no bit lib is found

8 years agonet.websocket.frames: Simplify import of bitlib
Kim Alvefur [Tue, 6 Oct 2015 14:06:22 +0000 (16:06 +0200)]
net.websocket.frames: Simplify import of bitlib

8 years agomod_websocket: Silence luacheck warnings
Kim Alvefur [Tue, 6 Oct 2015 13:30:25 +0000 (15:30 +0200)]
mod_websocket: Silence luacheck warnings

8 years agomod_websocket: Import util.timer and session close timeout config option (thanks...
Kim Alvefur [Tue, 6 Oct 2015 13:27:39 +0000 (15:27 +0200)]
mod_websocket: Import util.timer and session close timeout config option (thanks fairuz)

8 years agoutil.jid: Fix backout
Kim Alvefur [Fri, 2 Oct 2015 10:16:47 +0000 (12:16 +0200)]
util.jid: Fix backout

8 years agoBackout 7e820979fd9b (broke tests)
Kim Alvefur [Fri, 2 Oct 2015 10:12:24 +0000 (12:12 +0200)]
Backout 7e820979fd9b (broke tests)

8 years agoMerge 0.9->0.10
Kim Alvefur [Sat, 26 Sep 2015 22:36:34 +0000 (00:36 +0200)]
Merge 0.9->0.10

8 years agoconfigure,util-src/Makefile: Make a variable that includes -l for OpenSSL (like with...
Kim Alvefur [Sat, 26 Sep 2015 22:28:46 +0000 (00:28 +0200)]
configure,util-src/Makefile: Make a variable that includes -l for OpenSSL (like with IDNA_LIBS)

8 years agoMakefile: Use hypen to tell Make when to ignore errors
Kim Alvefur [Sat, 26 Sep 2015 22:16:34 +0000 (00:16 +0200)]
Makefile: Use hypen to tell Make when to ignore errors

8 years agoMakefile: Support generating prosody.version from hg archive metadata file
Kim Alvefur [Sat, 26 Sep 2015 22:15:57 +0000 (00:15 +0200)]
Makefile: Support generating prosody.version from hg archive metadata file

8 years agoMakefile: Simplify generation of prosody.version using magic Make magic
Kim Alvefur [Sat, 26 Sep 2015 22:14:18 +0000 (00:14 +0200)]
Makefile: Simplify generation of prosody.version using magic Make magic

8 years agoutil-src/Makefile: Remove redundant variables (set in config.unix already)
Kim Alvefur [Sat, 26 Sep 2015 22:12:07 +0000 (00:12 +0200)]
util-src/Makefile: Remove redundant variables (set in config.unix already)

8 years agoutil-src/Makefile: Don't make exceptions for how to build .so for util.hashes and...
Kim Alvefur [Sat, 26 Sep 2015 22:10:18 +0000 (00:10 +0200)]
util-src/Makefile: Don't make exceptions for how to build .so for util.hashes and util.encodings

8 years agoutil-src/Makefile: Tell Make how to build .so from .o in a modern way (Let built...
Kim Alvefur [Sat, 26 Sep 2015 22:08:46 +0000 (00:08 +0200)]
util-src/Makefile: Tell Make how to build .so from .o in a modern way (Let built-in rules handle .o)

8 years agoutil-src/Makefile: Move Lua include path into CFLAGS variable
Kim Alvefur [Sat, 26 Sep 2015 22:04:14 +0000 (00:04 +0200)]
util-src/Makefile: Move Lua include path into CFLAGS variable

8 years agoconfigure, util-src/Makefile: Move OS X deployment flag to an C compiler argument...
Kim Alvefur [Sat, 26 Sep 2015 21:42:46 +0000 (23:42 +0200)]
configure, util-src/Makefile: Move OS X deployment flag to an C compiler argument set by configure

8 years agoutil-src/Makefile: Use variables for install binary and target directory
Kim Alvefur [Sat, 26 Sep 2015 21:38:09 +0000 (23:38 +0200)]
util-src/Makefile: Use variables for install binary and target directory

8 years agoutil-src/Makefile: Move list of .so files in a variable
Kim Alvefur [Sat, 26 Sep 2015 21:29:50 +0000 (23:29 +0200)]
util-src/Makefile: Move list of .so files in a variable

8 years agomod_posix: Detect failure to load util.signal by first pcall return value not by...
Kim Alvefur [Sat, 26 Sep 2015 19:41:11 +0000 (21:41 +0200)]
mod_posix: Detect failure to load util.signal by first pcall return value not by type of the second

8 years agomod_posix: Normalize indentation
Kim Alvefur [Sat, 26 Sep 2015 19:39:26 +0000 (21:39 +0200)]
mod_posix: Normalize indentation

8 years agomod_http_files: Translate forward slashes to local directory separators
Kim Alvefur [Sat, 26 Sep 2015 17:35:56 +0000 (19:35 +0200)]
mod_http_files: Translate forward slashes to local directory separators

8 years agomod_http_files: Strip trailing directory separator regardless of directionality of...
Kim Alvefur [Sat, 26 Sep 2015 17:34:58 +0000 (19:34 +0200)]
mod_http_files: Strip trailing directory separator regardless of directionality of the slash (fixes #545)

8 years agoMerge 0.9->0.10
Kim Alvefur [Fri, 25 Sep 2015 16:11:24 +0000 (18:11 +0200)]
Merge 0.9->0.10

8 years agoMerge
Kim Alvefur [Fri, 25 Sep 2015 16:07:33 +0000 (18:07 +0200)]
Merge

8 years agoserver_event: Fix indentation
Kim Alvefur [Fri, 25 Sep 2015 15:56:21 +0000 (17:56 +0200)]
server_event: Fix indentation

8 years agoserver_event: Put function keyword on same line as the coroutine.wrap it's being...
Kim Alvefur [Fri, 25 Sep 2015 15:55:06 +0000 (17:55 +0200)]
server_event: Put function keyword on same line as the coroutine.wrap it's being passed to

8 years agoMerge 0.9->0.10
Matthew Wild [Fri, 25 Sep 2015 15:51:42 +0000 (16:51 +0100)]
Merge 0.9->0.10

8 years agomod_pep: Don't store contacts' subscriptions to a user's nodes when that user is...
Matthew Wild [Fri, 25 Sep 2015 15:48:25 +0000 (16:48 +0100)]
mod_pep: Don't store contacts' subscriptions to a user's nodes when that user is offline

8 years agoserver_event: Normalize indentation
Kim Alvefur [Fri, 25 Sep 2015 15:43:21 +0000 (17:43 +0200)]
server_event: Normalize indentation

8 years agonet.dns: Use new IPv4-specific socket factory if available (fixes dns on libevent...
Kim Alvefur [Fri, 25 Sep 2015 15:32:13 +0000 (17:32 +0200)]
net.dns: Use new IPv4-specific socket factory if available (fixes dns on libevent with latest development version of luasocket)

8 years agoserver_event: Remove unused argument [luacheck]
Kim Alvefur [Fri, 25 Sep 2015 15:26:47 +0000 (17:26 +0200)]
server_event: Remove unused argument [luacheck]

8 years agoserver_event: Comment out the unused vdebug function [luacheck]
Kim Alvefur [Fri, 25 Sep 2015 15:26:29 +0000 (17:26 +0200)]
server_event: Comment out the unused vdebug function [luacheck]

8 years agoserver_event: Remove unused former argument (fixes global access) [luacheck]
Kim Alvefur [Fri, 25 Sep 2015 15:24:43 +0000 (17:24 +0200)]
server_event: Remove unused former argument (fixes global access) [luacheck]

8 years agoserver_event: Rename luaevent module variable to avoid name clash [luacheck]
Kim Alvefur [Fri, 25 Sep 2015 15:21:00 +0000 (17:21 +0200)]
server_event: Rename luaevent module variable to avoid name clash [luacheck]

8 years agoserver_event: Add luacheck annotations
Kim Alvefur [Fri, 25 Sep 2015 15:25:46 +0000 (17:25 +0200)]
server_event: Add luacheck annotations

8 years agoserver_event: Remove needless scoping and indentation
Kim Alvefur [Fri, 25 Sep 2015 15:12:55 +0000 (17:12 +0200)]
server_event: Remove needless scoping and indentation

8 years agoserver_event: Move local references to various functions to top of file
Kim Alvefur [Fri, 25 Sep 2015 15:02:17 +0000 (17:02 +0200)]
server_event: Move local references to various functions to top of file

8 years agoserver_event: Replace implementation of ordered set with a simple table set
Kim Alvefur [Fri, 25 Sep 2015 14:45:02 +0000 (16:45 +0200)]
server_event: Replace implementation of ordered set with a simple table set

8 years agomod_s2s: Account for connections that time out in connection count measure
Kim Alvefur [Fri, 25 Sep 2015 13:16:25 +0000 (15:16 +0200)]
mod_s2s: Account for connections that time out in connection count measure

8 years agomod_c2s, mod_s2s: Close incoming connections if there are no features to offer on...
Kim Alvefur [Thu, 24 Sep 2015 18:05:23 +0000 (20:05 +0200)]
mod_c2s, mod_s2s: Close incoming connections if there are no features to offer on incomplete streams (fixes #285)

8 years agoprosodyctl check: Warn if certificate checking is enforced but LuaSec is too old
Kim Alvefur [Thu, 24 Sep 2015 18:02:57 +0000 (20:02 +0200)]
prosodyctl check: Warn if certificate checking is enforced but LuaSec is too old

8 years agoprosodyctl check: Warn if encryption is required but LuaSec is unavailable
Kim Alvefur [Thu, 24 Sep 2015 18:02:00 +0000 (20:02 +0200)]
prosodyctl check: Warn if encryption is required but LuaSec is unavailable

8 years agosessionmanager: Make session.send() return true unless there really is an error
Kim Alvefur [Mon, 21 Sep 2015 21:19:48 +0000 (23:19 +0200)]
sessionmanager: Make session.send() return true unless there really is an error

8 years agoplugins: Explicitly return to halt event propagation (session.send sometimes does...
Kim Alvefur [Mon, 21 Sep 2015 21:06:22 +0000 (23:06 +0200)]
plugins: Explicitly return to halt event propagation (session.send sometimes does not return true)

8 years agoMakefile: Fix building prosody.version (.hg/dirstate is a file, not a directory)
Kim Alvefur [Mon, 21 Sep 2015 21:00:49 +0000 (23:00 +0200)]
Makefile: Fix building prosody.version (.hg/dirstate is a file, not a directory)

8 years agomod_admin_telnet: Fix indentation
Kim Alvefur [Fri, 18 Sep 2015 14:16:10 +0000 (16:16 +0200)]
mod_admin_telnet: Fix indentation

8 years agoprosodyctl: Move files out of the way when generating new cert or key
Kim Alvefur [Sat, 19 Sep 2015 15:46:46 +0000 (17:46 +0200)]
prosodyctl: Move files out of the way when generating new cert or key

8 years agoxep227toprosody: Pass parser to callbacks (needed since addition of stanza size limits)
Kim Alvefur [Fri, 18 Sep 2015 14:14:43 +0000 (16:14 +0200)]
xep227toprosody: Pass parser to callbacks (needed since addition of stanza size limits)

8 years agomod_offline: Decrease priority of event handlers so 3rd party hooks fire first by...
Kim Alvefur [Wed, 16 Sep 2015 13:18:30 +0000 (15:18 +0200)]
mod_offline: Decrease priority of event handlers so 3rd party hooks fire first by default

8 years agomod_blocklist: Explicitly halt event propagation after returning a reply (send return...
Kim Alvefur [Wed, 16 Sep 2015 13:16:51 +0000 (15:16 +0200)]
mod_blocklist: Explicitly halt event propagation after returning a reply (send returns nil sometimes)

8 years agomod_tls: Fix inhertinance of 'ssl' option from "parent" host to subdomain (fixes...
Kim Alvefur [Tue, 15 Sep 2015 15:51:56 +0000 (17:51 +0200)]
mod_tls: Fix inhertinance of 'ssl' option from "parent" host to subdomain (fixes #511)

8 years agoMUC: Break a very long line
Kim Alvefur [Sat, 12 Sep 2015 16:52:39 +0000 (18:52 +0200)]
MUC: Break a very long line

8 years agoutil.dataforms: Fix interaction of required fields and empty string values (fixes...
Kim Alvefur [Sat, 12 Sep 2015 15:49:47 +0000 (17:49 +0200)]
util.dataforms: Fix interaction of required fields and empty string values (fixes #521)

8 years agoutil.dataforms: Refactor parsing to reuse simple text parser instead of duplicate...
Kim Alvefur [Sat, 12 Sep 2015 15:40:14 +0000 (17:40 +0200)]
util.dataforms: Refactor parsing to reuse simple text parser instead of duplicate code

8 years agomod_pep: Document data structures, so I don't have to spend time remembering every...
Matthew Wild [Fri, 4 Sep 2015 10:26:51 +0000 (11:26 +0100)]
mod_pep: Document data structures, so I don't have to spend time remembering every time I work on this module

8 years agotests/run_tests.sh: Let status code propagate to shell
Matthew Wild [Fri, 4 Sep 2015 09:56:27 +0000 (10:56 +0100)]
tests/run_tests.sh: Let status code propagate to shell

8 years agotests: Return status code depending on whether tests passed
Matthew Wild [Fri, 4 Sep 2015 09:55:39 +0000 (10:55 +0100)]
tests: Return status code depending on whether tests passed

9 years agonet.dns: Unconditionally cache records found in answers
Matthew Wild [Mon, 25 May 2015 22:16:11 +0000 (23:16 +0100)]
net.dns: Unconditionally cache records found in answers

8 years agoejabberd2prosody: Support password stored as SCRAM hashes
Kim Alvefur [Thu, 20 Aug 2015 07:14:15 +0000 (09:14 +0200)]
ejabberd2prosody: Support password stored as SCRAM hashes

8 years agomod_component: Fire an event on successful component authentication (For Goffi)
Kim Alvefur [Mon, 10 Aug 2015 20:13:02 +0000 (22:13 +0200)]
mod_component: Fire an event on successful component authentication (For Goffi)

8 years agoMUC: Prevent admins from being given affiliatons other than owner
Kim Alvefur [Thu, 25 Jun 2015 15:58:24 +0000 (17:58 +0200)]
MUC: Prevent admins from being given affiliatons other than owner

8 years agoBacked out changeset bea3862b6bde in favor of a different approach
Kim Alvefur [Thu, 25 Jun 2015 15:54:19 +0000 (17:54 +0200)]
Backed out changeset bea3862b6bde in favor of a different approach

8 years agoMUC: Remove half of monkeypatch that was supposed to make admins always be room owner...
Kim Alvefur [Tue, 16 Jun 2015 13:13:47 +0000 (15:13 +0200)]
MUC: Remove half of monkeypatch that was supposed to make admins always be room owners, fixes #458

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 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 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 agoutil.datamanager: Fix traceback due to %s in log message
Kim Alvefur [Fri, 3 Apr 2015 10:10:30 +0000 (12:10 +0200)]
util.datamanager: Fix traceback due to %s in log message

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 agoTagging 0.9.8
Matthew Wild [Tue, 24 Mar 2015 19:12:04 +0000 (19:12 +0000)]
Tagging 0.9.8

9 years agomod_s2s: to/from attributes are required on s2s stream headers. Set them to '' when...
Matthew Wild [Tue, 24 Mar 2015 16:03:37 +0000 (16:03 +0000)]
mod_s2s: to/from attributes are required on s2s stream headers. Set them to '' when not available. Fixes #468.

9 years agosessionmanager: Return 'not-allowed' error instead of the non-existent 'already-bound...
Matthew Wild [Tue, 24 Mar 2015 15:57:46 +0000 (15:57 +0000)]
sessionmanager: Return 'not-allowed' error instead of the non-existent 'already-bound' error when client tries to bind a resource twice on the same stream (thanks Flow) fixes issue #484.

9 years agomod_http: Return a static string from module:http_url() when no ports are enabled...
Kim Alvefur [Mon, 23 Mar 2015 17:45:02 +0000 (18:45 +0100)]
mod_http: Return a static string from module:http_url() when no ports are enabled and log a warning

9 years agomod_http: Log a debug message when adding new http apps and warn if no http ports...
Kim Alvefur [Mon, 23 Mar 2015 17:44:12 +0000 (18:44 +0100)]
mod_http: Log a debug message when adding new http apps and warn if no http ports are enabled

9 years agoBackout 7726b627c3ea
Kim Alvefur [Mon, 23 Mar 2015 17:40:12 +0000 (18:40 +0100)]
Backout 7726b627c3ea

9 years agoutf8_sequences.txt: Oops
Matthew Wild [Mon, 23 Mar 2015 17:23:11 +0000 (17:23 +0000)]
utf8_sequences.txt: Oops

9 years agotests: Add UTF-8 validity tests
Matthew Wild [Mon, 23 Mar 2015 17:16:54 +0000 (17:16 +0000)]
tests: Add UTF-8 validity tests

9 years agoMerge with Zash
Matthew Wild [Mon, 23 Mar 2015 14:05:55 +0000 (14:05 +0000)]
Merge with Zash

9 years agoutil.encodings: Expose UTF-8 validation and length checking functions
Kim Alvefur [Mon, 23 Mar 2015 13:27:30 +0000 (14:27 +0100)]
util.encodings: Expose UTF-8 validation and length checking functions

9 years agoutil.encodings: Perform validation of UTF-8 strings before passing to libidn (Based...
Kim Alvefur [Mon, 23 Mar 2015 13:26:34 +0000 (14:26 +0100)]
util.encodings: Perform validation of UTF-8 strings before passing to libidn (Based on code from the utf8 library in Lua 5.3)

9 years agomod_http: Log event name when adding a HTTP app's hooks
Matthew Wild [Sat, 14 Mar 2015 22:39:23 +0000 (22:39 +0000)]
mod_http: Log event name when adding a HTTP app's hooks

9 years agonet.http.server: Log event name when firing a request event
Matthew Wild [Sat, 14 Mar 2015 22:39:03 +0000 (22:39 +0000)]
net.http.server: Log event name when firing a request event

9 years agoconfigure: Fix for commit cd0088c73daf - update LIBDIR if --prefix is set and --libdi...
Matthew Wild [Tue, 24 Feb 2015 15:19:20 +0000 (15:19 +0000)]
configure: Fix for commit cd0088c73daf - update LIBDIR if --prefix is set and --libdir isn't (thanks Medics)

9 years agomod_admin_telnet: Require util.pposix (fixes #471)
Matthew Wild [Fri, 20 Feb 2015 22:53:12 +0000 (22:53 +0000)]
mod_admin_telnet: Require util.pposix (fixes #471)

9 years agoutil.datamanager: Check that the global 'prosody' exists before using it (fixes nil...
Kim Alvefur [Fri, 20 Feb 2015 18:00:01 +0000 (19:00 +0100)]
util.datamanager: Check that the global 'prosody' exists before using it (fixes nil indexing in use outside of prosody)

9 years agoconfigure, Makefile: Add --libdir option to ./configure, allowing you to override...
Matthew Wild [Fri, 20 Feb 2015 15:51:05 +0000 (15:51 +0000)]
configure, Makefile: Add --libdir option to ./configure, allowing you to override the $PREFIX/lib/ default. Fixes #470.

9 years agostanza_router: Fix routing of 'error' IQs with multiple childs (thanks Pawel)
Kim Alvefur [Tue, 6 Jan 2015 16:39:47 +0000 (17:39 +0100)]
stanza_router: Fix routing of 'error' IQs with multiple childs (thanks Pawel)

9 years agonet.http.parser: Fix whitespace/indentation
Matthew Wild [Tue, 18 Nov 2014 17:40:37 +0000 (17:40 +0000)]
net.http.parser: Fix whitespace/indentation

9 years agonet.http.parser: Fix chunked encoding parsing across packet boundaries.
daurnimator [Mon, 10 Nov 2014 19:47:33 +0000 (14:47 -0500)]
net.http.parser: Fix chunked encoding parsing across packet boundaries.