mtcontrib/LuaIRC
1
0
Fork 0
mirror of https://github.com/ShadowNinja/LuaIRC.git synced 2025-01-26 09:40:29 +01:00
Code Issues Releases Wiki Activity

Changing clean to verify for sending of parameters

Browse Source 
Send methods will now error if you pass invalid characters
This commit is contained in:
Joshua Simmons 2010-07-18 16:26:04 +08:00 committed by JakobOvrum
parent 9bf809f99a
commit f07a3cec22
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
asyncoperations.lua
View File

@ -18,34 +18,38 @@ function meta:send(fmt, ...)
end end
end end
local function clean(str) local function verify(str, errLevel)
return str:gsub("[\r\n:]", "") if str:find("^:") or find("%s%z") then
error(("bad characters in '%s'"):format(str), errLevel)
end
return str
end end
function meta:sendChat(target, msg) function meta:sendChat(target, msg)
-- Split the message into segments if it includes newlines. -- Split the message into segments if it includes newlines.
for line in msg:gmatch("([^\r\n]+)") for line in msg:gmatch("([^\r\n]+)")
self:send("PRIVMSG %s :%s", clean(target), msg) self:send("PRIVMSG %s :%s", verify(target, 2), msg)
end end
end end
function meta:sendNotice(target, msg) function meta:sendNotice(target, msg)
-- Split the message into segments if it includes newlines. -- Split the message into segments if it includes newlines.
for line in msg:gmatch("([^\r\n]+)") for line in msg:gmatch("([^\r\n]+)")
self:send("NOTICE %s :%s", clean(target), msg) self:send("NOTICE %s :%s", verify(target, 2), msg)
end end
end end
function meta:join(channel, key) function meta:join(channel, key)
if key then if key then
self:send("JOIN %s :%s", clean(channel), clean(key)) self:send("JOIN %s :%s", verify(channel, 2), verify(key, 2))
else else
self:send("JOIN %s", clean(channel)) self:send("JOIN %s", verify(channel, 2))
end end
end end
function meta:part(channel) function meta:part(channel)
channel = clean(channel) channel = verify(channel, 2)
self:send("PART %s", channel) self:send("PART %s", channel)
if self.track_users then if self.track_users then
self.channels[channel] = nil self.channels[channel] = nil
@ -76,5 +80,5 @@ function meta:setMode(t)
mode = table.concat{mode, "-", rem} mode = table.concat{mode, "-", rem}
end end
self:send("MODE %s %s", clean(target), clean(mode)) self:send("MODE %s %s", verify(target, 2), verify(mode, 2))
end end