aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2017-07-28 23:47:38 +0100
committerMatthew Wild <mwild1@gmail.com>2017-07-28 23:47:38 +0100
commite9d37d780b2e50e4f3ed34d3c355d651c0375cb2 (patch)
tree3d0d78194ab5828d67c07bac2f07209054155de9
parenta65cd04e353b849f6a3cda6ca746378dd309ee28 (diff)
parent15ee257b357d532f7c8dc1de83b0379b57203268 (diff)
downloadprosody-e9d37d780b2e50e4f3ed34d3c355d651c0375cb2.tar.gz
prosody-e9d37d780b2e50e4f3ed34d3c355d651c0375cb2.zip
Merge 0.10 -> trunk
-rw-r--r--core/sessionmanager.lua4
-rw-r--r--plugins/mod_bosh.lua2
-rw-r--r--plugins/mod_register.lua2
3 files changed, 6 insertions, 2 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 9ec05539..e9771c58 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -188,10 +188,14 @@ local function bind_resource(session, resource)
local err;
session.roster, err = rm_load_roster(session.username, session.host);
if err then
+ -- FIXME: Why is all this rollback down here, instead of just doing the roster test up above?
full_sessions[session.full_jid] = nil;
hosts[session.host].sessions[session.username].sessions[resource] = nil;
session.full_jid = nil;
session.resource = nil;
+ if session.type == "c2s" then
+ session.type = "c2s_unbound";
+ end
if next(bare_sessions[session.username..'@'..session.host].sessions) == nil then
bare_sessions[session.username..'@'..session.host] = nil;
hosts[session.host].sessions[session.username] = nil;
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index c2809143..cc591be7 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -49,7 +49,7 @@ local cross_domain = module:get_option("cross_domain_bosh", false);
if cross_domain == true then cross_domain = "*"; end
if type(cross_domain) == "table" then cross_domain = table.concat(cross_domain, ", "); end
-local trusted_proxies = module:get_option_set("trusted_proxies", {"127.0.0.1"})._items;
+local trusted_proxies = module:get_option_set("trusted_proxies", { "127.0.0.1", "::1" })._items;
local function get_ip_from_request(request)
local ip = request.conn:ip();
diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index e999428d..fd5339d9 100644
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -182,7 +182,7 @@ end
local min_seconds_between_registrations = module:get_option_number("min_seconds_between_registrations");
local whitelist_only = module:get_option_boolean("whitelist_registration_only");
-local whitelisted_ips = module:get_option_set("registration_whitelist", { "127.0.0.1" })._items;
+local whitelisted_ips = module:get_option_set("registration_whitelist", { "127.0.0.1", "::1" })._items;
local blacklisted_ips = module:get_option_set("registration_blacklist", {})._items;
local throttle_max = module:get_option_number("registration_throttle_max", min_seconds_between_registrations and 1);