Ability to authenticate users by nickname↔password database

[goircd.git] / goircd.go

diff --git a/goircd.go b/goircd.go
index aeca83a73a19756058f3490ca7260a145729da44..984b47b94144c134e7bfc57158b52de13dddbf84 100644 (file)
--- a/goircd.go
+++ b/goircd.go
@@ -18,27 +18,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-       "bytes"
        "crypto/tls"
        "flag"
+       "io/ioutil"
        "log"
        "net"
        "os"
+       "os/signal"
        "path"
        "path/filepath"
        "strings"
+       "syscall"
 )
 
 var (
-       hostname = flag.String("hostname", "localhost", "Hostname")
-       bind     = flag.String("bind", ":6667", "Address to bind to")
-       motd     = flag.String("motd", "", "Path to MOTD file")
-       logdir   = flag.String("logdir", "", "Absolute path to directory for logs")
-       statedir = flag.String("statedir", "", "Absolute path to directory for states")
+       hostname  = flag.String("hostname", "localhost", "Hostname")
+       bind      = flag.String("bind", ":6667", "Address to bind to")
+       motd      = flag.String("motd", "", "Path to MOTD file")
+       logdir    = flag.String("logdir", "", "Absolute path to directory for logs")
+       statedir  = flag.String("statedir", "", "Absolute path to directory for states")
+       passwords = flag.String("passwords", "", "Optional path to passwords file")
 
-       ssl     = flag.Bool("ssl", false, "Use SSL only.")
-       sslKey  = flag.String("ssl_key", "", "SSL keyfile.")
-       sslCert = flag.String("ssl_cert", "", "SSL certificate.")
+       tlsKey  = flag.String("tls_key", "", "TLS keyfile")
+       tlsCert = flag.String("tls_cert", "", "TLS certificate")
+
+       verbose = flag.Bool("v", false, "Enable verbose logging.")
 )
 
 func Run() {
@@ -46,11 +50,11 @@ func Run() {
        events := make(chan ClientEvent)
        log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
 
-       log_sink := make(chan LogEvent)
+       logSink := make(chan LogEvent)
        if *logdir == "" {
                // Dummy logger
                go func() {
-                       for _ = range log_sink {
+                       for _ = range logSink {
                        }
                }()
        } else {
@@ -58,53 +62,51 @@ func Run() {
                        log.Fatalln("Need absolute path for logdir")
                        return
                }
-               go Logger(*logdir, log_sink)
+               go Logger(*logdir, logSink)
                log.Println(*logdir, "logger initialized")
        }
 
-       state_sink := make(chan StateEvent)
-       daemon := NewDaemon(*hostname, *motd, log_sink, state_sink)
+       stateSink := make(chan StateEvent)
+       daemon := NewDaemon(*hostname, *motd, logSink, stateSink)
+       daemon.Verbose = *verbose
        if *statedir == "" {
                // Dummy statekeeper
                go func() {
-                       for _ = range state_sink {
+                       for _ = range stateSink {
                        }
                }()
        } else {
                if !path.IsAbs(*statedir) {
                        log.Fatalln("Need absolute path for statedir")
                }
-               states, err := filepath.Glob(*statedir + "/#*")
+               states, err := filepath.Glob(path.Join(*statedir, "#*"))
                if err != nil {
                        log.Fatalln("Can not read statedir", err)
                }
                for _, state := range states {
-                       fd, err := os.Open(state)
-                       if err != nil {
-                               log.Fatalln("Can not open state", state, err)
-                       }
-                       buf := make([]byte, 1024)
-                       _, err = fd.Read(buf)
-                       fd.Close()
+                       buf, err := ioutil.ReadFile(state)
                        if err != nil {
-                               log.Fatalln("Can not read state", state, err)
+                               log.Fatalf("Can not read state %s: %v", state, err)
                        }
                        room, _ := daemon.RoomRegister(path.Base(state))
-                       buf = bytes.TrimRight(buf, "\x00")
                        contents := strings.Split(string(buf), "\n")
-                       room.topic = contents[0]
-                       room.key = contents[1]
-                       log.Println("Loaded state for room", room.name)
+                       if len(contents) < 2 {
+                               log.Printf("State corrupted for %s: %q", room.name, contents)
+                       } else {
+                               room.topic = contents[0]
+                               room.key = contents[1]
+                               log.Println("Loaded state for room", room.name)
+                       }
                }
-               go StateKeeper(*statedir, state_sink)
+               go StateKeeper(*statedir, stateSink)
                log.Println(*statedir, "statekeeper initialized")
        }
 
        var listener net.Listener
-       if *ssl {
-               cert, err := tls.LoadX509KeyPair(*sslCert, *sslKey)
+       if *tlsKey != "" {
+               cert, err := tls.LoadX509KeyPair(*tlsCert, *tlsKey)
                if err != nil {
-                       log.Fatalf("Could not load SSL keys from %s and %s: %s", *sslCert, *sslKey, err)
+                       log.Fatalf("Could not load TLS keys from %s and %s: %s", *tlsCert, *tlsKey, err)
                }
                config := tls.Config{Certificates: []tls.Certificate{cert}}
                listener, err = tls.Listen("tcp", *bind, &config)
@@ -120,6 +122,18 @@ func Run() {
        }
        log.Println("Listening on", *bind)
 
+       if *passwords != "" {
+               daemon.PasswordsRefresh()
+               hups := make(chan os.Signal)
+               signal.Notify(hups, syscall.SIGHUP)
+               go func() {
+                       for {
+                               <-hups
+                               daemon.PasswordsRefresh()
+                       }
+               }()
+       }
+
        go daemon.Processor(events)
        for {
                conn, err := listener.Accept()