Matthew Wild [Sat, 18 May 2013 16:17:56 +0000 (17:17 +0100)]
tests/test_core_configmanager.lua: Update to remove tests based on sections (now removed)
Matthew Wild [Sat, 18 May 2013 16:14:30 +0000 (17:14 +0100)]
tests: Some much-needed cleanup...
Matthew Wild [Sat, 18 May 2013 15:45:29 +0000 (16:45 +0100)]
util.ip: Add CIDR notation parsing and matching
Matthew Wild [Sat, 18 May 2013 14:29:31 +0000 (15:29 +0100)]
Merge
Matthew Wild [Sat, 18 May 2013 14:29:10 +0000 (15:29 +0100)]
mod_muc: Pass actor (requesting JID) when generating the config form, and to the muc-config-form event handler
Matthew Wild [Sat, 18 May 2013 14:28:00 +0000 (15:28 +0100)]
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Kim Alvefur [Sat, 18 May 2013 11:20:46 +0000 (13:20 +0200)]
Merge 0.9->trunk
Matthew Wild [Sat, 18 May 2013 11:03:03 +0000 (12:03 +0100)]
Merge 0.9->trunk
Kim Alvefur [Fri, 17 May 2013 16:28:05 +0000 (18:28 +0200)]
mod_admin_telnet: Use stanza:get_child_text()
Matthew Wild [Fri, 17 May 2013 13:56:36 +0000 (14:56 +0100)]
prosodyctl: check dns: Use socket.local_addresses() if available
Matthew Wild [Fri, 17 May 2013 13:56:18 +0000 (14:56 +0100)]
prosodyctl: check dns: Whitespace fix in output
Matthew Wild [Fri, 17 May 2013 13:55:57 +0000 (14:55 +0100)]
prosodyctl: check dns: More concise output (merged separate v4/v6 warnings)
Matthew Wild [Fri, 17 May 2013 13:55:05 +0000 (14:55 +0100)]
prosodyctl: check dns: Correctly mark host as failed if expected SRV records are not found
Matthew Wild [Fri, 17 May 2013 13:53:51 +0000 (14:53 +0100)]
util.ip: Add 'private' method/property to determine whether an IP address is generally expected to be internet-routeable (YMMV)
Matthew Wild [Fri, 17 May 2013 13:52:52 +0000 (14:52 +0100)]
util.ip: Automatically determine protocol of IP address if none specified. Return error if invalid.
Kim Alvefur [Fri, 17 May 2013 12:56:06 +0000 (14:56 +0200)]
mod_admin_telnet: List session flags (encryption, compression etc) the same way for c2s as s2s
Matthew Wild [Fri, 17 May 2013 12:35:12 +0000 (13:35 +0100)]
prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the server's DNS records
Matthew Wild [Fri, 17 May 2013 08:01:11 +0000 (09:01 +0100)]
prosodyctl: Add 'check' command, which currently checks the config file for some common mistakes
Matthew Wild [Fri, 17 May 2013 07:42:21 +0000 (08:42 +0100)]
util.iterators: Small fix for variable scoping issue
Matthew Wild [Fri, 17 May 2013 07:31:03 +0000 (08:31 +0100)]
util.iterators: Add filter() to run results through a filter function
Matthew Wild [Fri, 17 May 2013 07:30:28 +0000 (08:30 +0100)]
util.iterators: Various fixes and improvements, primarily use pack() where it should be used.
Matthew Wild [Thu, 16 May 2013 13:17:25 +0000 (14:17 +0100)]
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild [Thu, 16 May 2013 09:47:22 +0000 (10:47 +0100)]
mod_admin_telnet: Add server:memory() command to view details of Prosody's memory usage
Matthew Wild [Fri, 7 Jun 2013 16:47:49 +0000 (17:47 +0100)]
mod_bosh: Remove Connection: keep-alive header (conflicts with new net.http.server)
Matthew Wild [Fri, 7 Jun 2013 16:47:27 +0000 (17:47 +0100)]
mod_bosh: Fix global write
Matthew Wild [Thu, 16 May 2013 09:47:22 +0000 (10:47 +0100)]
mod_admin_telnet: Add server:memory() command to view details of Prosody's memory usage
Matthew Wild [Tue, 14 May 2013 08:39:32 +0000 (09:39 +0100)]
Merge 0.9->trunk
Matthew Wild [Tue, 14 May 2013 08:38:54 +0000 (09:38 +0100)]
mod_muc: Fire muc-room-created and muc-room-destroyed events (thanks nik)
Waqas Hussain [Mon, 13 May 2013 19:52:01 +0000 (15:52 -0400)]
util.hashes: inttypes.h not available with MS Windows SDK, use MS specific __int32 instead.
Matthew Wild [Sat, 11 May 2013 12:55:36 +0000 (13:55 +0100)]
Merge merge merge merge
Matthew Wild [Sat, 11 May 2013 12:55:14 +0000 (13:55 +0100)]
Merge 0.9->trunk
Matthew Wild [Sat, 11 May 2013 12:54:02 +0000 (13:54 +0100)]
prosody.cfg.lua.dist: Fix my s2s_secure(_auth) mess
Kim Alvefur [Fri, 10 May 2013 20:31:20 +0000 (22:31 +0200)]
Merge 0.9->trunk
Kim Alvefur [Fri, 10 May 2013 20:29:03 +0000 (22:29 +0200)]
mod_c2s: Fix session:close() when a stanza is passed as reason
Matthew Wild [Fri, 10 May 2013 09:48:07 +0000 (10:48 +0100)]
Merge 0.9->trunk
Matthew Wild [Fri, 10 May 2013 09:46:27 +0000 (10:46 +0100)]
Merge 0.9->trunk
Kim Alvefur [Thu, 9 May 2013 09:13:18 +0000 (11:13 +0200)]
mod_pubsub: Remove nodeid check added in
989acb4ad1de that wasn't needed
Kim Alvefur [Tue, 7 May 2013 15:17:32 +0000 (17:17 +0200)]
mod_admin_telnet: Add some DNS commands.
Kim Alvefur [Tue, 7 May 2013 14:51:25 +0000 (16:51 +0200)]
net.dns: Add nicer API to cached records
Waqas Hussain [Tue, 7 May 2013 14:42:44 +0000 (10:42 -0400)]
util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input.
Waqas Hussain [Tue, 7 May 2013 14:41:03 +0000 (10:41 -0400)]
util.array: Wrap tostring() output in {} (otherwise empty arrays print as "").
Waqas Hussain [Mon, 6 May 2013 23:43:59 +0000 (19:43 -0400)]
util.json: Make setmetatable local.
Waqas Hussain [Mon, 6 May 2013 23:42:54 +0000 (19:42 -0400)]
util.json: Fix variable name typo which broke util.json when util.array was missing.
Waqas Hussain [Sun, 5 May 2013 19:02:33 +0000 (15:02 -0400)]
util.json: Optimize long string parsing.
Matthew Wild [Wed, 1 May 2013 12:57:11 +0000 (13:57 +0100)]
Merge tls branch
Matthew Wild [Wed, 1 May 2013 12:57:00 +0000 (13:57 +0100)]
Merge s2s branch
Matthew Wild [Wed, 1 May 2013 12:56:42 +0000 (13:56 +0100)]
Merge sasl branch
Matthew Wild [Wed, 1 May 2013 12:54:44 +0000 (13:54 +0100)]
Close 'tls' branch
Matthew Wild [Wed, 1 May 2013 12:54:31 +0000 (13:54 +0100)]
Close 'sasl' branch
Matthew Wild [Wed, 1 May 2013 12:54:00 +0000 (13:54 +0100)]
Close 's2s' branch
Matthew Wild [Wed, 1 May 2013 12:45:42 +0000 (13:45 +0100)]
Merge 0.9->trunk
Matthew Wild [Wed, 1 May 2013 12:45:05 +0000 (13:45 +0100)]
Merge with Florob
Florian Zeitz [Tue, 30 Apr 2013 16:34:03 +0000 (18:34 +0200)]
util.rfc{3484,6724}: Update to RFC 6724
Kim Alvefur [Mon, 29 Apr 2013 17:40:39 +0000 (19:40 +0200)]
portmanager: Also include the interface the service is listening on
Waqas Hussain [Mon, 29 Apr 2013 17:03:17 +0000 (22:03 +0500)]
portmanager: Include port numbers the service is listening on in the info logs.
Waqas Hussain [Mon, 29 Apr 2013 15:26:48 +0000 (20:26 +0500)]
net.server_select: Don't limit max file descriptor number on Windows.
Kim Alvefur [Mon, 29 Apr 2013 12:01:19 +0000 (14:01 +0200)]
prosodyctl: Guess the country from the TLD for the cert config
Kim Alvefur [Mon, 29 Apr 2013 12:00:44 +0000 (14:00 +0200)]
prosodyctl: Ask about the distinguished name in a in a consistent order
Kim Alvefur [Mon, 29 Apr 2013 11:59:39 +0000 (13:59 +0200)]
prosodyctl: Add message describing the distinguished name input expected
Kim Alvefur [Mon, 29 Apr 2013 11:30:59 +0000 (13:30 +0200)]
util.openssl: Write the distinguished_name part of the config in a consistent order
Matthew Wild [Mon, 29 Apr 2013 10:27:17 +0000 (11:27 +0100)]
Merge 0.9->trunk
Matthew Wild [Mon, 29 Apr 2013 10:25:12 +0000 (11:25 +0100)]
MUC: Allow actor == true to set roles (like affiliations)
Matthew Wild [Mon, 29 Apr 2013 10:21:37 +0000 (11:21 +0100)]
MUC: Allow plugins to add and handle options in the MUC config form
Matthew Wild [Mon, 29 Apr 2013 09:54:25 +0000 (10:54 +0100)]
Merge 0.9->trunk
Matthew Wild [Mon, 29 Apr 2013 09:52:23 +0000 (10:52 +0100)]
Merge with Florob
Matthew Wild [Mon, 29 Apr 2013 09:44:18 +0000 (10:44 +0100)]
Merge 0.9->trunk
Matthew Wild [Mon, 29 Apr 2013 09:43:44 +0000 (10:43 +0100)]
mod_saslauth, mod_compression: Fix some cases where open_stream() was not being passed to/from (see
df3c78221f26 and issue #338)
Matthew Wild [Sun, 28 Apr 2013 23:36:04 +0000 (00:36 +0100)]
Merge 0.9->trunk
Matthew Wild [Sun, 28 Apr 2013 23:33:39 +0000 (00:33 +0100)]
mod_s2s: Ensure that to/from on stream headers are always correct, fixes #338
Kim Alvefur [Sun, 28 Apr 2013 14:22:01 +0000 (16:22 +0200)]
prosodyctl: Put keys and certificates in ./certs when in a source checkout
Florian Zeitz [Sun, 28 Apr 2013 00:28:42 +0000 (02:28 +0200)]
util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Kim Alvefur [Sat, 27 Apr 2013 20:46:01 +0000 (22:46 +0200)]
net.server*: Allow the TCP backlog parameter to be set in the config
Kim Alvefur [Sat, 27 Apr 2013 17:44:37 +0000 (19:44 +0200)]
moduleapi: in module:provides(), add the name of the module in item._provided_by
Kim Alvefur [Sat, 27 Apr 2013 17:14:22 +0000 (19:14 +0200)]
moduleapi: module:provides called without an item makes a copy of the environment instead. Fixes warnings about non-existent globals
Matthew Wild [Sat, 27 Apr 2013 17:03:19 +0000 (18:03 +0100)]
Merge 0.9->trunk
Florian Zeitz [Sat, 27 Apr 2013 15:01:31 +0000 (17:01 +0200)]
util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Matthew Wild [Sat, 27 Apr 2013 13:59:00 +0000 (14:59 +0100)]
moduleapi: Add module:get_option_inherited_set() to return a set that inherits items from a globally set set, if set
Matthew Wild [Sat, 27 Apr 2013 13:57:24 +0000 (14:57 +0100)]
moduleapi: Add module:context(host) to produce a fake API context for a given host (or global). module:context("*"):get_option("foo") to get global options.
Matthew Wild [Sat, 27 Apr 2013 12:11:27 +0000 (13:11 +0100)]
Merge 0.9->trunk
Matthew Wild [Sat, 27 Apr 2013 12:11:03 +0000 (13:11 +0100)]
util.prosodyctl: Initialize storagemanager on the host before initializing usermanager. This fixes brokenness when the auth provider opens the store on load (as they all do since
eeea0eb2602a) (thanks nulani)
Matthew Wild [Fri, 26 Apr 2013 11:25:53 +0000 (12:25 +0100)]
Merge 0.9->trunk
Matthew Wild [Fri, 26 Apr 2013 11:25:25 +0000 (12:25 +0100)]
mod_s2s: Obey tcp_keepalives option for s2s too, and make it individually configurable through s2s_tcp_keepalives (thanks yeled)
Matthew Wild [Thu, 25 Apr 2013 19:37:51 +0000 (20:37 +0100)]
Merge 0.9->trunk
Matthew Wild [Thu, 25 Apr 2013 19:37:20 +0000 (20:37 +0100)]
mod_admin_telnet: Add muc:create(room) (thanks SkyBlue)
Matthew Wild [Thu, 25 Apr 2013 19:36:55 +0000 (20:36 +0100)]
MUC: add __tostring on room metatable
Kim Alvefur [Thu, 25 Apr 2013 15:50:22 +0000 (17:50 +0200)]
mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once
Waqas Hussain [Tue, 23 Apr 2013 19:55:49 +0000 (15:55 -0400)]
util.json: New, improved, fixed codepoint to UTF-8 conversion.
Waqas Hussain [Tue, 23 Apr 2013 18:41:52 +0000 (14:41 -0400)]
util.json: Make encode(decode("[]"))=="[]".
Matthew Wild [Tue, 23 Apr 2013 14:38:38 +0000 (15:38 +0100)]
Merge 0.9->trunk
Matthew Wild [Tue, 23 Apr 2013 14:15:52 +0000 (15:15 +0100)]
Merges all the way down
Matthew Wild [Tue, 23 Apr 2013 14:14:47 +0000 (15:14 +0100)]
Merge 0.9->trunk
Matthew Wild [Tue, 23 Apr 2013 14:14:22 +0000 (15:14 +0100)]
Merge
Matthew Wild [Tue, 23 Apr 2013 14:13:51 +0000 (15:13 +0100)]
mod_auth_internal_plain: Don't log passwords, even at debug level
Florian Zeitz [Tue, 23 Apr 2013 12:49:48 +0000 (14:49 +0200)]
mod_admin_adhoc: Use util.adhoc
Florian Zeitz [Tue, 23 Apr 2013 12:49:31 +0000 (14:49 +0200)]
util.adhoc: New util for generating common adhoc handler patterns
Matthew Wild [Mon, 22 Apr 2013 11:35:52 +0000 (12:35 +0100)]
mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit traceback function), to make it clearer where an error occured
Matthew Wild [Mon, 22 Apr 2013 11:35:52 +0000 (12:35 +0100)]
mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit traceback function), to make it clearer where an error occured
Matthew Wild [Mon, 22 Apr 2013 11:25:00 +0000 (12:25 +0100)]
net.server.http: Add a comment
Matthew Wild [Mon, 22 Apr 2013 11:25:00 +0000 (12:25 +0100)]
net.server.http: Add a comment
Matthew Wild [Mon, 22 Apr 2013 11:24:42 +0000 (12:24 +0100)]
net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries)