Added SASL support.
This commit is contained in:
parent
cba061da3a
commit
53959f9f87
2 changed files with 34 additions and 12 deletions
|
@ -1,13 +1,14 @@
|
||||||
-- config constants
|
-- config constants
|
||||||
|
|
||||||
HOST = "127.0.0.1".
|
HOST = "irc.freenode.net".
|
||||||
PORT = 6667.
|
PORT = 6667.
|
||||||
NICK = "lambot".
|
NICK = "lambot".
|
||||||
|
PASS = "".
|
||||||
|
|
||||||
LASTFM_API_KEY = "YOUR_LASTFM_API_KEY_HERE".
|
LASTFM_API_KEY = "YOUR_LASTFM_API_KEY_HERE".
|
||||||
|
|
||||||
-- nicks of administrators
|
-- nicks of administrators
|
||||||
ADMINS = ["darkf"].
|
ADMINS = ["darkf", "nchambers"].
|
||||||
|
|
||||||
-- channels to join
|
-- channels to join
|
||||||
CHANS = ["#lobby"].
|
CHANS = ["##eggnog"].
|
||||||
|
|
39
irc.lamb
39
irc.lamb
|
@ -1,3 +1,4 @@
|
||||||
|
import("std/base64").
|
||||||
import("std/list").
|
import("std/list").
|
||||||
import("std/str").
|
import("std/str").
|
||||||
import("std/http").
|
import("std/http").
|
||||||
|
@ -262,9 +263,27 @@ handleCommand(s, _, "251", _) -> s. -- There are X users and Y services on Z ser
|
||||||
handleCommand(s, _, "331", _) -> s. -- No topic is set
|
handleCommand(s, _, "331", _) -> s. -- No topic is set
|
||||||
handleCommand(s, _, "366", _) -> s. -- End of NAMES list
|
handleCommand(s, _, "366", _) -> s. -- End of NAMES list
|
||||||
|
|
||||||
|
handleCommand(s, _, "CAP", ["*", "ACK", "sasl "]) -> do
|
||||||
|
putstrln("Starting SASL handshake.");
|
||||||
|
fputstr(sock, "AUTHENTICATE PLAIN\r\n")
|
||||||
|
end.
|
||||||
|
|
||||||
|
handleCommand(s, _, "AUTHENTICATE", ["+"]) -> do
|
||||||
|
auth = base64\base64_encode(config\NICK + "\0" + config\NICK + "\0" + config\PASS);
|
||||||
|
fputstr(sock, "AUTHENTICATE " + auth + "\r\n")
|
||||||
|
end.
|
||||||
|
|
||||||
|
handleCommand(s, _, "903", _) -> do
|
||||||
|
putstrln("SASL authentication successful.");
|
||||||
|
fputstr(sock, "CAP END\r\n");
|
||||||
|
fputstr(sock, "NICK " + config\NICK + "\r\n");
|
||||||
|
fputstr(sock, "USER " + config\NICK + " 0 * :Lamb Da. Bot\r\n");
|
||||||
|
joinChans() -> list\map(\chan -> fputstr(sock, "JOIN " + chan + "\r\n"), config\CHANS);
|
||||||
|
joinChans()
|
||||||
|
end.
|
||||||
|
|
||||||
handleCommand(s, src, cmd, args) -> do
|
handleCommand(s, src, cmd, args) -> do
|
||||||
putstrln("Unhandled command: " + cmd + ", with args: " + repr(args) + " from " + src);
|
putstrln("Unhandled command: " + cmd + ", with args: " + repr(args) + " from " + src)
|
||||||
s
|
|
||||||
end.
|
end.
|
||||||
|
|
||||||
handleLine(s, ":" :: line) -> do
|
handleLine(s, ":" :: line) -> do
|
||||||
|
@ -286,13 +305,15 @@ end.
|
||||||
sock = sockopen(config\HOST, config\PORT).
|
sock = sockopen(config\HOST, config\PORT).
|
||||||
|
|
||||||
-- send introduction
|
-- send introduction
|
||||||
fputstr(sock, "PASS " + config\NICK + "\r\n").
|
if config\PASS == "" then do
|
||||||
fputstr(sock, "NICK " + config\NICK + "\r\n").
|
fputstr(sock, "NICK " + config\NICK + "\r\n");
|
||||||
fputstr(sock, "USER " + config\NICK + " 0 * :Lamb Da. Bot\r\n").
|
fputstr(sock, "USER " + config\NICK + " 0 * :Lamb Da. Bot\r\n");
|
||||||
|
joinChans() -> list\map(\chan -> fputstr(sock, "JOIN " + chan + "\r\n"), config\CHANS);
|
||||||
-- note: workaround for issue #19 (passing lambdas to modules in the global scope is incorrect)
|
joinChans()
|
||||||
joinChans() -> list\map(\chan -> fputstr(sock, "JOIN " + chan + "\r\n"), config\CHANS).
|
end
|
||||||
joinChans().
|
else do
|
||||||
|
fputstr(sock, "CAP REQ :sasl\r\n")
|
||||||
|
end.
|
||||||
|
|
||||||
-- loop receiving lines
|
-- loop receiving lines
|
||||||
mainloop(state) ->
|
mainloop(state) ->
|
||||||
|
|
Loading…
Reference in a new issue