diff options
-rwxr-xr-x | tools/ejabberd2prosody.lua | 260 | ||||
-rw-r--r-- | tools/erlparse.lua | 260 |
2 files changed, 260 insertions, 260 deletions
diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index 14a4d1d7..4fef3f3a 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -8,44 +8,44 @@ -- -
-require "erlparse";
-
-package.path = package.path ..";../?.lua";
+ +require "erlparse"; + +package.path = package.path ..";../?.lua"; local serialize = require "util.serialization".serialize; -local st = require "util.stanza";
-package.loaded["util.logger"] = {init = function() return function() end; end}
-local dm = require "util.datamanager"
-dm.set_data_path("data");
-
-function build_stanza(tuple, stanza)
- if tuple[1] == "xmlelement" then
- local name = tuple[2];
- local attr = {};
- for _, a in ipairs(tuple[3]) do attr[a[1]] = a[2]; end
- local up;
- if stanza then stanza:tag(name, attr); up = true; else stanza = st.stanza(name, attr); end
- for _, a in ipairs(tuple[4]) do build_stanza(a, stanza); end
- if up then stanza:up(); else return stanza end
- elseif tuple[1] == "xmlcdata" then
- stanza:text(tuple[2]);
- else
- error("unknown element type: "..serialize(tuple));
- end
-end
-function build_time(tuple)
- local Megaseconds,Seconds,Microseconds = unpack(tuple);
- return Megaseconds * 1000000 + Seconds;
-end
-
-function vcard(node, host, stanza)
- local ret, err = dm.store(node, host, "vcard", st.preserialize(stanza));
- print("["..(err or "success").."] vCard: "..node.."@"..host);
-end
-function password(node, host, password)
- local ret, err = dm.store(node, host, "accounts", {password = password});
- print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password);
-end
+local st = require "util.stanza"; +package.loaded["util.logger"] = {init = function() return function() end; end} +local dm = require "util.datamanager" +dm.set_data_path("data"); + +function build_stanza(tuple, stanza) + if tuple[1] == "xmlelement" then + local name = tuple[2]; + local attr = {}; + for _, a in ipairs(tuple[3]) do attr[a[1]] = a[2]; end + local up; + if stanza then stanza:tag(name, attr); up = true; else stanza = st.stanza(name, attr); end + for _, a in ipairs(tuple[4]) do build_stanza(a, stanza); end + if up then stanza:up(); else return stanza end + elseif tuple[1] == "xmlcdata" then + stanza:text(tuple[2]); + else + error("unknown element type: "..serialize(tuple)); + end +end +function build_time(tuple) + local Megaseconds,Seconds,Microseconds = unpack(tuple); + return Megaseconds * 1000000 + Seconds; +end + +function vcard(node, host, stanza) + local ret, err = dm.store(node, host, "vcard", st.preserialize(stanza)); + print("["..(err or "success").."] vCard: "..node.."@"..host); +end +function password(node, host, password) + local ret, err = dm.store(node, host, "accounts", {password = password}); + print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password); +end function roster(node, host, jid, item) local roster = dm.load(node, host, "roster") or {}; roster[jid] = item; @@ -59,99 +59,99 @@ function roster_pending(node, host, jid) local ret, err = dm.store(node, host, "roster", roster); print("["..(err or "success").."] roster: " ..node.."@"..host.." - "..jid); end -function private_storage(node, host, xmlns, stanza)
- local private = dm.load(node, host, "private") or {};
- private[stanza.name..":"..xmlns] = st.preserialize(stanza);
- local ret, err = dm.store(node, host, "private", private);
- print("["..(err or "success").."] private: " ..node.."@"..host.." - "..xmlns);
-end
-function offline_msg(node, host, t, stanza)
- stanza.attr.stamp = os.date("!%Y-%m-%dT%H:%M:%SZ", t);
- stanza.attr.stamp_legacy = os.date("!%Y%m%dT%H:%M:%S", t);
- local ret, err = dm.list_append(node, host, "offline", st.preserialize(stanza));
- print("["..(err or "success").."] offline: " ..node.."@"..host.." - "..os.date("!%Y-%m-%dT%H:%M:%SZ", t));
-end
-
-
-local filters = {
- passwd = function(tuple)
- password(tuple[2][1], tuple[2][2], tuple[3]);
- end;
- vcard = function(tuple)
- vcard(tuple[2][1], tuple[2][2], build_stanza(tuple[3]));
- end;
- roster = function(tuple)
- local node = tuple[3][1]; local host = tuple[3][2];
- local contact = (type(tuple[4][1]) == "table") and tuple[4][2] or tuple[4][1].."@"..tuple[4][2];
- local name = tuple[5]; local subscription = tuple[6];
- local ask = tuple[7]; local groups = tuple[8];
- if type(name) ~= type("") then name = nil; end
+function private_storage(node, host, xmlns, stanza) + local private = dm.load(node, host, "private") or {}; + private[stanza.name..":"..xmlns] = st.preserialize(stanza); + local ret, err = dm.store(node, host, "private", private); + print("["..(err or "success").."] private: " ..node.."@"..host.." - "..xmlns); +end +function offline_msg(node, host, t, stanza) + stanza.attr.stamp = os.date("!%Y-%m-%dT%H:%M:%SZ", t); + stanza.attr.stamp_legacy = os.date("!%Y%m%dT%H:%M:%S", t); + local ret, err = dm.list_append(node, host, "offline", st.preserialize(stanza)); + print("["..(err or "success").."] offline: " ..node.."@"..host.." - "..os.date("!%Y-%m-%dT%H:%M:%SZ", t)); +end + + +local filters = { + passwd = function(tuple) + password(tuple[2][1], tuple[2][2], tuple[3]); + end; + vcard = function(tuple) + vcard(tuple[2][1], tuple[2][2], build_stanza(tuple[3])); + end; + roster = function(tuple) + local node = tuple[3][1]; local host = tuple[3][2]; + local contact = (type(tuple[4][1]) == "table") and tuple[4][2] or tuple[4][1].."@"..tuple[4][2]; + local name = tuple[5]; local subscription = tuple[6]; + local ask = tuple[7]; local groups = tuple[8]; + if type(name) ~= type("") then name = nil; end if ask == "none" then ask = nil; elseif ask == "out" then ask = "subscribe" elseif ask == "in" then roster_pending(node, host, contact); return; - else error(ask) end
- if subscription ~= "both" and subscription ~= "from" and subscription ~= "to" and subscription ~= "none" then error(subscription) end
- local item = {name = name, ask = ask, subscription = subscription, groups = {}};
- for _, g in ipairs(groups) do item.groups[g] = true; end
- roster(node, host, contact, item);
- end;
- private_storage = function(tuple)
- private_storage(tuple[2][1], tuple[2][2], tuple[2][3], build_stanza(tuple[3]));
- end;
- offline_msg = function(tuple)
- offline_msg(tuple[2][1], tuple[2][2], build_time(tuple[3]), build_stanza(tuple[7]));
- end;
- config = function(tuple)
- if tuple[2] == "hosts" then
- local output = io.output(); io.output("prosody.cfg.lua");
- io.write("-- Configuration imported from ejabberd --\n");
- io.write([[Host "*"
- modules_enabled = {
- "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
- "legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
- "roster"; -- Allow users to have a roster. Recommended ;)
- "register"; -- Allow users to register on this server using a client
- "tls"; -- Add support for secure TLS on c2s/s2s connections
- "vcard"; -- Allow users to set vCards
- "private"; -- Private XML storage (for room bookmarks, etc.)
- "version"; -- Replies to server version requests
- "dialback"; -- s2s dialback support
- "uptime";
- "disco";
- "time";
- "ping";
- --"selftests";
- };
-]]);
- for _, h in ipairs(tuple[3]) do
- io.write("Host \"" .. h .. "\"\n");
- end
- io.output(output);
- print("prosody.cfg.lua created");
- end
- end;
-};
-
-local arg = ...;
-local help = "/? -? ? /h -h /help -help --help";
-if not arg or help:find(arg, 1, true) then
- print([[ejabberd db dump importer for Prosody
-
- Usage: ejabberd2prosody.lua filename.txt
-
-The file can be generated from ejabberd using:
- sudo ./bin/ejabberdctl dump filename.txt
-
-Note: The path of ejabberdctl depends on your ejabberd installation, and ejabberd needs to be running for ejabberdctl to work.]]);
- os.exit(1);
-end
-local count = 0;
-local t = {};
-for item in erlparse.parseFile(arg) do
- count = count + 1;
- local name = item[1];
- t[name] = (t[name] or 0) + 1;
- --print(count, serialize(item));
- if filters[name] then filters[name](item); end
-end
---print(serialize(t));
+ else error(ask) end + if subscription ~= "both" and subscription ~= "from" and subscription ~= "to" and subscription ~= "none" then error(subscription) end + local item = {name = name, ask = ask, subscription = subscription, groups = {}}; + for _, g in ipairs(groups) do item.groups[g] = true; end + roster(node, host, contact, item); + end; + private_storage = function(tuple) + private_storage(tuple[2][1], tuple[2][2], tuple[2][3], build_stanza(tuple[3])); + end; + offline_msg = function(tuple) + offline_msg(tuple[2][1], tuple[2][2], build_time(tuple[3]), build_stanza(tuple[7])); + end; + config = function(tuple) + if tuple[2] == "hosts" then + local output = io.output(); io.output("prosody.cfg.lua"); + io.write("-- Configuration imported from ejabberd --\n"); + io.write([[Host "*" + modules_enabled = { + "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in. + "legacyauth"; -- Legacy authentication. Only used by some old clients and bots. + "roster"; -- Allow users to have a roster. Recommended ;) + "register"; -- Allow users to register on this server using a client + "tls"; -- Add support for secure TLS on c2s/s2s connections + "vcard"; -- Allow users to set vCards + "private"; -- Private XML storage (for room bookmarks, etc.) + "version"; -- Replies to server version requests + "dialback"; -- s2s dialback support + "uptime"; + "disco"; + "time"; + "ping"; + --"selftests"; + }; +]]); + for _, h in ipairs(tuple[3]) do + io.write("Host \"" .. h .. "\"\n"); + end + io.output(output); + print("prosody.cfg.lua created"); + end + end; +}; + +local arg = ...; +local help = "/? -? ? /h -h /help -help --help"; +if not arg or help:find(arg, 1, true) then + print([[ejabberd db dump importer for Prosody + + Usage: ejabberd2prosody.lua filename.txt + +The file can be generated from ejabberd using: + sudo ./bin/ejabberdctl dump filename.txt + +Note: The path of ejabberdctl depends on your ejabberd installation, and ejabberd needs to be running for ejabberdctl to work.]]); + os.exit(1); +end +local count = 0; +local t = {}; +for item in erlparse.parseFile(arg) do + count = count + 1; + local name = item[1]; + t[name] = (t[name] or 0) + 1; + --print(count, serialize(item)); + if filters[name] then filters[name](item); end +end +--print(serialize(t)); diff --git a/tools/erlparse.lua b/tools/erlparse.lua index 2e14f415..0bd4b3b8 100644 --- a/tools/erlparse.lua +++ b/tools/erlparse.lua @@ -7,133 +7,133 @@ -- -
-local file = nil;
-local last = nil;
-local function read(expected)
- local ch;
- if last then
- ch = last; last = nil;
- else ch = file:read(1); end
- if expected and ch ~= expected then error("expected: "..expected.."; got: "..(ch or "nil")); end
- return ch;
-end
-local function pushback(ch)
- if last then error(); end
- last = ch;
-end
-local function peek()
- if not last then last = read(); end
- return last;
-end
-
-local _A, _a, _Z, _z, _0, _9, __, _space = string.byte("AaZz09_ ", 1, 8);
-local function isAlpha(ch)
- ch = string.byte(ch) or 0;
- return (ch >= _A and ch <= _Z) or (ch >= _a and ch <= _z);
-end
-local function isNumeric(ch)
- ch = string.byte(ch) or 0;
- return (ch >= _0 and ch <= _9);
-end
-local function isVar(ch)
- ch = string.byte(ch) or 0;
- return (ch >= _A and ch <= _Z) or (ch >= _a and ch <= _z) or (ch >= _0 and ch <= _9) or ch == __;
-end
-local function isSpace(ch)
- ch = string.byte(ch) or "x";
- return ch <= _space;
-end
-
-local function readString()
- read("\""); -- skip quote
- local slash = nil;
- local str = "";
- while true do
- local ch = read();
- if ch == "\"" and not slash then break; end
- str = str..ch;
- end
- str = str:gsub("\\.", {["\\b"]="\b", ["\\d"]="\d", ["\\e"]="\e", ["\\f"]="\f", ["\\n"]="\n", ["\\r"]="\r", ["\\s"]="\s", ["\\t"]="\t", ["\\v"]="\v", ["\\\""]="\"", ["\\'"]="'", ["\\\\"]="\\"});
- return str;
-end
-local function readSpecialString()
- read("<"); read("<"); -- read <<
- local str = "";
- if peek() == "\"" then
- str = readString();
- elseif peek() ~= ">" then
- error();
- end
- read(">"); read(">"); -- read >>
- return str;
-end
-local function readVar()
- local var = read();
- while isVar(peek()) do
- var = var..read();
- end
- return var;
-end
-local function readNumber()
- local num = read();
- while isNumeric(peek()) do
- num = num..read();
- end
- return tonumber(num);
-end
-local readItem = nil;
-local function readTuple()
- local t = {};
- read(); -- read { or [
- while true do
- local item = readItem();
- if not item then break; end
- table.insert(t, item);
- end
- read(); -- read } or ]
- return t;
-end
-readItem = function()
- local ch = peek();
- if ch == nil then return nil end
- if ch == "{" or ch == "[" then
- return readTuple();
- elseif isAlpha(ch) then
- return readVar();
- elseif isNumeric(ch) then
- return readNumber();
- elseif ch == "\"" then
- return readString();
- elseif ch == "<" then
- return readSpecialString();
- elseif isSpace(ch) or ch == "," or ch == "|" then
- read();
- return readItem();
- else
- --print("Unknown char: "..ch);
- return nil;
- end
-end
-local function readChunk()
- local x = readItem();
- if x then read("."); end
- return x;
-end
-local function readFile(filename)
- file = io.open(filename);
- if not file then error("File not found: "..filename); os.exit(0); end
- return function()
- local x = readChunk();
- if not x and peek() then error("Invalid char: "..peek()); end
- return x;
- end;
-end
-
-module "erlparse"
-
-function parseFile(file)
- return readFile(file);
-end
-
-return _M;
+ +local file = nil; +local last = nil; +local function read(expected) + local ch; + if last then + ch = last; last = nil; + else ch = file:read(1); end + if expected and ch ~= expected then error("expected: "..expected.."; got: "..(ch or "nil")); end + return ch; +end +local function pushback(ch) + if last then error(); end + last = ch; +end +local function peek() + if not last then last = read(); end + return last; +end + +local _A, _a, _Z, _z, _0, _9, __, _space = string.byte("AaZz09_ ", 1, 8); +local function isAlpha(ch) + ch = string.byte(ch) or 0; + return (ch >= _A and ch <= _Z) or (ch >= _a and ch <= _z); +end +local function isNumeric(ch) + ch = string.byte(ch) or 0; + return (ch >= _0 and ch <= _9); +end +local function isVar(ch) + ch = string.byte(ch) or 0; + return (ch >= _A and ch <= _Z) or (ch >= _a and ch <= _z) or (ch >= _0 and ch <= _9) or ch == __; +end +local function isSpace(ch) + ch = string.byte(ch) or "x"; + return ch <= _space; +end + +local function readString() + read("\""); -- skip quote + local slash = nil; + local str = ""; + while true do + local ch = read(); + if ch == "\"" and not slash then break; end + str = str..ch; + end + str = str:gsub("\\.", {["\\b"]="\b", ["\\d"]="\d", ["\\e"]="\e", ["\\f"]="\f", ["\\n"]="\n", ["\\r"]="\r", ["\\s"]="\s", ["\\t"]="\t", ["\\v"]="\v", ["\\\""]="\"", ["\\'"]="'", ["\\\\"]="\\"}); + return str; +end +local function readSpecialString() + read("<"); read("<"); -- read << + local str = ""; + if peek() == "\"" then + str = readString(); + elseif peek() ~= ">" then + error(); + end + read(">"); read(">"); -- read >> + return str; +end +local function readVar() + local var = read(); + while isVar(peek()) do + var = var..read(); + end + return var; +end +local function readNumber() + local num = read(); + while isNumeric(peek()) do + num = num..read(); + end + return tonumber(num); +end +local readItem = nil; +local function readTuple() + local t = {}; + read(); -- read { or [ + while true do + local item = readItem(); + if not item then break; end + table.insert(t, item); + end + read(); -- read } or ] + return t; +end +readItem = function() + local ch = peek(); + if ch == nil then return nil end + if ch == "{" or ch == "[" then + return readTuple(); + elseif isAlpha(ch) then + return readVar(); + elseif isNumeric(ch) then + return readNumber(); + elseif ch == "\"" then + return readString(); + elseif ch == "<" then + return readSpecialString(); + elseif isSpace(ch) or ch == "," or ch == "|" then + read(); + return readItem(); + else + --print("Unknown char: "..ch); + return nil; + end +end +local function readChunk() + local x = readItem(); + if x then read("."); end + return x; +end +local function readFile(filename) + file = io.open(filename); + if not file then error("File not found: "..filename); os.exit(0); end + return function() + local x = readChunk(); + if not x and peek() then error("Invalid char: "..peek()); end + return x; + end; +end + +module "erlparse" + +function parseFile(file) + return readFile(file); +end + +return _M; |