From 4dec20e4ff11b61be57a6cfbdb289327d9e1eb7d Mon Sep 17 00:00:00 2001 From: ubq323 Date: Tue, 25 Feb 2025 23:43:41 +0000 Subject: the Restructuring --- base64.lua | 38 ----------- channel.lua | 15 ----- config.lua | 45 ------------- discord/pylon.lua | 4 +- irc.lua | 96 ---------------------------- irc/pylon.lua | 96 ++++++++++++++++++++++++++++ irc/rirc.lua | 61 ++++++++++++++++++ main.lua | 10 +-- queue.lua | 39 ------------ rirc.lua | 61 ------------------ sha1.lua | 169 ------------------------------------------------ test.lua | 24 ------- util/channel.lua | 15 +++++ util/config.lua | 45 +++++++++++++ util/queue.lua | 39 ++++++++++++ wilson_ex.ini | 35 ---------- xml.lua | 173 -------------------------------------------------- xmpp.lua | 187 ------------------------------------------------------ xmpp/base64.lua | 38 +++++++++++ xmpp/pylon.lua | 187 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ xmpp/sha1.lua | 169 ++++++++++++++++++++++++++++++++++++++++++++++++ xmpp/xml.lua | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++ 22 files changed, 830 insertions(+), 889 deletions(-) delete mode 100644 base64.lua delete mode 100644 channel.lua delete mode 100644 config.lua delete mode 100644 irc.lua create mode 100644 irc/pylon.lua create mode 100644 irc/rirc.lua delete mode 100644 queue.lua delete mode 100644 rirc.lua delete mode 100644 sha1.lua delete mode 100644 test.lua create mode 100644 util/channel.lua create mode 100644 util/config.lua create mode 100644 util/queue.lua delete mode 100644 wilson_ex.ini delete mode 100644 xml.lua delete mode 100644 xmpp.lua create mode 100644 xmpp/base64.lua create mode 100644 xmpp/pylon.lua create mode 100644 xmpp/sha1.lua create mode 100644 xmpp/xml.lua diff --git a/base64.lua b/base64.lua deleted file mode 100644 index 4f9a967..0000000 --- a/base64.lua +++ /dev/null @@ -1,38 +0,0 @@ -local alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" - --- really bad -local function encode(s) - local x = 0 - local n = 0 - local out = {} - local outn = 1 - local pad = "" - local function si(v, m) x = (x << m) | v; n = n + m end - local function so(m) - local rem = n - m - local res = x >> rem - x = x & ((1 << rem) - 1) - n = n - m - return res - end - local function o() - while n >= 6 do - local i = so(6)+1 - out[outn] = alphabet:sub(i,i) - outn = outn + 1 - end - end - for i = 1, #s do - si(s:byte(i), 8) - o() - end - if n > 0 then - local on = n - si(0, 6-n) - o() - pad = ('='):rep(3-on/2) -- bad - end - return table.concat(out)..pad -end - -return {encode=encode} diff --git a/channel.lua b/channel.lua deleted file mode 100644 index e908069..0000000 --- a/channel.lua +++ /dev/null @@ -1,15 +0,0 @@ --- channel descriptor - -local Channel = {} -function Channel.make(pylon, descriptor) - return setmetatable({pylon=pylon, descriptor=descriptor}, Channel) -end -function Channel.__eq(self, other) - return self.pylon == other.pylon and self.descriptor == other.descriptor -end -function Channel.__call(_, ...) return Channel.make(...) end -function Channel.__tostring(self) - return self.pylon.name .. ':' .. self.descriptor -end -setmetatable(Channel, Channel) -return Channel diff --git a/config.lua b/config.lua deleted file mode 100644 index c19a087..0000000 --- a/config.lua +++ /dev/null @@ -1,45 +0,0 @@ -local function partial(f,x) return function(...) return f(x,...) end end - -local function kv_syntax(block,line) - local k,v = line:match"^([a-z0-9_-]+)%s*=%s*(.*)$" - assert(k,"syntax error in kv line: "..line) - k = k:gsub("-","_") - block[k]=v -end - -local function tuple_syntax(pattern) return function(block,line) - local matches = {line:match(pattern)} - assert(matches[1], "syntax error in tuple line: "..line) - table.insert(block, matches) -end end - -local schema = { - pylon = kv_syntax, - bus = tuple_syntax"^(%S+)%s+(%S+)$", -} - -local function parse_file(file) - local blocks = {} - for k in pairs(schema) do blocks[k] = {} end - local line_handler = function() error("line outside of block") end - - for line in file:lines() do - line = line:gsub(";.*$",""):gsub("^%s*",""):gsub("%s*$","") - if line == '' then goto next end - - local block_type, block_name = line:match"%[%s*(%S+)%s+(%S+)%s*%]" - if block_type then - local blocks_of_this_type = assert(blocks[block_type],"no such block type "..block_type) - local block = {} - blocks_of_this_type[block_name] = block - line_handler = partial(schema[block_type], block) - else - line_handler(line) - end - ::next:: - end - - return blocks -end - -return {parse=parse_file} diff --git a/discord/pylon.lua b/discord/pylon.lua index 0200208..705f31d 100644 --- a/discord/pylon.lua +++ b/discord/pylon.lua @@ -5,7 +5,7 @@ local json = require 'dkjson' local Discord = {} function Discord.make(wilson,conf) - local self = { + end @@ -37,4 +37,4 @@ local function connect() end end -connect() +-- connect() diff --git a/irc.lua b/irc.lua deleted file mode 100644 index a2fb7bf..0000000 --- a/irc.lua +++ /dev/null @@ -1,96 +0,0 @@ -local cqueues = require'cqueues' -local socket = require'cqueues.socket' -local pprint = require'pprint' -local rirc = require'rirc' -local Queue = require'queue' -local Channel = require'channel' - -local Irc = {} - -function Irc._send(self, args) - args.source = args.source or self.nodename - local sent = rirc.send(self.sock, args) - print('>', sent) -end - -function Irc.check_config(self, vars) - for x in vars:gmatch("%S+") do - assert(self[x], "missing conf field "..x) end end - -function Irc.make(wilson, conf) - local self = setmetatable(conf, {__index=Irc}) - - for k,v in pairs { - wilson = wilson, - inbox = Queue.make(), - } do self[k] = v end - - self:check_config "host port password nodename" - - return self -end - -function Irc._connect(self) - self.sock = assert(socket.connect(self.host, self.port)) - self:_send{'PASS', self.password, '0210-IRC', 'wilson|'} - self:_send{'SERVER', self.nodename, '1', 'i am wilson'} -end - -function Irc.run(self) - local cq = cqueues.new() - self:_connect() - cq:wrap(self.recving, self) - cq:wrap(self.sending, self) - print('irc',cq:loop()) -end - -function Irc.recving(self) - for line in self.sock:lines "*l" do - print('<', line) - local msg = rirc.parse(line) - if msg.op == 'PING' then - self:_send{'PONG', msg.args[1]} - elseif msg.op == 'PRIVMSG' then - local channel_name = msg.args[1] - local body = msg.args[2] - local sender = msg.source - self.wilson:deliver(Channel(self, channel_name), { - body = body, - sender = sender..'[i]' - }) - elseif msg.op == 'ERROR' then - error(msg.args[1]) - end - end -end - -function Irc.sending(self) - local nicks_channels = {} - local function ensure_joined(nick, channel) - if not nicks_channels[nick] then - self:_send{'NICK', nick, 1, 'username', 'host', 1, '+', 'realname'} - nicks_channels[nick] = {} - end - if not nicks_channels[nick][channel] then - self:_send{source=nick, 'JOIN', channel} - nicks_channels[nick][channel] = true - end - end - local function say(nick, channel, body) - ensure_joined(nick, channel) - self:_send{source=nick, 'PRIVMSG', channel, body} - end - - say('WILSON', '#test', 'i am wilson') - - for dest_channel, message in self.inbox:iter() do - local channel_name = dest_channel.descriptor - say(message.sender, channel_name, message.body) - end -end - -function Irc.post(self, dest_channel, message) - self.inbox:enqueue(dest_channel, message) -end - -return Irc diff --git a/irc/pylon.lua b/irc/pylon.lua new file mode 100644 index 0000000..4259f5e --- /dev/null +++ b/irc/pylon.lua @@ -0,0 +1,96 @@ +local cqueues = require'cqueues' +local socket = require'cqueues.socket' +local pprint = require'pprint' +local rirc = require'irc.rirc' +local Queue = require'util.queue' +local Channel = require'util.channel' + +local Irc = {} + +function Irc._send(self, args) + args.source = args.source or self.nodename + local sent = rirc.send(self.sock, args) + print('>', sent) +end + +function Irc.check_config(self, vars) + for x in vars:gmatch("%S+") do + assert(self[x], "missing conf field "..x) end end + +function Irc.make(wilson, conf) + local self = setmetatable(conf, {__index=Irc}) + + for k,v in pairs { + wilson = wilson, + inbox = Queue.make(), + } do self[k] = v end + + self:check_config "host port password nodename" + + return self +end + +function Irc._connect(self) + self.sock = assert(socket.connect(self.host, self.port)) + self:_send{'PASS', self.password, '0210-IRC', 'wilson|'} + self:_send{'SERVER', self.nodename, '1', 'i am wilson'} +end + +function Irc.run(self) + local cq = cqueues.new() + self:_connect() + cq:wrap(self.recving, self) + cq:wrap(self.sending, self) + print('irc',cq:loop()) +end + +function Irc.recving(self) + for line in self.sock:lines "*l" do + print('<', line) + local msg = rirc.parse(line) + if msg.op == 'PING' then + self:_send{'PONG', msg.args[1]} + elseif msg.op == 'PRIVMSG' then + local channel_name = msg.args[1] + local body = msg.args[2] + local sender = msg.source + self.wilson:deliver(Channel(self, channel_name), { + body = body, + sender = sender..'[i]' + }) + elseif msg.op == 'ERROR' then + error(msg.args[1]) + end + end +end + +function Irc.sending(self) + local nicks_channels = {} + local function ensure_joined(nick, channel) + if not nicks_channels[nick] then + self:_send{'NICK', nick, 1, 'username', 'host', 1, '+', 'realname'} + nicks_channels[nick] = {} + end + if not nicks_channels[nick][channel] then + self:_send{source=nick, 'JOIN', channel} + nicks_channels[nick][channel] = true + end + end + local function say(nick, channel, body) + ensure_joined(nick, channel) + self:_send{source=nick, 'PRIVMSG', channel, body} + end + + say('WILSON', '#test', 'i am wilson') + + for dest_channel, message in self.inbox:iter() do + local channel_name = dest_channel.descriptor + say(message.sender, channel_name, message.body) + end +end + +function Irc.post(self, dest_channel, message) + self.inbox:enqueue(dest_channel, message) +end + +return Irc diff --git a/irc/rirc.lua b/irc/rirc.lua new file mode 100644 index 0000000..0508351 --- /dev/null +++ b/irc/rirc.lua @@ -0,0 +1,61 @@ +local irc = {} + +function irc.sendmsg(conn, ch, msg) + local m = msg:gsub("[\r\n]+"," ") + local l = 512-12-#ch + m = m:sub(1,l) + conn:send("PRIVMSG "..ch.." :"..m.."\r\n") +end + +function irc.send(sock, args) + local out = '' + if args.source then + out = ':' .. args.source .. ' ' + end + for i = 1, #args-1 do + local arg = tostring(args[i]) + out = out .. arg:gsub("[\r\n ]+","") .. ' ' + end + local last = tostring(args[#args]):gsub("[\r\n]+"," ") + out = out .. ':' .. last + sock:write(out..'\r\n') + return out +end + +function irc.parse(line) + local words = {} + local idx = 1 + while true do + local word,nidx = line:match("(%g+)%s*()",idx) + if not word then + break + elseif word:sub(1,1) == ":" and idx ~= 1 then + -- first word can start with : + local rest = line:sub(idx+1) + table.insert(words,rest) + break + else + table.insert(words,word) + idx = nidx + end + end + + local from = nil + if words[1] and words[1]:sub(1,1) == ":" then + -- we have a source + from = table.remove(words,1):sub(2) + end + + local op = words[1] + local args = {} + for i=2,#words do + args[i-1] = words[i] + end + return {source=from,op=op:upper(),args=args} +end + +function irc.parse_src(src) + return src:match"^(.*)!(.*)@(.*)$" +end + +return irc diff --git a/main.lua b/main.lua index 1f422e6..d7b6daf 100644 --- a/main.lua +++ b/main.lua @@ -1,11 +1,11 @@ local cqueues = require'cqueues' -local config = require'config' -local Channel = require'channel' +local config = require'util.config' +local Channel = require'util.channel' local pylon_classes = { - irc = require'irc', - xmpp = require'xmpp', - discord = require'discord', + irc = require'irc.pylon', + xmpp = require'xmpp.pylon', + discord = require'discord.pylon', } local Wilson = {} diff --git a/queue.lua b/queue.lua deleted file mode 100644 index 8c9c373..0000000 --- a/queue.lua +++ /dev/null @@ -1,39 +0,0 @@ -local cqueues = require'cqueues' -local condition = require'cqueues.condition' -local cqaux = require'cqueues.auxlib' - -local Queue = {} - -function Queue.make() - return setmetatable({ - items = {}, - cv = condition.new(), - }, {__index=Queue}) -end - -function Queue.enqueue(self, ...) - local item = table.pack(...) - table.insert(self.items, item) - if #self.items > 128 then - print('warning: queue is quite big') - end - self.cv:signal() -end - -function Queue.iter(self) - return cqaux.wrap(function() - while true do - while #self.items > 0 do - local items = self.items - self.items = {} -- the old switcheroo - for _, item in ipairs(items) do - coroutine.yield(table.unpack(item, 1, item.n)) - end - end - self.cv:wait() - end - end) -end - - -return Queue diff --git a/rirc.lua b/rirc.lua deleted file mode 100644 index 0508351..0000000 --- a/rirc.lua +++ /dev/null @@ -1,61 +0,0 @@ -local irc = {} - -function irc.sendmsg(conn, ch, msg) - local m = msg:gsub("[\r\n]+"," ") - local l = 512-12-#ch - m = m:sub(1,l) - conn:send("PRIVMSG "..ch.." :"..m.."\r\n") -end - -function irc.send(sock, args) - local out = '' - if args.source then - out = ':' .. args.source .. ' ' - end - for i = 1, #args-1 do - local arg = tostring(args[i]) - out = out .. arg:gsub("[\r\n ]+","") .. ' ' - end - local last = tostring(args[#args]):gsub("[\r\n]+"," ") - out = out .. ':' .. last - sock:write(out..'\r\n') - return out -end - -function irc.parse(line) - local words = {} - local idx = 1 - while true do - local word,nidx = line:match("(%g+)%s*()",idx) - if not word then - break - elseif word:sub(1,1) == ":" and idx ~= 1 then - -- first word can start with : - local rest = line:sub(idx+1) - table.insert(words,rest) - break - else - table.insert(words,word) - idx = nidx - end - end - - local from = nil - if words[1] and words[1]:sub(1,1) == ":" then - -- we have a source - from = table.remove(words,1):sub(2) - end - - local op = words[1] - local args = {} - for i=2,#words do - args[i-1] = words[i] - end - return {source=from,op=op:upper(),args=args} -end - -function irc.parse_src(src) - return src:match"^(.*)!(.*)@(.*)$" -end - -return irc diff --git a/sha1.lua b/sha1.lua deleted file mode 100644 index 7451595..0000000 --- a/sha1.lua +++ /dev/null @@ -1,169 +0,0 @@ --- from https://github.com/mpeterv/sha1 --- by Enrique García Cota, Eike Decker, Jeffrey Friedl, Peter Melnichenko --- (MIT license) - -local sha1 = {} - --- Merges four bytes into a uint32 number. -local function bytes_to_uint32(a, b, c, d) - return a * 0x1000000 + b * 0x10000 + c * 0x100 + d -end - --- Splits a uint32 number into four bytes. -local function uint32_to_bytes(a) - local a4 = a % 256 - a = (a - a4) / 256 - local a3 = a % 256 - a = (a - a3) / 256 - local a2 = a % 256 - local a1 = (a - a2) / 256 - return a1, a2, a3, a4 -end - -local function uint32_lrot(a, bits) - return ((a << bits) & 0xFFFFFFFF) | (a >> (32 - bits)) -end - -local function uint32_ternary(a, b, c) - -- c ~ (a & (b ~ c)) has less bitwise operations than (a & b) | (~a & c). - return c ~ (a & (b ~ c)) -end - -local function uint32_majority(a, b, c) - -- (a & (b | c)) | (b & c) has less bitwise operations than (a & b) | (a & c) | (b & c). - return (a & (b | c)) | (b & c) -end - -local sbyte = string.byte -local schar = string.char -local sformat = string.format -local srep = string.rep - -local function hex_to_binary(hex) - return (hex:gsub("..", function(hexval) - return schar(tonumber(hexval, 16)) - end)) -end - --- Calculates SHA1 for a string, returns it encoded as 40 hexadecimal digits. -function sha1.sha1(str) - -- Input preprocessing. - -- First, append a `1` bit and seven `0` bits. - local first_append = schar(0x80) - - -- Next, append some zero bytes to make the length of the final message a multiple of 64. - -- Eight more bytes will be added next. - local non_zero_message_bytes = #str + 1 + 8 - local second_append = srep(schar(0), -non_zero_message_bytes % 64) - - -- Finally, append the length of the original message in bits as a 64-bit number. - -- Assume that it fits into the lower 32 bits. - local third_append = schar(0, 0, 0, 0, uint32_to_bytes(#str * 8)) - - str = str .. first_append .. second_append .. third_append - assert(#str % 64 == 0) - - -- Initialize hash value. - local h0 = 0x67452301 - local h1 = 0xEFCDAB89 - local h2 = 0x98BADCFE - local h3 = 0x10325476 - local h4 = 0xC3D2E1F0 - - local w = {} - - -- Process the input in successive 64-byte chunks. - for chunk_start = 1, #str, 64 do - -- Load the chunk into W[0..15] as uint32 numbers. - local uint32_start = chunk_start - - for i = 0, 15 do - w[i] = bytes_to_uint32(sbyte(str, uint32_start, uint32_start + 3)) - uint32_start = uint32_start + 4 - end - - -- Extend the input vector. - for i = 16, 79 do - w[i] = uint32_lrot(w[i - 3] ~ w[i - 8] ~ w[i - 14] ~ w[i - 16], 1) - end - - -- Initialize hash value for this chunk. - local a = h0 - local b = h1 - local c = h2 - local d = h3 - local e = h4 - - -- Main loop. - for i = 0, 79 do - local f - local k - - if i <= 19 then - f = uint32_ternary(b, c, d) - k = 0x5A827999 - elseif i <= 39 then - f = b ~ c ~ d - k = 0x6ED9EBA1 - elseif i <= 59 then - f = uint32_majority(b, c, d) - k = 0x8F1BBCDC - else - f = b ~ c ~ d - k = 0xCA62C1D6 - end - - local temp = (uint32_lrot(a, 5) + f + e + k + w[i]) % 4294967296 - e = d - d = c - c = uint32_lrot(b, 30) - b = a - a = temp - end - - -- Add this chunk's hash to result so far. - h0 = (h0 + a) % 4294967296 - h1 = (h1 + b) % 4294967296 - h2 = (h2 + c) % 4294967296 - h3 = (h3 + d) % 4294967296 - h4 = (h4 + e) % 4294967296 - end - - return sformat("%08x%08x%08x%08x%08x", h0, h1, h2, h3, h4) -end - -function sha1.binary(str) - return hex_to_binary(sha1.sha1(str)) -end - --- Precalculate replacement tables. -local xor_with_0x5c = {} -local xor_with_0x36 = {} - -for i = 0, 0xff do - xor_with_0x5c[schar(i)] = schar(0x5c ~ i) - xor_with_0x36[schar(i)] = schar(0x36 ~ i) -end - --- 512 bits. -local BLOCK_SIZE = 64 - -function sha1.hmac(key, text) - if #key > BLOCK_SIZE then - key = sha1.binary(key) - end - - local key_xord_with_0x36 = key:gsub('.', xor_with_0x36) .. srep(schar(0x36), BLOCK_SIZE - #key) - local key_xord_with_0x5c = key:gsub('.', xor_with_0x5c) .. srep(schar(0x5c), BLOCK_SIZE - #key) - - return sha1.sha1(key_xord_with_0x5c .. sha1.binary(key_xord_with_0x36 .. text)) -end - -function sha1.hmac_binary(key, text) - return hex_to_binary(sha1.hmac(key, text)) -end - -setmetatable(sha1, {__call = function(_, str) return sha1.sha1(str) end}) - -return sha1 - diff --git a/test.lua b/test.lua deleted file mode 100644 index d70f7f2..0000000 --- a/test.lua +++ /dev/null @@ -1,24 +0,0 @@ -local cqueues = require'cqueues' -local condition = require'cqueues.condition' - -local cv = condition.new() -local function task1() - while true do - print('1 top') - cv:wait() - print('1 waited') - end -end -local function task2() - while true do - print('2 top') - cv:signal() - print('2 signalled') - cqueues.poll() - end -end - -local cq = cqueues.new() -cq:wrap(task1) -cq:wrap(task2) -print(cq:loop()) diff --git a/util/channel.lua b/util/channel.lua new file mode 100644 index 0000000..e908069 --- /dev/null +++ b/util/channel.lua @@ -0,0 +1,15 @@ +-- channel descriptor + +local Channel = {} +function Channel.make(pylon, descriptor) + return setmetatable({pylon=pylon, descriptor=descriptor}, Channel) +end +function Channel.__eq(self, other) + return self.pylon == other.pylon and self.descriptor == other.descriptor +end +function Channel.__call(_, ...) return Channel.make(...) end +function Channel.__tostring(self) + return self.pylon.name .. ':' .. self.descriptor +end +setmetatable(Channel, Channel) +return Channel diff --git a/util/config.lua b/util/config.lua new file mode 100644 index 0000000..c19a087 --- /dev/null +++ b/util/config.lua @@ -0,0 +1,45 @@ +local function partial(f,x) return function(...) return f(x,...) end end + +local function kv_syntax(block,line) + local k,v = line:match"^([a-z0-9_-]+)%s*=%s*(.*)$" + assert(k,"syntax error in kv line: "..line) + k = k:gsub("-","_") + block[k]=v +end + +local function tuple_syntax(pattern) return function(block,line) + local matches = {line:match(pattern)} + assert(matches[1], "syntax error in tuple line: "..line) + table.insert(block, matches) +end end + +local schema = { + pylon = kv_syntax, + bus = tuple_syntax"^(%S+)%s+(%S+)$", +} + +local function parse_file(file) + local blocks = {} + for k in pairs(schema) do blocks[k] = {} end + local line_handler = function() error("line outside of block") end + + for line in file:lines() do + line = line:gsub(";.*$",""):gsub("^%s*",""):gsub("%s*$","") + if line == '' then goto next end + + local block_type, block_name = line:match"%[%s*(%S+)%s+(%S+)%s*%]" + if block_type then + local blocks_of_this_type = assert(blocks[block_type],"no such block type "..block_type) + local block = {} + blocks_of_this_type[block_name] = block + line_handler = partial(schema[block_type], block) + else + line_handler(line) + end + ::next:: + end + + return blocks +end + +return {parse=parse_file} diff --git a/util/queue.lua b/util/queue.lua new file mode 100644 index 0000000..8c9c373 --- /dev/null +++ b/util/queue.lua @@ -0,0 +1,39 @@ +local cqueues = require'cqueues' +local condition = require'cqueues.condition' +local cqaux = require'cqueues.auxlib' + +local Queue = {} + +function Queue.make() + return setmetatable({ + items = {}, + cv = condition.new(), + }, {__index=Queue}) +end + +function Queue.enqueue(self, ...) + local item = table.pack(...) + table.insert(self.items, item) + if #self.items > 128 then + print('warning: queue is quite big') + end + self.cv:signal() +end + +function Queue.iter(self) + return cqaux.wrap(function() + while true do + while #self.items > 0 do + local items = self.items + self.items = {} -- the old switcheroo + for _, item in ipairs(items) do + coroutine.yield(table.unpack(item, 1, item.n)) + end + end + self.cv:wait() + end + end) +end + + +return Queue diff --git a/wilson_ex.ini b/wilson_ex.ini deleted file mode 100644 index df80e09..0000000 --- a/wilson_ex.ini +++ /dev/null @@ -1,35 +0,0 @@ -# [pylon discord] -# type=discord -# token=abcdef123456 - -[pylon apionet-irc] -type=irc -host=ubq323.website -nick=wilson -port=6667 -password=secretpassword -nodename=wilson.ubq323 - -[pylon ubq-xmpp] -type=xmpp -jid=wilson@ubq323.website -server=ubq323.website -password=zyxw9876 -default-service=conference.ubq323.website -resource=wilson -component=wilson.ubq323.website -component_secret=my_secret_password - - -[bus a] -# apionet a -# discord 12345678 # esoserver #apionet -# discord 98765432 # apionet discord #a -ubq-xmpp a@ -apionet-irc a - -[bus ja] -# discord 3141592654 # apionet discord #ja -apionet-irc ja -ubq-xmpp ja@ - diff --git a/xml.lua b/xml.lua deleted file mode 100644 index 68fa741..0000000 --- a/xml.lua +++ /dev/null @@ -1,173 +0,0 @@ --- originally from http://lua-users.org/wiki/LuaXml --- modified by me a bit - - -entity_escapes = { - ["<"]="<", - [">"]=">", - ["&"]="&", - ['"']=""", - ["'"]="'" -} -entity_unescapes = {} -for k,v in pairs(entity_escapes) do entity_unescapes[v]=k end - -function escape(s) - return s:gsub("[<>&'\"]",entity_escapes) -end -function unescape(s) - return s:gsub("&[a-z]+;",entity_unescapes) -end - -local function parseargs(s) - local arg = {} - string.gsub(s, "([%-%w]+)=([\"'])(.-)%2", function (w, _, a) - arg[w] = a - end) - return arg -end - -local function tag(x) - return setmetatable(x, {__call=function(x, label) - -- search for child with given label - for _,c in ipairs(x) do - if c.label == label then - return c - end - end - return nil - end}) -end - -local psingle - -local function pmulti(s, i, parent) - ::again:: - local nexti, child = psingle(s, i) - if child.close and child.label == parent.label then - return nexti, parent - else - table.insert(parent, child) - i = nexti - goto again - end -end - -psingle = function(s, i) - i = i or 1 - local ts,j,c,label,xarg,empty = s:find("<(%/?)([%w:]+)(.-)(%/?)>", i) - if not ts then - local rest = s:sub(i) - if rest:find("<",i) then - error('ill formed (eof?)') - elseif #rest == 0 then - error('empty string') - else - return i+#rest, unescape(rest) - end - end - local nexti = j+1 - - local pretext = s:sub(i, ts-1) - if not pretext:find("^%s*$") then -- not entirely whitespace - return ts, unescape(pretext) - end - - if empty == "/" then - return nexti, tag{label=label, xarg=parseargs(xarg), empty=true} - elseif c == "" then -- start tag - return pmulti(s, nexti, tag{label=label, xarg=parseargs(xarg)}) - else -- end tag - return nexti, tag{label=label, close=true} - end -end - -local wrap -do - local _, cqa = pcall(require, 'cqueues.auxlib') - wrap = cqa and cqa.wrap or coroutine.wrap -end - -local function stanzae(getmore) - return wrap(function() - local buf = '' - while true do - local ok, ni, el = pcall(psingle, buf) - if ok then - coroutine.yield(el) - buf = buf:sub(ni) - else - local more = assert(getmore()) - buf = buf .. more - end - end - end) -end - - -local safestr_mt = {name='SAFESTR', __tostring=function(x) return x.s end} -local function safestr(s) return setmetatable({s=s}, safestr_mt) end - -local function _xmlify(x) - if getmetatable(x) == safestr_mt then - return x - elseif type(x) == 'string' then - return safestr(escape(x)) - elseif type(x) == 'table' then -- must be a tag - local function argstr(t) - local argstring = '' - for k,v in pairs(t) do - argstring = argstring .. (" %s='%s'"):format(k, _xmlify(v)) - end - return argstring - end - if x.empty then - return safestr(("<%s%s/>"):format(x.label, argstr(x.xarg))) - else - local open = ("<%s%s>"):format(x.label, argstr(x.xarg)) - local close = (""):format(x.label) - local children = {} - for _,child in ipairs(x) do - table.insert(children, tostring(_xmlify(child))) - end - return safestr(open .. table.concat(children, '') .. close) - end - end -end - -local function xmlify(...) - local n = select('#',...) - if n <= 1 then return _xmlify(...) end - - local out = {} - for i = 1, n do - out[i] = tostring(_xmlify(select(i, ...))) - end - return table.concat(out, '\n') -end - --- dsl for input to xmlify. doesn't do escaping or anything. --- THERE IS NO ESCAPE -local X = setmetatable({}, {__index=function(_,label) - return function(tab) - local out = {} - local xarg = {} - local empty = true - - for k, v in pairs(tab) do - if type(k) == 'number' then -- child - empty = nil - out[k] = v - elseif type(k) == 'string' then -- attrib - xarg[k] = v - end - end - - out.label = label - out.xarg = xarg - out.empty = empty - return out - end -end}) - -return { psingle = psingle, stanzae = stanzae, wrap=wrap, xmlify=xmlify, X=X } diff --git a/xmpp.lua b/xmpp.lua deleted file mode 100644 index 5c3371b..0000000 --- a/xmpp.lua +++ /dev/null @@ -1,187 +0,0 @@ -local cqueues = require'cqueues' -local cqaux = require'cqueues.auxlib' -local socket = require'cqueues.socket' -local xml = require'xml' -local X = xml.X -local xmlify = xml.xmlify -local pprint=require'pprint' -local Queue = require'queue' -local base64 = require'base64' -local sha1 = require'sha1' -local Channel = require'channel' - -local Xmpp = {} - -local function make_auth(authz, authn, password) - -- sasl plain (RFC4616) - return base64.encode(authz..'\0'..authn..'\0'..password) -end - -function Xmpp.make(wilson, conf) - local self = { - name = conf.name, - wilson = wilson, - inbox = Queue.make(), - cq = wilson.cq, -- todo - nicks_inuse = {}, -- todo - } - local function conf_var(name) - assert(conf[name] ~= nil, 'missing conf field '..name) - self[name] = conf[name] - end - -- conf_var 'jid' - conf_var 'server' - -- conf_var 'resource' - conf_var 'component' - conf_var 'component_secret' - - setmetatable(self, {__index=Xmpp}) - return self -end - -function Xmpp._connect_c2s(self) - local sock = assert(socket.connect(self.server, 5222)) - self.sock = sock - sock:setmode('bn','bn') - - local start = ([[ -]]):format(self.jid, self.server) - - -- state of the art xml parser - local function check_and_send(test, text) - local x = sock:read('-2048') - assert(x:find(test)) - if text then sock:write(text) end - end - local function ietf_urn(v) return 'urn:ietf:params:xml:ns:xmpp-'..v end - - sock:write(start) - check_and_send('starttls', xmlify(X.starttls{xmlns=ietf_urn"tls"})) - check_and_send('proceed', nil) - sock:starttls() - sock:write(start) - local auth = make_auth('', self.jid:match"(.*)@", self.password) - check_and_send('PLAIN', - xmlify(X.auth{xmlns=ietf_urn"sasl", mechanism='PLAIN', auth})) - check_and_send('success',start) - check_and_send('bind', - xmlify(X.iq{type='set', id='aaaa', - X.bind{xmlns=ietf_urn"bind", X.resource{self.resource}}})) - check_and_send('jid',X.presence{X.show{'chat'}}) - - return sock -end - --- this sucks! no tls! no security! only use on local connections! -function Xmpp._connect_component(self) - local sock = assert(socket.connect(self.server, 5347)) - self.sock = sock - sock:setmode('bn','bn') - -- yes, our component name goes in the 'to' field. don't ask me why - local start = ([[]]):format(self.component) - - print(start) - - -- state of the art xml parser - local function check_and_send(test, text) - local x = sock:read('-2048') - assert(x:find(test)) - if text then sock:write(text) end - end - - sock:write(start) - local streamhead = sock:read('-2048') - print('streamhead', streamhead) - assert(streamhead:find'accept') - local streamid = streamhead:match"id='(.-)'" - sock:write(xmlify(X.handshake{sha1.sha1(streamid..self.component_secret)})) - check_and_send('',nil) - - return sock -end - -local THE_MUC = 'd@conference.ubq323.website' - -function Xmpp.run(self) - self:_connect_component() - self.cq:wrap(self.recving, self) - self.cq:wrap(self.sending, self) -end - -function Xmpp.recving(self) - local function getmore() - local function t(...) - pprint(...) - return ... - end - return t(self.sock:read'-2048') - end - for x in xml.stanzae(getmore) do - pprint(x) - print(xmlify(x)) - local body = x'body' and x'body'[1] - if x.label == 'message' then - local fr = x.xarg.from - local t = x.xarg.to - local from_nick = fr:match("/(.*)") - if not self.nicks_inuse[from_nick] and body and fr:match"/" and t == 'wilson@'..self.component then - self.wilson:deliver(Channel(self, THE_MUC), { - body = body, - sender = '[x]'..from_nick - }) - end - end - end -end - -function Xmpp.sending(self) - local users_inuse = {} - local function ensure_joined(muc,user,nick) - if self.nicks_inuse[nick] then return end - user = user:gsub("[^a-zA-Z0-9%.]","."):match("^%.*(.-)%.*$") - while users_inuse[user] do user = user..'-' end - local jid = user..'@'..self.component - local mucjid = muc..'/'..nick - self.nicks_inuse[nick] = true - users_inuse[user] = true - - self.sock:write(xmlify( - X.presence{from=jid, to=mucjid, - X.x{xmlns='http://jabber.org/protocol/muc', - X.history{maxstanzas='0'}}})) - end - ensure_joined(THE_MUC, 'wilson', 'wilson') - for dest_channel, message in self.inbox:iter() do - pprint(dest_channel, message) - ensure_joined(THE_MUC, message.sender, message.sender) - local user = message.sender:gsub("[^a-zA-Z0-9%.]","."):match("^%.*(.-)%.*$") - local jid = user..'@'..self.component - self.sock:write(xmlify( - X.message{to=THE_MUC, type='groupchat', from=jid, - X.body{message.body}})) - end -end - -function Xmpp.post(self, dest_channel, message) - self.inbox:enqueue(dest_channel, message) -end - -return Xmpp - --- local cq = cqueues.new() --- local conf = { --- jid='wilson@ubq323.website', --- server='ubq323.website', --- password='gregory<3', --- resource='cheese', --- } --- local dummy_network = { --- post = function(self, pylonname, channel, message) --- pprint(pylonname, channel, message) --- end --- } --- local pylon = Xmpp.makepylon('xmpptest',conf, cq, dummy_network) --- pylon:run() - --- pprint('peas', cq:loop()) - diff --git a/xmpp/base64.lua b/xmpp/base64.lua new file mode 100644 index 0000000..4f9a967 --- /dev/null +++ b/xmpp/base64.lua @@ -0,0 +1,38 @@ +local alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" + +-- really bad +local function encode(s) + local x = 0 + local n = 0 + local out = {} + local outn = 1 + local pad = "" + local function si(v, m) x = (x << m) | v; n = n + m end + local function so(m) + local rem = n - m + local res = x >> rem + x = x & ((1 << rem) - 1) + n = n - m + return res + end + local function o() + while n >= 6 do + local i = so(6)+1 + out[outn] = alphabet:sub(i,i) + outn = outn + 1 + end + end + for i = 1, #s do + si(s:byte(i), 8) + o() + end + if n > 0 then + local on = n + si(0, 6-n) + o() + pad = ('='):rep(3-on/2) -- bad + end + return table.concat(out)..pad +end + +return {encode=encode} diff --git a/xmpp/pylon.lua b/xmpp/pylon.lua new file mode 100644 index 0000000..ba9c252 --- /dev/null +++ b/xmpp/pylon.lua @@ -0,0 +1,187 @@ +local cqueues = require'cqueues' +local cqaux = require'cqueues.auxlib' +local socket = require'cqueues.socket' +local xml = require'xmpp.xml' +local X = xml.X +local xmlify = xml.xmlify +local pprint=require'pprint' +local Queue = require'util.queue' +local base64 = require'xmpp.base64' +local sha1 = require'xmpp.sha1' +local Channel = require'util.channel' + +local Xmpp = {} + +local function make_auth(authz, authn, password) + -- sasl plain (RFC4616) + return base64.encode(authz..'\0'..authn..'\0'..password) +end + +function Xmpp.make(wilson, conf) + local self = { + name = conf.name, + wilson = wilson, + inbox = Queue.make(), + cq = wilson.cq, -- todo + nicks_inuse = {}, -- todo + } + local function conf_var(name) + assert(conf[name] ~= nil, 'missing conf field '..name) + self[name] = conf[name] + end + -- conf_var 'jid' + conf_var 'server' + -- conf_var 'resource' + conf_var 'component' + conf_var 'component_secret' + + setmetatable(self, {__index=Xmpp}) + return self +end + +function Xmpp._connect_c2s(self) + local sock = assert(socket.connect(self.server, 5222)) + self.sock = sock + sock:setmode('bn','bn') + + local start = ([[ +]]):format(self.jid, self.server) + + -- state of the art xml parser + local function check_and_send(test, text) + local x = sock:read('-2048') + assert(x:find(test)) + if text then sock:write(text) end + end + local function ietf_urn(v) return 'urn:ietf:params:xml:ns:xmpp-'..v end + + sock:write(start) + check_and_send('starttls', xmlify(X.starttls{xmlns=ietf_urn"tls"})) + check_and_send('proceed', nil) + sock:starttls() + sock:write(start) + local auth = make_auth('', self.jid:match"(.*)@", self.password) + check_and_send('PLAIN', + xmlify(X.auth{xmlns=ietf_urn"sasl", mechanism='PLAIN', auth})) + check_and_send('success',start) + check_and_send('bind', + xmlify(X.iq{type='set', id='aaaa', + X.bind{xmlns=ietf_urn"bind", X.resource{self.resource}}})) + check_and_send('jid',X.presence{X.show{'chat'}}) + + return sock +end + +-- this sucks! no tls! no security! only use on local connections! +function Xmpp._connect_component(self) + local sock = assert(socket.connect(self.server, 5347)) + self.sock = sock + sock:setmode('bn','bn') + -- yes, our component name goes in the 'to' field. don't ask me why + local start = ([[]]):format(self.component) + + print(start) + + -- state of the art xml parser + local function check_and_send(test, text) + local x = sock:read('-2048') + assert(x:find(test)) + if text then sock:write(text) end + end + + sock:write(start) + local streamhead = sock:read('-2048') + print('streamhead', streamhead) + assert(streamhead:find'accept') + local streamid = streamhead:match"id='(.-)'" + sock:write(xmlify(X.handshake{sha1.sha1(streamid..self.component_secret)})) + check_and_send('',nil) + + return sock +end + +local THE_MUC = 'd@conference.ubq323.website' + +function Xmpp.run(self) + self:_connect_component() + self.cq:wrap(self.recving, self) + self.cq:wrap(self.sending, self) +end + +function Xmpp.recving(self) + local function getmore() + local function t(...) + pprint(...) + return ... + end + return t(self.sock:read'-2048') + end + for x in xml.stanzae(getmore) do + pprint(x) + print(xmlify(x)) + local body = x'body' and x'body'[1] + if x.label == 'message' then + local fr = x.xarg.from + local t = x.xarg.to + local from_nick = fr:match("/(.*)") + if not self.nicks_inuse[from_nick] and body and fr:match"/" and t == 'wilson@'..self.component then + self.wilson:deliver(Channel(self, THE_MUC), { + body = body, + sender = '[x]'..from_nick + }) + end + end + end +end + +function Xmpp.sending(self) + local users_inuse = {} + local function ensure_joined(muc,user,nick) + if self.nicks_inuse[nick] then return end + user = user:gsub("[^a-zA-Z0-9%.]","."):match("^%.*(.-)%.*$") + while users_inuse[user] do user = user..'-' end + local jid = user..'@'..self.component + local mucjid = muc..'/'..nick + self.nicks_inuse[nick] = true + users_inuse[user] = true + + self.sock:write(xmlify( + X.presence{from=jid, to=mucjid, + X.x{xmlns='http://jabber.org/protocol/muc', + X.history{maxstanzas='0'}}})) + end + ensure_joined(THE_MUC, 'wilson', 'wilson') + for dest_channel, message in self.inbox:iter() do + pprint(dest_channel, message) + ensure_joined(THE_MUC, message.sender, message.sender) + local user = message.sender:gsub("[^a-zA-Z0-9%.]","."):match("^%.*(.-)%.*$") + local jid = user..'@'..self.component + self.sock:write(xmlify( + X.message{to=THE_MUC, type='groupchat', from=jid, + X.body{message.body}})) + end +end + +function Xmpp.post(self, dest_channel, message) + self.inbox:enqueue(dest_channel, message) +end + +return Xmpp + +-- local cq = cqueues.new() +-- local conf = { +-- jid='wilson@ubq323.website', +-- server='ubq323.website', +-- password='gregory<3', +-- resource='cheese', +-- } +-- local dummy_network = { +-- post = function(self, pylonname, channel, message) +-- pprint(pylonname, channel, message) +-- end +-- } +-- local pylon = Xmpp.makepylon('xmpptest',conf, cq, dummy_network) +-- pylon:run() + +-- pprint('peas', cq:loop()) + diff --git a/xmpp/sha1.lua b/xmpp/sha1.lua new file mode 100644 index 0000000..7451595 --- /dev/null +++ b/xmpp/sha1.lua @@ -0,0 +1,169 @@ +-- from https://github.com/mpeterv/sha1 +-- by Enrique García Cota, Eike Decker, Jeffrey Friedl, Peter Melnichenko +-- (MIT license) + +local sha1 = {} + +-- Merges four bytes into a uint32 number. +local function bytes_to_uint32(a, b, c, d) + return a * 0x1000000 + b * 0x10000 + c * 0x100 + d +end + +-- Splits a uint32 number into four bytes. +local function uint32_to_bytes(a) + local a4 = a % 256 + a = (a - a4) / 256 + local a3 = a % 256 + a = (a - a3) / 256 + local a2 = a % 256 + local a1 = (a - a2) / 256 + return a1, a2, a3, a4 +end + +local function uint32_lrot(a, bits) + return ((a << bits) & 0xFFFFFFFF) | (a >> (32 - bits)) +end + +local function uint32_ternary(a, b, c) + -- c ~ (a & (b ~ c)) has less bitwise operations than (a & b) | (~a & c). + return c ~ (a & (b ~ c)) +end + +local function uint32_majority(a, b, c) + -- (a & (b | c)) | (b & c) has less bitwise operations than (a & b) | (a & c) | (b & c). + return (a & (b | c)) | (b & c) +end + +local sbyte = string.byte +local schar = string.char +local sformat = string.format +local srep = string.rep + +local function hex_to_binary(hex) + return (hex:gsub("..", function(hexval) + return schar(tonumber(hexval, 16)) + end)) +end + +-- Calculates SHA1 for a string, returns it encoded as 40 hexadecimal digits. +function sha1.sha1(str) + -- Input preprocessing. + -- First, append a `1` bit and seven `0` bits. + local first_append = schar(0x80) + + -- Next, append some zero bytes to make the length of the final message a multiple of 64. + -- Eight more bytes will be added next. + local non_zero_message_bytes = #str + 1 + 8 + local second_append = srep(schar(0), -non_zero_message_bytes % 64) + + -- Finally, append the length of the original message in bits as a 64-bit number. + -- Assume that it fits into the lower 32 bits. + local third_append = schar(0, 0, 0, 0, uint32_to_bytes(#str * 8)) + + str = str .. first_append .. second_append .. third_append + assert(#str % 64 == 0) + + -- Initialize hash value. + local h0 = 0x67452301 + local h1 = 0xEFCDAB89 + local h2 = 0x98BADCFE + local h3 = 0x10325476 + local h4 = 0xC3D2E1F0 + + local w = {} + + -- Process the input in successive 64-byte chunks. + for chunk_start = 1, #str, 64 do + -- Load the chunk into W[0..15] as uint32 numbers. + local uint32_start = chunk_start + + for i = 0, 15 do + w[i] = bytes_to_uint32(sbyte(str, uint32_start, uint32_start + 3)) + uint32_start = uint32_start + 4 + end + + -- Extend the input vector. + for i = 16, 79 do + w[i] = uint32_lrot(w[i - 3] ~ w[i - 8] ~ w[i - 14] ~ w[i - 16], 1) + end + + -- Initialize hash value for this chunk. + local a = h0 + local b = h1 + local c = h2 + local d = h3 + local e = h4 + + -- Main loop. + for i = 0, 79 do + local f + local k + + if i <= 19 then + f = uint32_ternary(b, c, d) + k = 0x5A827999 + elseif i <= 39 then + f = b ~ c ~ d + k = 0x6ED9EBA1 + elseif i <= 59 then + f = uint32_majority(b, c, d) + k = 0x8F1BBCDC + else + f = b ~ c ~ d + k = 0xCA62C1D6 + end + + local temp = (uint32_lrot(a, 5) + f + e + k + w[i]) % 4294967296 + e = d + d = c + c = uint32_lrot(b, 30) + b = a + a = temp + end + + -- Add this chunk's hash to result so far. + h0 = (h0 + a) % 4294967296 + h1 = (h1 + b) % 4294967296 + h2 = (h2 + c) % 4294967296 + h3 = (h3 + d) % 4294967296 + h4 = (h4 + e) % 4294967296 + end + + return sformat("%08x%08x%08x%08x%08x", h0, h1, h2, h3, h4) +end + +function sha1.binary(str) + return hex_to_binary(sha1.sha1(str)) +end + +-- Precalculate replacement tables. +local xor_with_0x5c = {} +local xor_with_0x36 = {} + +for i = 0, 0xff do + xor_with_0x5c[schar(i)] = schar(0x5c ~ i) + xor_with_0x36[schar(i)] = schar(0x36 ~ i) +end + +-- 512 bits. +local BLOCK_SIZE = 64 + +function sha1.hmac(key, text) + if #key > BLOCK_SIZE then + key = sha1.binary(key) + end + + local key_xord_with_0x36 = key:gsub('.', xor_with_0x36) .. srep(schar(0x36), BLOCK_SIZE - #key) + local key_xord_with_0x5c = key:gsub('.', xor_with_0x5c) .. srep(schar(0x5c), BLOCK_SIZE - #key) + + return sha1.sha1(key_xord_with_0x5c .. sha1.binary(key_xord_with_0x36 .. text)) +end + +function sha1.hmac_binary(key, text) + return hex_to_binary(sha1.hmac(key, text)) +end + +setmetatable(sha1, {__call = function(_, str) return sha1.sha1(str) end}) + +return sha1 + diff --git a/xmpp/xml.lua b/xmpp/xml.lua new file mode 100644 index 0000000..68fa741 --- /dev/null +++ b/xmpp/xml.lua @@ -0,0 +1,173 @@ +-- originally from http://lua-users.org/wiki/LuaXml +-- modified by me a bit + + +entity_escapes = { + ["<"]="<", + [">"]=">", + ["&"]="&", + ['"']=""", + ["'"]="'" +} +entity_unescapes = {} +for k,v in pairs(entity_escapes) do entity_unescapes[v]=k end + +function escape(s) + return s:gsub("[<>&'\"]",entity_escapes) +end +function unescape(s) + return s:gsub("&[a-z]+;",entity_unescapes) +end + +local function parseargs(s) + local arg = {} + string.gsub(s, "([%-%w]+)=([\"'])(.-)%2", function (w, _, a) + arg[w] = a + end) + return arg +end + +local function tag(x) + return setmetatable(x, {__call=function(x, label) + -- search for child with given label + for _,c in ipairs(x) do + if c.label == label then + return c + end + end + return nil + end}) +end + +local psingle + +local function pmulti(s, i, parent) + ::again:: + local nexti, child = psingle(s, i) + if child.close and child.label == parent.label then + return nexti, parent + else + table.insert(parent, child) + i = nexti + goto again + end +end + +psingle = function(s, i) + i = i or 1 + local ts,j,c,label,xarg,empty = s:find("<(%/?)([%w:]+)(.-)(%/?)>", i) + if not ts then + local rest = s:sub(i) + if rest:find("<",i) then + error('ill formed (eof?)') + elseif #rest == 0 then + error('empty string') + else + return i+#rest, unescape(rest) + end + end + local nexti = j+1 + + local pretext = s:sub(i, ts-1) + if not pretext:find("^%s*$") then -- not entirely whitespace + return ts, unescape(pretext) + end + + if empty == "/" then + return nexti, tag{label=label, xarg=parseargs(xarg), empty=true} + elseif c == "" then -- start tag + return pmulti(s, nexti, tag{label=label, xarg=parseargs(xarg)}) + else -- end tag + return nexti, tag{label=label, close=true} + end +end + +local wrap +do + local _, cqa = pcall(require, 'cqueues.auxlib') + wrap = cqa and cqa.wrap or coroutine.wrap +end + +local function stanzae(getmore) + return wrap(function() + local buf = '' + while true do + local ok, ni, el = pcall(psingle, buf) + if ok then + coroutine.yield(el) + buf = buf:sub(ni) + else + local more = assert(getmore()) + buf = buf .. more + end + end + end) +end + + +local safestr_mt = {name='SAFESTR', __tostring=function(x) return x.s end} +local function safestr(s) return setmetatable({s=s}, safestr_mt) end + +local function _xmlify(x) + if getmetatable(x) == safestr_mt then + return x + elseif type(x) == 'string' then + return safestr(escape(x)) + elseif type(x) == 'table' then -- must be a tag + local function argstr(t) + local argstring = '' + for k,v in pairs(t) do + argstring = argstring .. (" %s='%s'"):format(k, _xmlify(v)) + end + return argstring + end + if x.empty then + return safestr(("<%s%s/>"):format(x.label, argstr(x.xarg))) + else + local open = ("<%s%s>"):format(x.label, argstr(x.xarg)) + local close = (""):format(x.label) + local children = {} + for _,child in ipairs(x) do + table.insert(children, tostring(_xmlify(child))) + end + return safestr(open .. table.concat(children, '') .. close) + end + end +end + +local function xmlify(...) + local n = select('#',...) + if n <= 1 then return _xmlify(...) end + + local out = {} + for i = 1, n do + out[i] = tostring(_xmlify(select(i, ...))) + end + return table.concat(out, '\n') +end + +-- dsl for input to xmlify. doesn't do escaping or anything. +-- THERE IS NO ESCAPE +local X = setmetatable({}, {__index=function(_,label) + return function(tab) + local out = {} + local xarg = {} + local empty = true + + for k, v in pairs(tab) do + if type(k) == 'number' then -- child + empty = nil + out[k] = v + elseif type(k) == 'string' then -- attrib + xarg[k] = v + end + end + + out.label = label + out.xarg = xarg + out.empty = empty + return out + end +end}) + +return { psingle = psingle, stanzae = stanzae, wrap=wrap, xmlify=xmlify, X=X } -- cgit v1.2.3