Working test for SASL & EndMOTD.

client_test.go

@@ -11,6 +11,7 @@ import (
 	"encoding/base64"
 	"encoding/pem"
 	"fmt"
+	"log"
 	"math/big"
 	rnd "math/rand"
 	"net"
@@ -99,6 +100,7 @@ func ircWrite(server net.Conn, output string, t *testing.T) {
 	server.Write([]byte(output + "\r\n"))
 }
 
+// mock up an irc server
 func ircServer(listener net.Listener, t *testing.T, config *IRCConfig) {
 	var server net.Conn
 	var err error
@@ -120,9 +122,11 @@ func ircServer(listener net.Listener, t *testing.T, config *IRCConfig) {
 	var parts []string
 
 	var hasNick, hasUser, hasPing, hasPass bool
-	var capSASL bool
+	var capSASL, successSASL bool
 	var part1 bool
 
+	// part 1 :  User, Nick, ServerPass and Ping reply
+
 	for !part1 {
 
 		line, err = reader.ReadString('\n')
@@ -142,6 +146,9 @@ func ircServer(listener net.Listener, t *testing.T, config *IRCConfig) {
 					}
 					if line == "CAP END" {
 						capSASL = true
+						if successSASL {
+							part1 = true
+						}
 					}
 				}
 
@@ -156,6 +163,17 @@ func ircServer(listener net.Listener, t *testing.T, config *IRCConfig) {
 						var auth string = string(byteauth)
 						auth = strings.ReplaceAll(auth, "\x00", " ")
 						t.Log(auth)
+						expect = fmt.Sprintf(" %s %s", config.Nick, config.Password)
+						if expect != auth {
+							t.Errorf("Got %s, Expected %s", auth, expect)
+						} else {
+							// Success!
+							ircWrite(server, fmt.Sprintf(":irc.red-green.com 900 %s %s!%[email protected] %s :You are now logged in as %s.",
+								config.Nick, config.Nick, config.Username, config.Nick, config.Nick), t)
+							ircWrite(server, fmt.Sprintf(":irc.red-green.com 903 %s :SASL authentication successful",
+								config.Nick), t)
+							successSASL = true
+						}
 					}
 				}
 			case "PASS":
@@ -192,18 +210,6 @@ func ircServer(listener net.Listener, t *testing.T, config *IRCConfig) {
 			if !part1 {
 				if !capSASL && hasNick && hasUser && hasPing && ((config.ServerPassword == "") || hasPass) {
 					part1 = true
-
-					// part 2:
-					var line string
-					for _, line = range []string{":irc.red-green.com 001 %s :Welcome to the RedGreen IRC Network",
-						":irc.red-green.com 002 %s :Your host is irc.red-green.com, running version UnrealIRCd-5.2.0.1",
-						":irc.red-green.com 375 %s :- irc.red-green.com Message of the Day -",
-						":irc.red-green.com 372 %s :- ",
-						":irc.red-green.com 376 %s :End of /MOTD command.",
-					} {
-						output = fmt.Sprintf(line, config.Nick)
-						ircWrite(server, output, t)
-					}
 				}
 			}
 		} else {
@@ -217,15 +223,38 @@ func ircServer(listener net.Listener, t *testing.T, config *IRCConfig) {
 		t.Error("Expected to pass part1 (user/nick/pong)")
 	}
 
-	// part 2: nickserv/register
-	var part2 bool
-
-	for _, line = range []string{":[email protected] NOTICE %s :This nickname is registered and protected.  If it is your",
-		":[email protected] NOTICE %s :nick, type \x02/msg NickServ IDENTIFY \x1fpassword\x1f\x02.  Otherwise,"} {
+	// Display MOTD
+	for _, line = range []string{":irc.red-green.com 001 %s :Welcome to the RedGreen IRC Network",
+		":irc.red-green.com 002 %s :Your host is irc.red-green.com, running version UnrealIRCd-5.2.0.1",
+		":irc.red-green.com 375 %s :- irc.red-green.com Message of the Day -",
+		":irc.red-green.com 372 %s :- ",
+		":irc.red-green.com 376 %s :End of /MOTD command.",
+	} {
 		output = fmt.Sprintf(line, config.Nick)
 		ircWrite(server, output, t)
 	}
 
+	if config.UseSASL {
+		if !successSASL {
+			log.Println("Failed SASL Authentication.")
+		}
+	}
+
+	// part 2: nickserv/register  (if not already registered with SASL)
+
+	var part2 bool
+
+	if successSASL {
+		ircWrite(server, fmt.Sprintf(":NickServ MODE %s :+r", config.Nick), t)
+		part2 = true
+	} else {
+		for _, line = range []string{":[email protected] NOTICE %s :This nickname is registered and protected.  If it is your",
+			":[email protected] NOTICE %s :nick, type \x02/msg NickServ IDENTIFY \x1fpassword\x1f\x02.  Otherwise,"} {
+			output = fmt.Sprintf(line, config.Nick)
+			ircWrite(server, output, t)
+		}
+	}
+
 	for !part2 {
 
 		line, err = reader.ReadString('\n')

irc-client.go

@@ -83,6 +83,13 @@ func (Config *IRCConfig) Connect() bool {
 		Config.Flood_Delay = 1000
 	}
 
+	if Config.UseSASL {
+		if !Config.UseTLS {
+			log.Println("Can't UseSASL if not using UseTLS")
+			Config.UseSASL = false
+		}
+	}
+
 	Config.Registered = false
 
 	if Config.ReadChannel == nil {
@@ -421,6 +428,7 @@ func (Config *IRCConfig) ReaderRoutine() {
 				// Failed SASL
 				Config.PriorityWrite("CAP END")
 				// Should we exit here?
+				Config.UseSASL = false
 			}
 
 			/*