Merge remote-tracking branch 'origin/master' into cap-protocol

Conflicts:
	irc/server.go

README.md

@@ -6,12 +6,11 @@ and issues are welcome.
 ## Some Features
 
 - follows the RFC where possible
-- JSON-based configuration
+- gcfg gitconfig-style configuration
-- server password
+- server password (PASS command)
-- channels with many standard modes
+- channels with most standard modes
-- IRC operators
+- IRC operators (OPER command)
-- TLS support (but better to use stunnel with proxy protocol)
+- haproxy [PROXY protocol](http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt) header for hostname setting
-- haproxy PROXY protocol header for hostname setting
 - passwords stored in bcrypt format
 - channels that persist between restarts (+P)
 
@@ -23,27 +22,39 @@ I wanted to learn Go.
 
 "Ergonomadic" is an anagram of "Go IRC Daemon".
 
+## What about SSL/TLS support?
+
+Go has a not-yet-verified-as-safe TLS 1.2 implementation. Sadly, many
+popular IRC clients will negotiate nothing newer than SSLv2. If you
+want to use SSL to protect traffic, I recommend using
+[stunnel](https://www.stunnel.org/index.html) version 4.56 with
+haproxy's
+[PROXY protocol](http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt). This
+will allow the server to get the client's original addresses for
+hostname lookups.
+
 ## Installation
 
 ```sh
 go get
 go install
-ergonomadic -conf '/path/to/config.json' -initdb
+ergonomadic -conf ergonomadic.conf -initdb
 ```
 
 ## Configuration
 
-See the example `config.json`. Passwords are base64-encoded bcrypted
+See the example `ergonomadic.conf`. Passwords are base64-encoded
-byte strings. You can generate them with the `genpasswd` subcommand.
+bcrypted byte strings. You can generate them with the `genpasswd`
+subcommand.
 
 ```sh
-ergonomadic -genpasswd 'hunter21!'
+ergonomadic -genpasswd 'hunter2!'
 ```
 
 ## Running the Server
 
 ```sh
-ergonomadic -conf '/path/to/config.json'
+ergonomadic -conf ergonomadic.conf
 ```
 
 ## Helpful Documentation

config.json

@@ -1,39 +0,0 @@
-// Ergonomadic IRC Server Config
-// -----------------------------
-// Passwords are generated by `ergonomadic -genpasswd "$plaintext"`.
-// Comments are not allowed in the actual config file.
-{
-    // `name` is usually a hostname.
-    "name": "irc.example.com",
-
-    // The path to the MOTD is relative to this file's directory.
-    "motd": "motd.txt",
-
-    // PASS command password
-    "password": "JDJhJDA0JHBBenUyV3Z5UU5iWUpiYmlNMlNLZC5VRDZDM21HUzFVbmxLUUI3NTVTLkZJOERLdUFaUWNt",
-
-    // `listeners` are places to bind and listen for
-    // connections. http://golang.org/pkg/net/#Dial demonstrates valid
-    // values for `net` and `address`. `net` is optional and defaults
-    // to `tcp`.
-    "listeners": [ {
-        "address": "localhost:7777"
-    }, {
-        "net": "tcp6",
-        "address": "[::1]:7777"
-    } ],
-
-    // Operators for the OPER command
-    "operators": [ {
-        "name": "root",
-        "password": "JDJhJDA0JHBBenUyV3Z5UU5iWUpiYmlNMlNLZC5VRDZDM21HUzFVbmxLUUI3NTVTLkZJOERLdUFaUWNt"
-    } ],
-
-    // Global debug flags. `net` generates a lot of output.
-    "debug": {
-        "net": true,
-        "client": false,
-        "channel": false,
-        "server": false
-    }
-}

ergonomadic.conf

@@ -0,0 +1,16 @@
+[server]
+name = "irc.example.com" ; required, usually a hostname
+database = "ergonomadic.db" ; path relative to this file
+listen = "localhost:6667" ; see `net.Listen` for examples
+listen = "[::1]:6667" ; multiple `listen`s are allowed.
+motd = "motd.txt" ; path relative to this file
+password = "JDJhJDA0JHJzVFFlNXdOUXNhLmtkSGRUQVVEVHVYWXRKUmdNQ3FKVTRrczRSMTlSWGRPZHRSMVRzQmtt" ; 'test'
+
+[operator "root"]
+password = "JDJhJDA0JEhkcm10UlNFRkRXb25iOHZuSDVLZXVBWlpyY0xyNkQ4dlBVc1VMWVk1LlFjWFpQbGxZNUtl" ; 'toor'
+
+[debug]
+net = true
+client = false
+channel = false
+server = false

ergonomadic.go

@@ -1,73 +1,49 @@
 package main
 
 import (
-	"code.google.com/p/go.crypto/bcrypt"
-	"database/sql"
-	"encoding/base64"
 	"flag"
 	"fmt"
 	"github.com/jlatt/ergonomadic/irc"
-	_ "github.com/mattn/go-sqlite3"
 	"log"
 	"os"
+	"path/filepath"
 )
 
-func genPasswd(passwd string) {
-	crypted, err := bcrypt.GenerateFromPassword([]byte(passwd), bcrypt.MinCost)
-	if err != nil {
-		log.Fatal(err)
-	}
-	encoded := base64.StdEncoding.EncodeToString(crypted)
-	fmt.Println(encoded)
-}
-
-func initDB(config *irc.Config) {
-	os.Remove(config.Database())
-
-	db, err := sql.Open("sqlite3", config.Database())
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-
-	_, err = db.Exec(`
-        CREATE TABLE channel (
-          name TEXT NOT NULL UNIQUE,
-          flags TEXT NOT NULL,
-          key TEXT NOT NULL,
-          topic TEXT NOT NULL,
-          user_limit INTEGER DEFAULT 0)`)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
 func main() {
-	conf := flag.String("conf", "ergonomadic.json", "ergonomadic config file")
+	conf := flag.String("conf", "ergonomadic.conf", "ergonomadic config file")
 	initdb := flag.Bool("initdb", false, "initialize database")
 	passwd := flag.String("genpasswd", "", "bcrypt a password")
 	flag.Parse()
 
 	if *passwd != "" {
-		genPasswd(*passwd)
+		encoded, err := irc.GenerateEncodedPassword(*passwd)
+		if err != nil {
+			log.Fatal("encoding error: ", err)
+		}
+		fmt.Println(encoded)
 		return
 	}
 
 	config, err := irc.LoadConfig(*conf)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatal("error loading config: ", err)
+	}
+	err = os.Chdir(filepath.Dir(*conf))
+	if err != nil {
+		log.Fatal("chdir error: ", err)
 	}
 
 	if *initdb {
-		initDB(config)
+		irc.InitDB(config.Server.Database)
+		log.Println("database initialized: " + config.Server.Database)
 		return
 	}
 
 	// TODO move to data structures
-	irc.DEBUG_NET = config.Debug["net"]
+	irc.DEBUG_NET = config.Debug.Net
-	irc.DEBUG_CLIENT = config.Debug["client"]
+	irc.DEBUG_CLIENT = config.Debug.Client
-	irc.DEBUG_CHANNEL = config.Debug["channel"]
+	irc.DEBUG_CHANNEL = config.Debug.Channel
-	irc.DEBUG_SERVER = config.Debug["server"]
+	irc.DEBUG_SERVER = config.Debug.Server
 
 	irc.NewServer(config).Run()
 }

irc/channel.go

@@ -464,9 +464,8 @@ func (channel *Channel) Invite(invitee *Client, inviter *Client) {
 		return
 	}
 
-	// TODO Modify channel masks
 	inviter.RplInviting(invitee, channel.name)
-	invitee.Reply(RplInviteMsg(inviter, channel.name))
+	invitee.Reply(RplInviteMsg(inviter, invitee, channel.name))
 	if invitee.flags[Away] {
 		inviter.RplAway(invitee)
 	}

irc/commands.go

@@ -1,7 +1,6 @@
 package irc
 
 import (
-	"code.google.com/p/go.crypto/bcrypt"
 	"code.google.com/p/go.text/unicode/norm"
 	"errors"
 	"fmt"
@@ -214,7 +213,7 @@ func (cmd *PassCommand) CheckPassword() {
 	if cmd.hash == nil {
 		return
 	}
-	cmd.err = bcrypt.CompareHashAndPassword(cmd.hash, cmd.password)
+	cmd.err = ComparePassword(cmd.hash, cmd.password)
 }
 
 func NewPassCommand(args []string) (editableCommand, error) {

irc/config.go

@@ -1,91 +1,67 @@
 package irc
 
 import (
-	"encoding/base64"
+	"code.google.com/p/gcfg"
-	"encoding/json"
+	"errors"
 	"log"
-	"os"
-	"path/filepath"
 )
 
-func decodePassword(password string) []byte {
+type PassConfig struct {
-	if password == "" {
+	Password string
-		return nil
+}
-	}
+
-	bytes, err := base64.StdEncoding.DecodeString(password)
+func (conf *PassConfig) PasswordBytes() []byte {
+	bytes, err := DecodePassword(conf.Password)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatal("decode password error: ", err)
 	}
 	return bytes
 }
 
 type Config struct {
-	Debug     map[string]bool
+	Server struct {
-	Listeners []ListenerConfig
+		PassConfig
-	MOTD      string
+		Database string
-	Name      string
+		Listen   []string
-	Operators []OperatorConfig
+		MOTD     string
-	Password  string
+		Name     string
-	directory string
+	}
+
+	Operator map[string]*PassConfig
+
+	Debug struct {
+		Net     bool
+		Client  bool
+		Channel bool
+		Server  bool
+	}
 }
 
-func (conf *Config) Database() string {
+func (conf *Config) Operators() map[string][]byte {
-	return filepath.Join(conf.directory, "ergonomadic.db")
-}
-
-func (conf *Config) PasswordBytes() []byte {
-	return decodePassword(conf.Password)
-}
-
-func (conf *Config) OperatorsMap() map[string][]byte {
 	operators := make(map[string][]byte)
-	for _, opConf := range conf.Operators {
+	for name, opConf := range conf.Operator {
-		operators[opConf.Name] = opConf.PasswordBytes()
+		operators[name] = opConf.PasswordBytes()
 	}
 	return operators
 }
 
-type OperatorConfig struct {
-	Name     string
-	Password string
-}
-
-func (conf *OperatorConfig) PasswordBytes() []byte {
-	return decodePassword(conf.Password)
-}
-
-type ListenerConfig struct {
-	Net         string
-	Address     string
-	Key         string
-	Certificate string
-}
-
-func (config *ListenerConfig) IsTLS() bool {
-	return (config.Key != "") && (config.Certificate != "")
-}
-
 func LoadConfig(filename string) (config *Config, err error) {
 	config = &Config{}
-
+	err = gcfg.ReadFileInto(config, filename)
-	file, err := os.Open(filename)
 	if err != nil {
 		return
 	}
-	defer file.Close()
+	if config.Server.Name == "" {
-
+		err = errors.New("server.name missing")
-	decoder := json.NewDecoder(file)
-	err = decoder.Decode(config)
-	if err != nil {
 		return
 	}
-
+	if config.Server.Database == "" {
-	config.directory = filepath.Dir(filename)
+		err = errors.New("server.database missing")
-	config.MOTD = filepath.Join(config.directory, config.MOTD)
+		return
-	for _, lconf := range config.Listeners {
+	}
-		if lconf.Net == "" {
+	if len(config.Server.Listen) == 0 {
-			lconf.Net = "tcp"
+		err = errors.New("server.listen missing")
-		}
+		return
 	}
 	return
 }

irc/constants.go

@@ -19,11 +19,11 @@ var (
 	// regexps
 	ChannelNameExpr = regexp.MustCompile(`^[&!#+][\pL\pN]{1,63}$`)
 	NicknameExpr    = regexp.MustCompile(
-		"^[\\pL\\[\\]{}^`][\\pL\\pN\\[\\]{}^`]{1,31}$")
+		"^[\\pL\\[\\]{}^`_][\\pL\\pN\\[\\]{}^`_|]{1,31}$")
 )
 
 const (
-	SEM_VER       = "ergonomadic-1.2.11"
+	SEM_VER       = "ergonomadic-1.2.13"
 	CRLF          = "\r\n"
 	MAX_REPLY_LEN = 512 - len(CRLF)
 

irc/database.go

@@ -0,0 +1,32 @@
+package irc
+
+import (
+	"database/sql"
+	_ "github.com/mattn/go-sqlite3"
+	"log"
+	"os"
+)
+
+func InitDB(path string) {
+	os.Remove(path)
+	db := OpenDB(path)
+	defer db.Close()
+	_, err := db.Exec(`
+        CREATE TABLE channel (
+          name TEXT NOT NULL UNIQUE,
+          flags TEXT NOT NULL,
+          key TEXT NOT NULL,
+          topic TEXT NOT NULL,
+          user_limit INTEGER DEFAULT 0)`)
+	if err != nil {
+		log.Fatal("initdb error: ", err)
+	}
+}
+
+func OpenDB(path string) *sql.DB {
+	db, err := sql.Open("sqlite3", path)
+	if err != nil {
+		log.Fatal("open db error: ", err)
+	}
+	return db
+}

irc/password.go

@@ -0,0 +1,37 @@
+package irc
+
+import (
+	"code.google.com/p/go.crypto/bcrypt"
+	"encoding/base64"
+	"errors"
+)
+
+var (
+	EmptyPasswordError = errors.New("empty password")
+)
+
+func GenerateEncodedPassword(passwd string) (encoded string, err error) {
+	if passwd == "" {
+		err = EmptyPasswordError
+		return
+	}
+	bcrypted, err := bcrypt.GenerateFromPassword([]byte(passwd), bcrypt.MinCost)
+	if err != nil {
+		return
+	}
+	encoded = base64.StdEncoding.EncodeToString(bcrypted)
+	return
+}
+
+func DecodePassword(encoded string) (decoded []byte, err error) {
+	if encoded == "" {
+		err = EmptyPasswordError
+		return
+	}
+	decoded, err = base64.StdEncoding.DecodeString(encoded)
+	return
+}
+
+func ComparePassword(hash, password []byte) error {
+	return bcrypt.CompareHashAndPassword(hash, password)
+}

irc/reply.go

@@ -128,8 +128,8 @@ func RplError(message string) string {
 	return NewStringReply(nil, ERROR, ":%s", message)
 }
 
-func RplInviteMsg(inviter *Client, channel string) string {
+func RplInviteMsg(inviter *Client, invitee *Client, channel string) string {
-	return NewStringReply(inviter, INVITE, channel)
+	return NewStringReply(inviter, INVITE, "%s :%s", invitee.Nick(), channel)
 }
 
 func RplKick(channel *Channel, client *Client, target *Client, comment string) string {

irc/server.go

@@ -2,12 +2,8 @@ package irc
 
 import (
 	"bufio"
-	"crypto/rand"
-	"crypto/tls"
 	"database/sql"
-	"encoding/binary"
 	"fmt"
-	_ "github.com/mattn/go-sqlite3"
 	"log"
 	"net"
 	"os"
@@ -16,6 +12,7 @@ import (
 	"runtime/debug"
 	"runtime/pprof"
 	"strings"
+	"syscall"
 	"time"
 )
 
@@ -35,34 +32,30 @@ type Server struct {
 }
 
 func NewServer(config *Config) *Server {
-	db, err := sql.Open("sqlite3", config.Database())
-	if err != nil {
-		log.Fatal(err)
-	}
-
 	server := &Server{
 		channels:  make(ChannelNameMap),
 		clients:   make(ClientNameMap),
 		commands:  make(chan Command, 16),
 		ctime:     time.Now(),
-		db:        db,
+		db:        OpenDB(config.Server.Database),
 		idle:      make(chan *Client, 16),
-		motdFile:  config.MOTD,
+		motdFile:  config.Server.MOTD,
-		name:      config.Name,
+		name:      config.Server.Name,
 		newConns:  make(chan net.Conn, 16),
-		operators: config.OperatorsMap(),
+		operators: config.Operators(),
-		password:  config.PasswordBytes(),
+		password:  config.Server.PasswordBytes(),
 		signals:   make(chan os.Signal, 1),
 	}
 
-	signal.Notify(server.signals, os.Interrupt, os.Kill)
-
 	server.loadChannels()
 
-	for _, listenerConf := range config.Listeners {
+	for _, addr := range config.Server.Listen {
-		go server.listen(listenerConf)
+		go server.listen(addr)
 	}
 
+	signal.Notify(server.signals, syscall.SIGINT, syscall.SIGHUP,
+		syscall.SIGTERM, syscall.SIGQUIT)
+
 	return server
 }
 
@@ -71,7 +64,7 @@ func (server *Server) loadChannels() {
         SELECT name, flags, key, topic, user_limit
           FROM channel`)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatal("error loading channels: ", err)
 	}
 	for rows.Next() {
 		var name, flags, key, topic string
@@ -128,14 +121,20 @@ func (server *Server) processCommand(cmd Command) {
 	}
 }
 
+func (server *Server) Shutdown() {
+	server.db.Close()
+	for _, client := range server.clients {
+		client.Reply(RplNotice(server, client, "shutting down"))
+	}
+}
+
 func (server *Server) Run() {
 	done := false
 	for !done {
 		select {
 		case <-server.signals:
-			server.db.Close()
+			server.Shutdown()
 			done = true
-			continue
 
 		case conn := <-server.newConns:
 			NewClient(server, conn)
@@ -149,33 +148,18 @@ func (server *Server) Run() {
 	}
 }
 
-func newListener(config ListenerConfig) (net.Listener, error) {
-	if config.IsTLS() {
-		certificate, err := tls.LoadX509KeyPair(config.Certificate, config.Key)
-		if err != nil {
-			return nil, err
-		}
-		return tls.Listen("tcp", config.Address, &tls.Config{
-			Certificates:             []tls.Certificate{certificate},
-			PreferServerCipherSuites: true,
-		})
-	}
-
-	return net.Listen("tcp", config.Address)
-}
-
 //
 // listen goroutine
 //
 
-func (s *Server) listen(config ListenerConfig) {
+func (s *Server) listen(addr string) {
-	listener, err := newListener(config)
+	listener, err := net.Listen("tcp", addr)
 	if err != nil {
 		log.Fatal(s, "listen error: ", err)
 	}
 
 	if DEBUG_SERVER {
-		log.Printf("%s listening on %s", s, config.Address)
+		log.Printf("%s listening on %s", s, addr)
 	}
 
 	for {
@@ -194,24 +178,6 @@ func (s *Server) listen(config ListenerConfig) {
 	}
 }
 
-func (s *Server) GenerateGuestNick() string {
-	bytes := make([]byte, 8)
-	for {
-		_, err := rand.Read(bytes)
-		if err != nil {
-			panic(err)
-		}
-		randInt, n := binary.Uvarint(bytes)
-		if n <= 0 {
-			continue // TODO handle error
-		}
-		nick := fmt.Sprintf("guest%d", randInt)
-		if s.clients.Get(nick) == nil {
-			return nick
-		}
-	}
-}
-
 //
 // server functionality
 //
@@ -880,9 +846,8 @@ func (msg *InviteCommand) HandleServer(server *Server) {
 
 	channel := server.channels.Get(msg.channel)
 	if channel == nil {
-		name := strings.ToLower(msg.channel)
+		client.RplInviting(target, msg.channel)
-		client.RplInviting(target, name)
+		target.Reply(RplInviteMsg(client, target, msg.channel))
-		target.Reply(RplInviteMsg(client, name))
 		return
 	}