Support multiple hostnames

Resolves #1.

CONFIGURATION.md

@@ -6,34 +6,48 @@ Serve entries have either a `root` path or `proxy` URL. When a `root` path is
 provided static files and directories are served from that location. When a
 `proxy` URL is provided requests are forwarded to the Gemini server at that URL.
 
+Paths are matched in the order they are provided.
+
 When accessing a directory `index.gemini` or `index.gmi` is served.
 
 # config.yaml
 
 ```yaml
-# Hostname and port to listen for connections on
+# Address to listen on
-hostname: gemini.rocks
+listen: 0.0.0.0:1965
-port: 1965
 
-# Path to certificate and private key
+# TLS certificates
-cert: /home/twins/data/certfile.crt
+certificates:
-key: /home/twins/data/keyfile.key
+  -
+    cert: /home/gemini.rocks/data/cert.crt
+    key: /home/gemini.rocks/data/cert.key
 
-
+# Hosts and paths to serve
-# Server paths
+hosts:
-serve:
+  -
+    name: gemini.rocks
+    paths:
       -
         path: /sites
-    root: /home/twins/data/sites
+        root: /home/gemini.rocks/data/sites
       -
         path: ^/(help|info)$
-    root: /home/twins/data/help
+        root: /home/gemini.rocks/data/help
       -
         path: ^/proxy-example$
         proxy: gemini://localhost:1966
       -
         path: ^/cmd-example$
         command: uname -a
+      -
+        path: /
+        root: /home/gemini.rocks/data/home
+  -
+    name: twins.rocketnine.space
+    paths:
+      -
+        path: /sites
+        root: /home/twins/data/sites
       -
         path: /
         root: /home/twins/data/home

README.md

@@ -7,7 +7,7 @@
 ## Features
 
 - Serve static files
-- Serve output of system commands
+- Serve the output of system commands
 - Reverse proxy requests
 
 ## Download

config.go

@@ -6,12 +6,14 @@ import (
 	"log"
 	"os"
 	"regexp"
+	"strconv"
+	"strings"
 
 	"github.com/kballard/go-shellquote"
 	"gopkg.in/yaml.v3"
 )
 
-type serveConfig struct {
+type pathConfig struct {
 	// Path to match
 	Path string
 
@@ -24,17 +26,30 @@ type serveConfig struct {
 	cmd []string
 }
 
-type serverConfig struct {
+type hostConfig struct {
+	Name  string
+	Paths []*pathConfig
+}
+
+type certConfig struct {
 	Cert string
 	Key  string
-	Hostname string
+}
-	Port     int
+
-	Serve    []*serveConfig
+type serverConfig struct {
+	Listen string
+
+	Certificates []*certConfig
+
+	Hosts []*hostConfig
+
+	hostname string
+	port     int
 }
 
 var config = &serverConfig{
-	Hostname: "localhost",
+	hostname: "localhost",
-	Port:     1965,
+	port:     1965,
 }
 
 func readconfig(configPath string) error {
@@ -56,7 +71,20 @@ func readconfig(configPath string) error {
 		return err
 	}
 
-	for _, serve := range config.Serve {
+	split := strings.Split(config.Listen, ":")
+	if len(split) != 2 {
+		config.hostname = config.Listen
+		config.Listen += ":1965"
+	} else {
+		config.hostname = split[0]
+		config.port, err = strconv.Atoi(split[1])
+		if err != nil {
+			log.Fatalf("invalid port specified: %s", err)
+		}
+	}
+
+	for _, host := range config.Hosts {
+		for _, serve := range host.Paths {
 			if serve.Path == "" {
 				log.Fatal("path must be specified in serve entry")
 			} else if (serve.Root != "" && (serve.Proxy != "" || serve.Command != "")) ||
@@ -78,6 +106,7 @@ func readconfig(configPath string) error {
 				}
 			}
 		}
+	}
 
 	return nil
 }

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"crypto/tls"
 	"flag"
 	"log"
 	"os"
@@ -30,15 +31,24 @@ func main() {
 		log.Fatalf("failed to read configuration file at %s: %v\nSee CONFIGURATION.md for information on configuring twins", *configFile, err)
 	}
 
-	if config.Hostname == "" || config.Port <= 0 {
+	if config.hostname == "" || config.port <= 0 {
 		log.Fatal("hostname and port must be specified")
 	}
 
-	if config.Cert == "" || config.Key == "" {
+	if len(config.Certificates) == 0 {
-		log.Fatal("certificate file and private key must be specified (gemini requires TLS for all connections)")
+		log.Fatal("at least one certificate must be specified (gemini requires TLS for all connections)")
 	}
 
-	log.Printf("twins running on port %d", config.Port)
+	var certificates []tls.Certificate
-
+	for _, cert := range config.Certificates {
-	listen(config.Hostname, config.Port, config.Cert, config.Key)
+		cert, err := tls.LoadX509KeyPair(cert.Cert, cert.Key)
+		if err != nil {
+			log.Fatalf("failed to load certificate: %s", err)
+		}
+		certificates = append(certificates, cert)
+	}
+
+	log.Printf("twins running on %s:%d", config.hostname, config.port)
+
+	listen(config.Listen, certificates)
 }

server.go

@@ -48,7 +48,7 @@ func writeStatus(c net.Conn, code int) {
 	writeHeader(c, code, meta)
 }
 
-func serveFile(c net.Conn, filePath string) {
+func serveFile(c net.Conn, requestData, filePath string) {
 	fi, err := os.Stat(filePath)
 	if os.IsNotExist(err) {
 		writeStatus(c, gemini.StatusNotFound)
@@ -59,6 +59,13 @@ func serveFile(c net.Conn, filePath string) {
 	}
 
 	if mode := fi.Mode(); mode.IsDir() {
+		if requestData[len(requestData)-1] != '/' {
+			// Add trailing slash
+			log.Println(requestData)
+			writeHeader(c, gemini.StatusRedirectPermanent, requestData+"/")
+			return
+		}
+
 		_, err := os.Stat(path.Join(filePath, "index.gemini"))
 		if err == nil {
 			filePath = path.Join(filePath, "index.gemini")
@@ -200,6 +207,7 @@ func handleConn(c net.Conn) {
 		requestData = scanner.Text()
 	}
 	if err := scanner.Err(); err != nil {
+		log.Println(scanner.Text(), "FAILED")
 		writeStatus(c, gemini.StatusBadRequest)
 		return
 	}
@@ -214,7 +222,13 @@ func handleConn(c net.Conn) {
 	}
 
 	request, err := url.Parse(requestData)
-	if err != nil || request.Hostname() == "" || strings.ContainsRune(request.Hostname(), ' ') {
+	if err != nil {
+		writeStatus(c, gemini.StatusBadRequest)
+		return
+	}
+
+	requestHostname := request.Hostname()
+	if requestHostname == "" || strings.ContainsRune(requestHostname, ' ') {
 		writeStatus(c, gemini.StatusBadRequest)
 		return
 	}
@@ -230,7 +244,7 @@ func handleConn(c net.Conn) {
 	if request.Scheme == "" {
 		request.Scheme = "gemini"
 	}
-	if request.Scheme != "gemini" || request.Hostname() != config.Hostname || (requestPort > 0 && requestPort != config.Port) {
+	if request.Scheme != "gemini" || (requestPort > 0 && requestPort != config.port) {
 		writeStatus(c, gemini.StatusProxyRequestRefused)
 	}
 
@@ -246,7 +260,14 @@ func handleConn(c net.Conn) {
 		strippedPath = strippedPath[1:]
 	}
 
-	for _, serve := range config.Serve {
+	var matchedHost bool
+	for _, host := range config.Hosts {
+		if requestHostname != host.Name {
+			continue
+		}
+		matchedHost = true
+
+		for _, serve := range host.Paths {
 			if serve.Proxy != "" {
 				if serve.r != nil && serve.r.Match(pathBytes) {
 					serveProxy(c, requestData, serve.Proxy)
@@ -266,15 +287,20 @@ func handleConn(c net.Conn) {
 			}
 
 			if serve.r != nil && serve.r.Match(pathBytes) {
-			serveFile(c, path.Join(serve.Root, strippedPath))
+				serveFile(c, requestData, path.Join(serve.Root, strippedPath))
 				return
 			} else if serve.r == nil && strings.HasPrefix(request.Path, serve.Path) {
-			serveFile(c, path.Join(serve.Root, strippedPath[len(serve.Path)-1:]))
+				serveFile(c, requestData, path.Join(serve.Root, strippedPath[len(serve.Path)-1:]))
 				return
 			}
 		}
+	}
 
+	if matchedHost {
 		writeStatus(c, gemini.StatusNotFound)
+	} else {
+		writeStatus(c, gemini.StatusProxyRequestRefused)
+	}
 }
 
 func handleListener(l net.Listener) {
@@ -288,19 +314,14 @@ func handleListener(l net.Listener) {
 	}
 }
 
-func listen(hostname string, port int, certFile, keyFile string) {
+func listen(address string, certificates []tls.Certificate) {
-	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
-	if err != nil {
-		log.Fatalf("failed to load certificate: %s", err)
-	}
-
 	tlsConfig := &tls.Config{
-		Certificates: []tls.Certificate{cert},
+		Certificates: certificates,
 	}
 
-	listener, err := tls.Listen("tcp", fmt.Sprintf("%s:%d", hostname, port), tlsConfig)
+	listener, err := tls.Listen("tcp", address, tlsConfig)
 	if err != nil {
-		log.Fatalf("failed to listen on %s:%d: %s", hostname, port, err)
+		log.Fatalf("failed to listen on %s: %s", address, err)
 	}
 
 	handleListener(listener)