Merge pull request #47 from BotBotMe/sasl-auth

🚀 SASL auth

Author: ipmb

main_test.go

@@ -70,12 +70,12 @@ func TestBotBotIRC(t *testing.T) {
 
 	// Check IRC server expectations
 
-	if server.GotLength() != 6 {
-		t.Fatal("Expected exactly 6 IRC messages from the bot. Got ", server.GotLength())
+	if server.GotLength() != 7 {
+		t.Fatal("Expected exactly 7 IRC messages from the bot. Got ", server.GotLength())
 	}
 
 	glog.Infoln("[Debug] server.Got", server.Got)
-	expect := []string{"PING", "USER", "NICK", "NickServ", "JOIN", "PRIVMSG"}
+	expect := []string{"PING", "CAP", "USER", "NICK", "NickServ", "JOIN", "PRIVMSG"}
 	for i := 0; i < 5; i++ {
 		if !strings.Contains(string(server.Got[i]), expect[i]) {
 			t.Error("Line ", i, " did not contain ", expect[i], ". It is: ", server.Got[i])

network/irc/irc.go

@@ -10,8 +10,10 @@ package irc
 
 import (
 	"bufio"
+	"bytes"
 	"crypto/tls"
 	"crypto/x509"
+	"encoding/base64"
 	"expvar"
 	"fmt"
 	"io"
@@ -525,6 +527,7 @@ func (bot *ircBot) login() {
 
 	bot.isAuthenticating = true
 
+	bot.SendRaw("CAP REQ :sasl")
 	// We use the botname as the 'realname', because bot's don't have real names!
 	bot.SendRaw("USER " + bot.nick + " 0 * :" + bot.realname)
 
@@ -541,6 +544,20 @@ func (bot *ircBot) sendPassword() {
 	bot.Send("NickServ", "identify "+bot.password)
 }
 
+func (bot *ircBot) sendSaslStart() {
+	bot.SendRaw("AUTHENTICATE PLAIN")
+}
+
+func (bot *ircBot) sendSaslPass() {
+	out := bytes.Join([][]byte{[]byte(bot.nick), []byte(bot.nick), []byte(bot.password)}, []byte{0})
+	encpass := base64.StdEncoding.EncodeToString(out)
+	bot.SendRaw("AUTHENTICATE " + encpass)
+}
+
+func (bot *ircBot) sendSaslEnd() {
+	bot.SendRaw("CAP END")
+}
+
 // Read from the conn
 func (bot *ircBot) readSocket(quit chan struct{}, receive chan string, conn io.ReadWriteCloser) {
 
@@ -596,6 +613,29 @@ func (bot *ircBot) act(theLine *line.Line) {
 		return
 	}
 
+	isAskingForSasl := strings.ToUpper(theLine.Command) == "CAP" && len(theLine.Args) == 2 && strings.ToUpper(theLine.Args[1]) == "ACK" && theLine.Content == "sasl"
+	if isAskingForSasl {
+		bot.sendSaslStart()
+		return
+	}
+
+	isAskingForSaslPass := theLine.User == "" && strings.ToUpper(theLine.Command) == "AUTHENTICATE" && theLine.Args[0] == "+"
+	if isAskingForSaslPass {
+		bot.sendSaslPass()
+		return
+	}
+
+	isSaslConfirm := theLine.User == "" && theLine.Command == "903"
+	// After SASL is accepted, join all the channels
+	if isSaslConfirm {
+		bot.sendSaslEnd()
+		bot.Lock()
+		bot.isAuthenticating = false
+		bot.Unlock()
+		bot.JoinAll()
+		return
+	}
+
 	// NickServ interactions
 	isNickServ := strings.Contains(theLine.User, "NickServ")