Features/spring cleanup

.gitignore

@@ -0,0 +1 @@
+.env

.travis.yml

@@ -1,9 +1,10 @@
 language: go
 
 go:
-  - 1.1
+  - 1.2
+  - tip
 
 install:
   - go get github.com/BotBotMe/botbot-bot
 
-script: go test github.com/BotBotMe/botbot-bot
+script: go test github.com/BotBotMe/botbot-bot/...

README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/BotBotMe/botbot-bot.png)](https://travis-ci.org/BotBotMe/botbot-bot)
 
-The bot used in botbot.me. To install:
+The bot used in botbot.me is a Go (1.2) program. To install:
 
     go get github.com/BotBotMe/botbot-bot
 

botbot.go

@@ -72,14 +72,14 @@ func (self *BotBot) listen(queueName string) {
 }
 
 func (self *BotBot) mainLoop() {
-
-	go self.recordUserCounts()
+	// TODO (yml) comment out self.recordUserCounts because I think it is
+	// leaking postgres connection.
+	//go self.recordUserCounts()
 
 	var busCommand string
 	var args string
 	for {
 		select {
-
 		case serverLine, ok := <-self.fromServer:
 			if !ok {
 				// Channel is closed, we're offline. Stop.
@@ -120,6 +120,9 @@ func (self *BotBot) mainLoop() {
 //  - WRITE <chatbotid> <channel> <msg>: Send message to server
 //  - REFRESH: Reload plugin configuration
 func (self *BotBot) handleCommand(cmd string, args string) {
+	if glog.V(2) {
+		glog.Infoln("HandleCommand:", cmd)
+	}
 	switch cmd {
 	case "WRITE":
 		parts := strings.SplitN(args, " ", 3)

certs/README.md

@@ -0,0 +1,12 @@
+The certs included in this repo has been with `generate_cert` from the GO
+standard library.
+
+```
+generate_cert -ca=true -duration=8760h0m0s -host="127.0.0.1" -start-date="Jan 1 15:04:05 2014"
+```
+
+The generate_cert can be build like this
+
+```
+go build $GOROOT/src/pkg/crypto/tls/generate_cert.go
+```

certs/cert.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC8zCCAd2gAwIBAgIQLlTIDFFPizKZzJKC6j/k4jALBgkqhkiG9w0BAQswEjEQ
+MA4GA1UEChMHQWNtZSBDbzAeFw0xNDAxMDExNTA0MDVaFw0xNTAxMDExNTA0MDVa
+MBIxEDAOBgNVBAoTB0FjbWUgQ28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDMVw4BGI1GsAdye8rqiSUS/gOI1oGpdbHO/B99xxXib9VvqFx3pT4WkQdd
+OqAni7X4K4Td/3MBQ/K+Wy982wxR3pCHCWRxZ6iDQi/TPMRqP8hSufTyRd/QA+bj
+UEXUh4Orq3VthIq0i4TjML9rC14pJy/ldb80clHLoVdx2uz3t52k0VZS1QMwLLpW
+l3khpjO7ICUsdfFda+oMbroQPlgSEg69QcBLmwTuxJ7Y2PRVK6nWU/2+fGKQQXGT
+PA9jU/zHt/7voUA9I1zXM1s7e1ExRbD4MFlaLwUo0qlbLL0dsIFURiJh3fBvgum/
+T7NQRvEJQQFx25S6/zyxn1VwKcVbAgMBAAGjSTBHMA4GA1UdDwEB/wQEAwIApDAT
+BgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MA8GA1UdEQQIMAaH
+BH8AAAEwCwYJKoZIhvcNAQELA4IBAQA8YZJmhOwIYEhUzObwQQzcJY3ZrUN7AiEc
+sQnFaqOmzrtP0SDjWPlMITXeHV84Zw5+taIv1OQ3IyG9z+BPgIAkHQYVuVILrYOU
+nVGs9bxdcrhKLwKVXEUoRsa+FY3NG8r7HTO+jYveXoXBjqA3NT7CmlJ3QtJJiCD/
+5S5u1KwfAZQ7xcrigBxTyRSpR/m0APGDGqrf5mKUcQVkGF9RIEDWOuCoqr1He9GZ
+ba6HNYeEQrsdooazi9xbR2bk6F0Wa2Pt4YpS5Zy3KVuhxwbo43houwifhjF23MM/
+4DmoVl1copKHf/dMSsiDbGDeF2g/Z6Q2X790ijDOnxkOEbpjyuHP
+-----END CERTIFICATE-----

certs/key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAzFcOARiNRrAHcnvK6oklEv4DiNaBqXWxzvwffccV4m/Vb6hc
+d6U+FpEHXTqgJ4u1+CuE3f9zAUPyvlsvfNsMUd6QhwlkcWeog0Iv0zzEaj/IUrn0
+8kXf0APm41BF1IeDq6t1bYSKtIuE4zC/awteKScv5XW/NHJRy6FXcdrs97edpNFW
+UtUDMCy6Vpd5IaYzuyAlLHXxXWvqDG66ED5YEhIOvUHAS5sE7sSe2Nj0VSup1lP9
+vnxikEFxkzwPY1P8x7f+76FAPSNc1zNbO3tRMUWw+DBZWi8FKNKpWyy9HbCBVEYi
+Yd3wb4Lpv0+zUEbxCUEBcduUuv88sZ9VcCnFWwIDAQABAoIBAQDGY07JaZjgJE9W
+qzGa+4PvKIct93Tznb0ABHBeoUdyDLngKkl8MAZTyoKn1R9gxZfqVfYtwrFZbSrj
+/YvhYJpZcghH0qqeH9HPfhcIs1rO/RX0m25hOc3OG7uyvmDNsrP3nAPqTGCOYVan
+bNCrkOHeeplZ4jO9K7CWTxKjC7Y92V1EL1IW1H3NU7z+6gA/r5JRUhrSljR37sja
+RIc3kBPqfo+qlwTSQ8m9A8dKVQro6Lj8xzSUxwZbDRV83GJDQS0UWDRZEbxO/6Oq
+xNp6LEeFjjgI4CpKtPogGkOrcrOTRlZt4Y0bFaEYmKjsMepUIBmf7rbT/C9dfJKc
+76YzTnnBAoGBANCBB43/jJuOyvwVM+n7mn0/dRBhnioe0ffONu0EXKx42JFUZ2hf
+nnFbFQDjQU5EJDyWmz7gRSbcWXOBdrLwhLfqgOs4NBO9IYfw8tCjFfvLieo1cC1g
+k++qfxQWSGlLOqLHmH89a2Zo+n6E2bVHZeEPLtx9BaKsDu/JjtFcn8bpAoGBAPrj
+M9RvY0tpPcfmoBch3LYseGLPonbVJLOea2xOyQRgUuzSD8rfcoKL9HrmLGV1jP7b
+dUamOle+1gOIjMN/NDTULnbU3of9Jpg7sM4QN58Ae2VVheJiP7vQ3mQMVGQFNjZn
+PqkHsX8SrSufjJPXXZpyEB8eoncEOHrEXCSY98ejAoGAUKTXSzDALZp5IC8DOUi7
+ZB4bJQ7coeXxyCrWS64YOg0zlmJS7KevHKDh6sn7BE6OxXBq81LC7FjlsCsuwd8N
+NiVZX6EJY2kPgwjKoa+yXQVIfnHUxXhJP7VuGVLVBwS11Sfl77DNzXplCHJR0i+f
+VAEPWvBwMY7i6BPJTWjJ06ECgYB+PuoL0ekzP0f5WVHhkgaQHRyPDFCCX4rSX7tK
+ivKYIyhXRvTvbzUd//MMDNr2SwqiDCidXnQpRzxGFuZOUaohk0u2PDOmVnqfTBoR
+9xMmDYYKXdi7LBlKFzZxPcsRcZXwFk/vmpF0kh9VvjltA4h0eUUng7DZFuSc0kZT
+nC3C5QKBgQCfg1NASP4WsANzaLABzfDKbQ23pxb9eqBWGVESEPhzUoqiTZ0rSDl4
+5oY7Dx9RGIJxPQWoG3nxjAK3GnlArUEJf4S/YMFmOX0naXp4HW4RxODPNoxnaQG0
+NfDb7xAuQNgY2F5T9dK02EPJ0tamsJbvHxVZLm1eiU2HPcK1ZurRfw==
+-----END RSA PRIVATE KEY-----

common/common.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"io"
+	"strings"
 )
 
 // Interface all bots must implement
@@ -15,11 +16,23 @@ type ChatBot interface {
 
 // Configuration for a 'chatbot', which is what clients pay for
 type BotConfig struct {
-	Id     int
-	Config map[string]string
+	Id       int
+	Config   map[string]string
+	Channels []*Channel
+}
+
+// Configuration for a channel
+type Channel struct {
+	Id          int
+	Name        string
+	Pwd         string
+	Fingerprint string
+}
+
+func (cc *Channel) Credential() string {
+	return strings.TrimSpace(cc.Name + " " + cc.Pwd)
+}
 
-	// Normally this array is names of the channels to join
-	// but if the channel has a password, the string is "<channel> <pw>"
-	// That means we can pass the string straight to JOIN and it works
-	Channels []string
+func (cc *Channel) String() string {
+	return cc.Name
 }

common/mock.go

@@ -2,15 +2,65 @@ package common
 
 import (
 	"bufio"
-	"net"
+	"crypto/tls"
+	"flag"
+	"log"
+	"sync"
 	"testing"
+	"time"
+
+	"github.com/golang/glog"
 )
 
+// SetGlogFlags walk around a glog issue and force it to log to stderr.
+// It need to be called at the beginning of each test.
+func SetGlogFlags() {
+	flag.Set("alsologtostderr", "true")
+	flag.Set("V", "3")
+}
+
+// MockSocket is a dummy implementation of ReadWriteCloser
+type MockSocket struct {
+	sync.RWMutex
+	Counter  chan bool
+	Receiver chan string
+}
+
+func (sock MockSocket) Write(data []byte) (int, error) {
+	glog.V(3).Infoln("[Debug]: Starting MockSocket.Write of:", string(data))
+	if sock.Counter != nil {
+		sock.Counter <- true
+	}
+	if sock.Receiver != nil {
+		sock.Receiver <- string(data)
+	}
+
+	return len(data), nil
+}
+
+func (sock MockSocket) Read(into []byte) (int, error) {
+	sock.RLock()
+	defer sock.RUnlock()
+	time.Sleep(time.Second) // Prevent busy loop
+	return 0, nil
+}
+
+func (sock MockSocket) Close() error {
+	if sock.Receiver != nil {
+		close(sock.Receiver)
+	}
+	if sock.Counter != nil {
+		close(sock.Counter)
+	}
+	return nil
+}
+
 /*
  * Mock IRC server
  */
 
 type MockIRCServer struct {
+	sync.RWMutex
 	Port    string
 	Message string
 	Got     []string
@@ -24,44 +74,63 @@ func NewMockIRCServer(msg, port string) *MockIRCServer {
 	}
 }
 
-func (self *MockIRCServer) Run(t *testing.T) {
+func (srv *MockIRCServer) GotLength() int {
+	srv.RLock()
+	defer srv.RUnlock()
+	return len(srv.Got)
+}
 
-	listener, err := net.Listen("tcp", ":"+self.Port)
+func (srv *MockIRCServer) Run(t *testing.T) {
+	// Use the certs generated with generate_certs
+	cert, err := tls.LoadX509KeyPair("certs/cert.pem", "certs/key.pem")
 	if err != nil {
-		t.Error("Error starting mock server on "+self.Port, err)
-		return
+		log.Fatalf("server: loadkeys: %s", err)
 	}
-
-	// Accept a single connection
-	conn, lerr := listener.Accept()
-	if lerr != nil {
-		t.Error("Error on IRC server on Accept. ", err)
+	config := tls.Config{Certificates: []tls.Certificate{cert}}
+	listener, err := tls.Listen("tcp", "127.0.0.1:"+srv.Port, &config)
+	if err != nil {
+		t.Error("Error starting mock server on "+srv.Port, err)
+		return
 	}
 
-	// First message triggers BotBot to send USER and NICK messages
-	conn.Write([]byte(":hybrid7.debian.local NOTICE AUTH :*** Looking up your hostname...\n"))
-
-	// Ask for NickServ auth, and pretend we got it
-	conn.Write([]byte(":NickServ!NickServ@services. NOTICE graham_king :This nickname is registered. Please choose a different nickname, or identify via /msg NickServ identify <password>\n"))
-	conn.Write([]byte(":NickServ!NickServ@services. NOTICE graham_king :You are now identified for graham_king.\n"))
+	for {
+		conn, lerr := listener.Accept()
+		// If create a new connection throw the old data away
+		// This can happen if a client trys to connect with tls
+		// Got will store the handshake data. The cient will try
+		// connect with a plaintext connect after the tls fails.
+		srv.Lock()
+		srv.Got = make([]string, 0)
+		srv.Unlock()
 
-	conn.Write([]byte(":wolfe.freenode.net 001 graham_king :Welcome to the freenode Internet Relay Chat Network graham_king\n"))
+		if lerr != nil {
+			t.Error("Error on IRC server on Accept. ", err)
+		}
 
-	// This should get sent to plugins
-	conn.Write([]byte(":[email protected] PRIVMSG #unit :" + self.Message + "\n"))
-	//conn.Write([]byte("test: " + self.Message + "\n"))
+		// First message triggers BotBot to send USER and NICK messages
+		conn.Write([]byte(":hybrid7.debian.local NOTICE AUTH :*** Looking up your hostname...\n"))
+		// Ask for NickServ auth, and pretend we got it
+		conn.Write([]byte(":NickServ!NickServ@services. NOTICE graham_king :This nickname is registered. Please choose a different nickname, or identify via /msg NickServ identify <password>\n"))
+		conn.Write([]byte(":NickServ!NickServ@services. NOTICE graham_king :You are now identified for graham_king.\n"))
+		conn.Write([]byte(":wolfe.freenode.net 001 graham_king :Welcome to the freenode Internet Relay Chat Network graham_king\n"))
+		// This should get sent to plugins
+		conn.Write([]byte(":[email protected] PRIVMSG #unit :" + srv.Message + "\n"))
+		conn.Write([]byte("test: " + srv.Message + "\n"))
 
-	var derr error
-	var data []byte
+		var derr error
+		var data []byte
 
-	bufRead := bufio.NewReader(conn)
-	for {
-		data, derr = bufRead.ReadBytes('\n')
-		if derr != nil {
-			// Client closed connection
-			break
+		bufRead := bufio.NewReader(conn)
+		for {
+			data, derr = bufRead.ReadBytes('\n')
+			if derr != nil {
+				// Client closed connection
+				break
+			}
+			srv.Lock()
+			srv.Got = append(srv.Got, string(data))
+			srv.Unlock()
 		}
-		self.Got = append(self.Got, string(data))
 	}
 
 }

common/queue.go

@@ -4,6 +4,9 @@ import (
 	"net"
 	"net/url"
 	"os"
+	"strconv"
+	"strings"
+	"sync"
 	"time"
 
 	"github.com/golang/glog"
@@ -38,6 +41,7 @@ type Queue interface {
 
 // Simplistic Queue implementation used by the test suite
 type MockQueue struct {
+	sync.RWMutex
 	Got         map[string][]string
 	ReadChannel chan string
 }
@@ -49,23 +53,29 @@ func NewMockQueue() *MockQueue {
 	}
 }
 
-func (self *MockQueue) Publish(queue string, message []byte) error {
-	self.Got[queue] = append(self.Got[queue], string(message))
+func (mq *MockQueue) Publish(queue string, message []byte) error {
+	mq.Lock()
+	defer mq.Unlock()
+	mq.Got[queue] = append(mq.Got[queue], string(message))
 	return nil
 }
 
-func (self *MockQueue) Rpush(key string, val []byte) error {
-	self.Got[key] = append(self.Got[key], string(val))
+func (mq *MockQueue) Rpush(key string, val []byte) error {
+	mq.Lock()
+	defer mq.Unlock()
+	mq.Got[key] = append(mq.Got[key], string(val))
 	return nil
 }
 
-func (self *MockQueue) Blpop(keys []string, timeoutsecs uint) (*string, []byte, error) {
-	val := <-self.ReadChannel
+func (mq *MockQueue) Blpop(keys []string, timeoutsecs uint) (*string, []byte, error) {
+	val := <-mq.ReadChannel
 	return &keys[0], []byte(val), nil
 }
 
-func (self *MockQueue) Llen(key string) (int, error) {
-	return len(self.Got), nil
+func (mq *MockQueue) Llen(key string) (int, error) {
+	mq.RLock()
+	defer mq.RUnlock()
+	return len(mq.Got), nil
 }
 
 func (self *MockQueue) Ltrim(key string, start int, end int) error {
@@ -86,15 +96,21 @@ type RedisQueue struct {
 }
 
 func NewRedisQueue() Queue {
-	redisUrlString := os.Getenv("QUEUE_URL")
+	redisUrlString := os.Getenv("REDIS_PLUGIN_QUEUE_URL")
 	if redisUrlString == "" {
-		glog.Fatal("QUEUE_URL cannot be empty.\nexport QUEUE_URL=redis://host:port/db_number")
+		glog.Fatal("REDIS_PLUGIN_QUEUE_URL cannot be empty.\nexport REDIS_PLUGIN_QUEUE_URL=redis://host:port/db_number")
 	}
 	redisUrl, err := url.Parse(redisUrlString)
 	if err != nil {
 		glog.Fatal("Could not read Redis string", err)
 	}
-	redisQueue := goredis.Client{Addr: redisUrl.Host}
+
+	redisDb, err := strconv.Atoi(strings.TrimLeft(redisUrl.Path, "/"))
+	if err != nil {
+		glog.Fatal("Could not read Redis path", err)
+	}
+
+	redisQueue := goredis.Client{Addr: redisUrl.Host, Db: redisDb}
 	s := RedisQueue{queue: &redisQueue}
 	s.waitForRedis()
 	return &s