aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-18 15:29:31 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-18 15:29:31 +0100
commit836063da851d74d969505547bfe193bf2824b786 (patch)
treefda21a54555298a2369737f472bf288fcff6dce9
parent5cea0b157002bff872b559c59aa77b30ec2634df (diff)
parent2794871c57db8605a99583de29df2168181715c2 (diff)
downloadprosody-836063da851d74d969505547bfe193bf2824b786.tar.gz
prosody-836063da851d74d969505547bfe193bf2824b786.zip
Merge
-rw-r--r--plugins/mod_admin_telnet.lua16
-rw-r--r--util/ip.lua7
2 files changed, 18 insertions, 5 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 2056f1e2..1fd20543 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -700,9 +700,9 @@ function def_env.s2s:showcert(domain)
error("This version of LuaSec does not support certificate viewing");
end
else
- local certs = conn:getpeerchain();
- local cert = certs[1];
+ local cert = conn:getpeercertificate();
if cert then
+ local certs = conn:getpeerchain();
local digest = cert:digest("sha1");
if not cert_set[digest] then
local chain_valid, chain_errors = conn:getpeerverification();
@@ -957,7 +957,9 @@ local um = require"core.usermanager";
def_env.user = {};
function def_env.user:create(jid, password)
local username, host = jid_split(jid);
- if um.user_exists(username, host) then
+ if not hosts[host] then
+ return nil, "No such host: "..host;
+ elseif um.user_exists(username, host) then
return nil, "User exists";
end
local ok, err = um.create_user(username, password, host);
@@ -970,7 +972,9 @@ end
function def_env.user:delete(jid)
local username, host = jid_split(jid);
- if not um.user_exists(username, host) then
+ if not hosts[host] then
+ return nil, "No such host: "..host;
+ elseif um.user_exists(username, host) then
return nil, "No such user";
end
local ok, err = um.delete_user(username, host);
@@ -983,7 +987,9 @@ end
function def_env.user:password(jid, password)
local username, host = jid_split(jid);
- if not um.user_exists(username, host) then
+ if not hosts[host] then
+ return nil, "No such host: "..host;
+ elseif um.user_exists(username, host) then
return nil, "No such user";
end
local ok, err = um.set_password(username, password, host);
diff --git a/util/ip.lua b/util/ip.lua
index 6ebc023b..20ea3dd7 100644
--- a/util/ip.lua
+++ b/util/ip.lua
@@ -23,6 +23,13 @@ local function new_ip(ipStr, proto)
elseif proto ~= "IPv4" and proto ~= "IPv6" then
return nil, "invalid protocol";
end
+ if proto == "IPv6" and ipStr:find('.', 1, true) then
+ local changed;
+ ipStr, changed = ipStr:gsub(":(%d+)%.(%d+)%.(%d+)%.(%d+)$", function(a,b,c,d)
+ return (":%04X:%04X"):format(a*256+b,c*256+d);
+ end);
+ if changed ~= 1 then return nil, "invalid-address"; end
+ end
return setmetatable({ addr = ipStr, proto = proto }, ip_mt);
end