Ability to listen on raw and TLS sockets simultaneously

[goircd.git] / daemon.go

diff --git a/daemon.go b/daemon.go
index 06916b0d6c39649dd4e5d519a72347fa72125ffd..2bf696ce31229c86a744f0ee64d4c9f287894d32 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -25,6 +25,7 @@ import (
        "regexp"
        "sort"
        "strings"
+       "sync"
        "time"
 )
 
@@ -38,8 +39,11 @@ var (
        RENickname = regexp.MustCompile("^[a-zA-Z0-9-]{1,9}$")
 )
 
+var passwordsRefreshLock sync.Mutex
+
 type Daemon struct {
        Verbose            bool
+       version            string
        hostname           string
        motd               string
        clients            map[*Client]bool
@@ -49,10 +53,11 @@ type Daemon struct {
        lastAlivenessCheck time.Time
        logSink            chan<- LogEvent
        stateSink          chan<- StateEvent
+       passwords          map[string]string
 }
 
-func NewDaemon(hostname, motd string, logSink chan<- LogEvent, stateSink chan<- StateEvent) *Daemon {
-       daemon := Daemon{hostname: hostname, motd: motd}
+func NewDaemon(version, hostname, motd string, logSink chan<- LogEvent, stateSink chan<- StateEvent) *Daemon {
+       daemon := Daemon{version: version, hostname: hostname, motd: motd}
        daemon.clients = make(map[*Client]bool)
        daemon.clientAliveness = make(map[*Client]*ClientAlivenessState)
        daemon.rooms = make(map[string]*Room)
@@ -154,6 +159,12 @@ func (daemon *Daemon) SendList(client *Client, cols []string) {
 // When client finishes NICK/USER workflow, then MOTD and LUSERS are send to him.
 func (daemon *Daemon) ClientRegister(client *Client, command string, cols []string) {
        switch command {
+       case "PASS":
+               if len(cols) == 1 || len(cols[1]) < 1 {
+                       client.ReplyNotEnoughParameters("PASS")
+                       return
+               }
+               client.password = cols[1]
        case "NICK":
                if len(cols) == 1 || len(cols[1]) < 1 {
                        client.ReplyParts("431", "No nickname given")
@@ -185,13 +196,22 @@ func (daemon *Daemon) ClientRegister(client *Client, command string, cols []stri
                client.realname = strings.TrimLeft(args[3], ":")
        }
        if client.nickname != "*" && client.username != "" {
+               passwordsRefreshLock.Lock()
+               if daemon.passwords != nil && (client.password == "" || daemon.passwords[client.nickname] != client.password) {
+                       passwordsRefreshLock.Unlock()
+                       client.ReplyParts("462", "You may not register")
+                       client.conn.Close()
+                       return
+               }
+               passwordsRefreshLock.Unlock()
                client.registered = true
                client.ReplyNicknamed("001", "Hi, welcome to IRC")
-               client.ReplyNicknamed("002", "Your host is "+daemon.hostname+", running goircd")
+               client.ReplyNicknamed("002", "Your host is "+daemon.hostname+", running goircd "+daemon.version)
                client.ReplyNicknamed("003", "This server was created sometime")
                client.ReplyNicknamed("004", daemon.hostname+" goircd o o")
                daemon.SendLusers(client)
                daemon.SendMotd(client)
+               log.Println(client, "logged in")
        }
 }
 
@@ -247,6 +267,7 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
                        continue
                }
                roomNew, roomSink := daemon.RoomRegister(room)
+               log.Println("Room", roomNew, "created")
                if key != "" {
                        roomNew.key = key
                        roomNew.StateSave()
@@ -302,6 +323,7 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                log.Println(client, "command", command)
                        }
                        if command == "QUIT" {
+                               log.Println(client, "quit")
                                delete(daemon.clients, client)
                                delete(daemon.clientAliveness, client)
                                client.conn.Close()
@@ -437,6 +459,14 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                cols := strings.Split(cols[1], " ")
                                nicknames := strings.Split(cols[len(cols)-1], ",")
                                daemon.SendWhois(client, nicknames)
+                       case "VERSION":
+                               var debug string
+                               if daemon.Verbose {
+                                       debug = "debug"
+                               } else {
+                                       debug = ""
+                               }
+                               client.ReplyNicknamed("351", fmt.Sprintf("%s.%s %s :", daemon.version, debug, daemon.hostname))
                        default:
                                client.ReplyNicknamed("421", command, "Unknown command")
                        }
@@ -447,3 +477,22 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                }
        }
 }
+
+func (daemon *Daemon) PasswordsRefresh() {
+       contents, err := ioutil.ReadFile(*passwords)
+       if err != nil {
+               log.Fatalf("Can no read passwords file %s: %s", *passwords, err)
+               return
+       }
+       processed := make(map[string]string)
+       for _, entry := range strings.Split(string(contents), "\n") {
+               loginAndPassword := strings.Split(entry, ":")
+               if len(loginAndPassword) == 2 {
+                       processed[loginAndPassword[0]] = loginAndPassword[1]
+               }
+       }
+       log.Printf("Read %d passwords", len(processed))
+       passwordsRefreshLock.Lock()
+       daemon.passwords = processed
+       passwordsRefreshLock.Unlock()
+}