Changeset 475 in code for trunk/cmd

Timestamp:

Mar 18, 2021, 1:07:03 PM (4 years ago)

Author:

contact

Message:

Reload TLS certs on SIGHUP

References: ​https://todo.sr.ht/~emersion/soju/42

File:

• trunk/cmd/soju/main.go (modified) (5 diffs)

trunk/cmd/soju/main.go

@@ -11 +11 @@
         "os/signal"
         "strings"
+        "sync/atomic"
         "syscall"
 
@@ -51 +52 @@
 
         var tlsCfg *tls.Config
+        var tlsCert atomic.Value
         if cfg.TLS != nil {
                 cert, err := tls.LoadX509KeyPair(cfg.TLS.CertPath, cfg.TLS.KeyPath)
@@ -56 +58 @@
                         log.Fatalf("failed to load TLS certificate and key: %v", err)
                 }
-                tlsCfg = &tls.Config{Certificates: []tls.Certificate{cert}}
+                tlsCert.Store(cert)
+
+                tlsCfg = &tls.Config{
+                        GetCertificate: func(*tls.ClientHelloInfo) (*tls.Certificate, error) {
+                                return tlsCert.Load().(*tls.Certificate), nil
+                        },
+                }
         }
 
@@ -181 +189 @@
 
         sigCh := make(chan os.Signal, 1)
-        signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
+        signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
 
         if err := srv.Start(); err != nil {
@@ -187 +195 @@
         }
 
-        <-sigCh
-        log.Print("shutting down server")
-        srv.Shutdown()
+        for sig := range sigCh {
+                switch sig {
+                case syscall.SIGHUP:
+                        if cfg.TLS != nil {
+                                log.Print("reloading TLS certificate")
+                                cert, err := tls.LoadX509KeyPair(cfg.TLS.CertPath, cfg.TLS.KeyPath)
+                                if err != nil {
+                                        log.Printf("failed to reload TLS certificate and key: %v", err)
+                                        break
+                                }
+                                tlsCert.Store(cert)
+                        }
+                case syscall.SIGINT, syscall.SIGTERM:
+                        log.Print("shutting down server")
+                        srv.Shutdown()
+                        return
+                }
+        }
 }