feat: expand legacy file API and webdav support

chfs-ng/cmd/chfs/main.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"chfs-ng/internal/api"
 	"chfs-ng/internal/auth"
@@ -17,37 +18,65 @@ func main() {
 	file := flag.String("file", "", "configuration file")
 	pathFlag := flag.String("path", "/data", "shared path")
 	port := flag.Int("port", 80, "listen port")
+	allow := flag.String("allow", "", "allowed IPv4 addresses")
+	var rules multiFlag
+	flag.Var(&rules, "rule", "access rule (repeatable)")
 	flag.Parse()
+
 	cfg := config.Default()
 	if *file != "" {
-		var err error
-		cfg, err = config.Load(*file)
+		loaded, err := config.Load(*file)
 		if err != nil && !os.IsNotExist(err) {
 			log.Fatal(err)
 		}
-	}
-	if *pathFlag != "/data" || *file == "" {
-		if *file == "" {
-			cfg.Path = []string{*pathFlag}
-			cfg.Port = *port
+		if err == nil {
+			cfg = loaded
 		}
 	}
+	flag.CommandLine.Visit(func(f *flag.Flag) {
+		switch f.Name {
+		case "path":
+			cfg.Path = splitPath(*pathFlag)
+		case "port":
+			cfg.Port = *port
+		case "allow":
+			cfg.Allow = *allow
+		case "rule":
+			cfg.Rules = append([]string(nil), rules...)
+		}
+	})
+	if len(cfg.Path) == 0 {
+		cfg.Path = []string{"/data"}
+	}
+	if err := cfg.Validate(); err != nil {
+		log.Fatal(err)
+	}
+
 	root := cfg.Path[0]
-	if e := os.MkdirAll(root, 0755); e != nil {
-		log.Fatal(e)
+	if len(cfg.Path) > 1 {
+		log.Printf("warning: %d shared roots configured; v1 compatibility currently serves the first root %q", len(cfg.Path), root)
 	}
-	mgr, _ := auth.ParseRules(cfg.Rules)
-	srv := &api.Server{Store: storage.Local{Root: root}, Auth: mgr, Sessions: map[string]*auth.Account{}}
+	if err := os.MkdirAll(root, 0755); err != nil {
+		log.Fatal(err)
+	}
+	mgr, err := auth.ParseRules(cfg.Rules)
+	if err != nil {
+		log.Fatal(err)
+	}
+	srv := &api.Server{Store: storage.Local{Root: root}, Auth: mgr, Sessions: map[string]*auth.Account{}, WebDAVRoot: root}
 	addr := ":" + itoa(cfg.Port)
-	if cfg.Port == 0 {
-		addr = ":" + itoa(*port)
-	}
 	log.Printf("chfs-ng listening on %s root=%s", addr, filepath.Clean(root))
 	if cfg.SSLCert != "" && cfg.SSLKey != "" {
 		log.Fatal(http.ListenAndServeTLS(addr, cfg.SSLCert, cfg.SSLKey, srv.Handler()))
 	}
 	log.Fatal(http.ListenAndServe(addr, srv.Handler()))
 }
+
+type multiFlag []string
+
+func (m *multiFlag) String() string     { return strings.Join(*m, "|") }
+func (m *multiFlag) Set(v string) error { *m = append(*m, v); return nil }
+
 func itoa(n int) string {
 	const d = "0123456789"
 	if n == 0 {
@@ -60,3 +89,14 @@ func itoa(n int) string {
 	}
 	return string(b)
 }
+
+func splitPath(v string) []string {
+	var out []string
+	for _, p := range strings.Split(v, "|") {
+		p = strings.TrimSpace(p)
+		if p != "" {
+			out = append(out, p)
+		}
+	}
+	return out
+}