Add auth for commands

auth.go

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"github.com/spf13/viper"
+	"github.com/thoj/go-ircevent"
+	"strings"
+)
+
+func (i *IRCCat) authorisedUser(nick string) bool {
+	_, exists := i.auth_users[nick]
+	return exists
+}
+
+func (i *IRCCat) handleJoin(e *irc.Event) {
+	if e.Arguments[0] == viper.GetString("commands.auth_channel") {
+		i.auth_users[e.Nick] = true
+	}
+}
+
+func (i *IRCCat) handlePart(e *irc.Event) {
+	if e.Arguments[0] == viper.GetString("commands.auth_channel") {
+		delete(i.auth_users, e.Nick)
+	}
+}
+
+func (i *IRCCat) handleNames(e *irc.Event) {
+	if e.Arguments[2] == viper.GetString("commands.auth_channel") {
+		nicks := strings.Split(e.Arguments[3], " ")
+		for _, nick := range nicks {
+			i.auth_users[nick] = true
+		}
+	}
+}

command.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+	"bytes"
+	"github.com/spf13/viper"
+	"github.com/thoj/go-ircevent"
+	"os/exec"
+	"strings"
+)
+
+func (i *IRCCat) handleCommand(event *irc.Event) {
+	msg := event.Message()
+	channel := ""
+	respond_to := event.Arguments[0]
+	if respond_to[0] != '#' {
+		respond_to = event.Nick
+	} else {
+		channel = respond_to
+	}
+
+	if event.Arguments[0][0] != '#' && !i.authorisedUser(event.Nick) {
+		// Command not in a channel, or not from an authorised user
+		log.Infof("Unauthorised command: %s (%s) %s", event.Nick, respond_to, msg)
+		return
+	}
+	log.Infof("Authorised command: %s (%s) %s", event.Nick, respond_to, msg)
+
+	parts := strings.SplitN(msg, " ", 1)
+
+	var cmd *exec.Cmd
+	if len(parts) == 1 {
+		cmd = exec.Command(viper.GetString("commands.handler"), event.Nick, channel, respond_to, parts[0][1:])
+	} else {
+		cmd = exec.Command(viper.GetString("commands.handler"), event.Nick, channel, respond_to, parts[0][1:], parts[1])
+	}
+	i.runCommand(cmd, respond_to)
+}
+
+// Run a command with the output going to the nick/channel identified by respond_to
+func (i *IRCCat) runCommand(cmd *exec.Cmd, respond_to string) {
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	cmd.Stderr = &out
+	err := cmd.Run()
+	if err != nil {
+		log.Errorf("Running command %s failed: %s", cmd.Args, err)
+		i.irc.Privmsgf(respond_to, "Command failed: %s", err)
+	}
+
+	lines := strings.Split(out.String(), "\n")
+	line_count := len(lines)
+	if line_count > viper.GetInt("commands.max_response_lines") {
+		line_count = viper.GetInt("commands.max_response_lines")
+	}
+
+	for _, line := range lines[0:line_count] {
+		if line != "" {
+			i.irc.Privmsg(respond_to, line)
+		}
+	}
+}

main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"crypto/tls"
 	"fmt"
 	"github.com/irccloud/irccat/httplistener"
@@ -10,9 +9,7 @@ import (
 	"github.com/spf13/viper"
 	"github.com/thoj/go-ircevent"
 	"os"
-	"os/exec"
 	"os/signal"
-	"strings"
 	"syscall"
 )
 
@@ -20,6 +17,7 @@ var log = loggo.GetLogger("main")
 
 type IRCCat struct {
 	control_chan string
+	auth_users   map[string]bool
 	irc          *irc.Connection
 	tcp          *tcplistener.TCPListener
 	signals      chan os.Signal
@@ -38,9 +36,8 @@ func main() {
 		log.Errorf("Error reading config file - exiting. I'm looking for irccat.[json|yaml|toml|hcl] in . or /etc")
 		return
 	}
+	irccat := IRCCat{auth_users: map[string]bool{}, signals: make(chan os.Signal, 1)}
 
-	irccat := IRCCat{}
-	irccat.signals = make(chan os.Signal, 1)
 	signal.Notify(irccat.signals, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
 	go irccat.signalHandler()
 
@@ -71,10 +68,9 @@ func (i *IRCCat) signalHandler() {
 
 func (i *IRCCat) connectIRC() error {
 	irccon := irc.IRC(viper.GetString("irc.nick"), viper.GetString("irc.realname"))
-	irccon.Debug = true
 	irccon.UseTLS = viper.GetBool("irc.tls")
 	if viper.GetBool("irc.tls_skip_verify") {
-		irccon.TLSConfig = &tls.Config{InsecureSkipVerify: true, MaxVersion: tls.VersionTLS11}
+		irccon.TLSConfig = &tls.Config{InsecureSkipVerify: true}
 	}
 
 	err := irccon.Connect(viper.GetString("irc.server"))
@@ -89,67 +85,17 @@ func (i *IRCCat) connectIRC() error {
 		}
 	})
 
+	irccon.AddCallback("353", i.handleNames)
+	irccon.AddCallback("JOIN", i.handleJoin)
+	irccon.AddCallback("PART", i.handlePart)
+	irccon.AddCallback("QUIT", i.handlePart)
+
 	i.irc = irccon
 	return nil
 }
 
-func (i *IRCCat) authorisedUser(nick string) bool {
-	return false
-}
-
 func (i *IRCCat) handleWelcome(e *irc.Event) {
 	for _, channel := range viper.GetStringSlice("irc.channels") {
 		i.irc.Join(channel)
 	}
 }
-
-func (i *IRCCat) handleCommand(event *irc.Event) {
-	msg := event.Message()
-	respond_to := event.Arguments[0]
-
-	if respond_to[0] != '#' && !i.authorisedUser(event.Nick) {
-		// Command not in a channel, or not from an authorised user
-		log.Infof("Unauthorised command: %s (%s) %s", event.Nick, respond_to, msg)
-		return
-	}
-	log.Infof("Authorised command: %s (%s) %s", event.Nick, respond_to, msg)
-
-	channel := ""
-	if respond_to[0] == '#' {
-		channel = respond_to
-	}
-
-	parts := strings.SplitN(msg, " ", 1)
-
-	var cmd *exec.Cmd
-	if len(parts) == 1 {
-		cmd = exec.Command(viper.GetString("commands.handler"), event.Nick, channel, respond_to, parts[0][1:])
-	} else {
-		cmd = exec.Command(viper.GetString("commands.handler"), event.Nick, channel, respond_to, parts[0][1:], parts[1])
-	}
-	i.runCommand(cmd, respond_to)
-}
-
-// Run a command with the output going to the nick/channel identified by respond_to
-func (i *IRCCat) runCommand(cmd *exec.Cmd, respond_to string) {
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	cmd.Stderr = &out
-	err := cmd.Run()
-	if err != nil {
-		log.Errorf("Running command %s failed: %s", cmd.Args, err)
-		i.irc.Privmsgf(respond_to, "Command failed: %s", err)
-	}
-
-	lines := strings.Split(out.String(), "\n")
-	line_count := len(lines)
-	if line_count > viper.GetInt("commands.max_response_lines") {
-		line_count = viper.GetInt("commands.max_response_lines")
-	}
-
-	for _, line := range lines[0:line_count] {
-		if line != "" {
-			i.irc.Privmsg(respond_to, line)
-		}
-	}
-}