From c6c68aa443563e4d02adc1eb929f88c323192f43 Mon Sep 17 00:00:00 2001 From: Derek Stevens Date: Sun, 26 Feb 2023 14:22:18 -0700 Subject: [PATCH] add configand command line parsing --- admin/admin.go | 12 ++- cmd/cmd.go | 6 +- config/config.go | 187 ++++++++++++++++++++++++++++++++++++++++++++ gametable/server.go | 4 +- main.go | 27 +++++-- 5 files changed, 221 insertions(+), 15 deletions(-) create mode 100644 config/config.go diff --git a/admin/admin.go b/admin/admin.go index 593538d..5b92549 100644 --- a/admin/admin.go +++ b/admin/admin.go @@ -154,20 +154,28 @@ func apiUploadMapImg(next http.Handler, udb auth.UserStore, dbAdapter mongodb.Db // respond with URL? } - return handlerFunc + return http.HandlerFunc(handlerFunc) } -func CreateAdminInterface(udb auth.UserStore, dbAdapter mongodb.DbAdapter) http.Handler { +func CreateAdminInterface(udb auth.UserStore, dbAdapter mongodb.DbAdapter, uploads string, uploadMaxMB int) http.Handler { // create quartzgun router rtr := &router.Router{Fallback: *template.Must(template.ParseFiles("static/error.html"))} scopes := map[string]string{} rtr.Post("/api/auth/", Provision(udb, 84)) + + // table management rtr.Get("/api/table/", Validate(apiGetTableList(renderer.JSON("tableList"), udb), udb, scopes)) rtr.Get(`/api/table/(?P\S+)`, Validate(apiGetTableData(renderer.JSON("tableData"), udb, dbAdapter), udb, scopes)) rtr.Post("/api/table/", Validate(apiCreateTable(renderer.JSON("result"), udb, dbAdapter), udb, scopes)) rtr.Delete(`/api/table/(?P\S+)`, Validate(apiDestroyTable(renderer.JSON("result"), udb, dbAdapter), udb, scopes)) + // asset management + // POST /api/upload//map/ + // DELETE /api/upload/
/map/ + // POST /api/upload/
/token/ + // DELETE /api/upload/
/token/ + return http.HandlerFunc(rtr.ServeHTTP) } diff --git a/cmd/cmd.go b/cmd/cmd.go index 5bcb9be..70f56f5 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -1,12 +1,12 @@ package cmd import ( - "fmt" + _ "fmt" "hacklab.nilfm.cc/quartzgun/auth" - "strings" + _ "strings" ) -func ProcessCmd(args []string, userStore auth.UserStore, cfg *Config) bool { +func ProcessCmd(args []string, userStore auth.UserStore) bool { if len(args) == 1 { return false } diff --git a/config/config.go b/config/config.go new file mode 100644 index 0000000..a72ec2c --- /dev/null +++ b/config/config.go @@ -0,0 +1,187 @@ +package config + +import ( + "fmt" + "os" + "path/filepath" + "runtime" + "strconv" + "strings" +) + +type Config struct { + Port int + Uploads string + UploadMaxMB int + MongoURI string +} + +func GetConfigLocation() string { + home := os.Getenv("HOME") + appdata := os.Getenv("APPDATA") + switch runtime.GOOS { + case "windows": + return filepath.Join(appdata, "felt") + case "darwin": + return filepath.Join(home, "Library", "Application Support", "felt") + case "plan9": + return filepath.Join(home, "lib", "felt") + default: + return filepath.Join(home, ".config", "felt") + } +} + +func ensureConfigLocationExists() { + fileInfo, err := os.Stat(GetConfigLocation()) + + if os.IsNotExist(err) { + os.MkdirAll(GetConfigLocation(), os.ModePerm) + } else if !fileInfo.IsDir() { + panic("Config location is not a directory!") + } +} + +func ReadConfig() *Config { + ensureConfigLocationExists() + return parseConfig(filepath.Join(GetConfigLocation(), "felt.conf")) +} + +func (self *Config) Write() error { + ensureConfigLocationExists() + return writeConfig(self, filepath.Join(GetConfigLocation(), "felt.conf")) +} + +func (self *Config) IsNull() bool { + return self.Port == 0 || self.UploadMaxMB == 0 || self.Uploads == "" +} + +func (self *Config) RunWizard() { + fmt.Printf("All options are required.\n") + defer func(cfg *Config) { + if r := recover(); r != nil { + fmt.Printf("Invalid selection, starting over...") + cfg.RunWizard() + } + }(self) + inputBuf := "" + + fmt.Printf("MongoDB URI? ") + ensureNonEmptyOption(&inputBuf) + self.MongoURI = inputBuf + + inputBuf = "" + fmt.Printf("TCP port? ") + self.Port = ensurePortOption(&inputBuf) + + fmt.Printf("file uploads location? ") + ensureNonEmptyOption(&inputBuf) + self.Uploads = inputBuf + + inputBuf = "" + fmt.Printf("Max file upload size (MB)? ") + self.UploadMaxMB = ensureNumberOption(&inputBuf) + + fmt.Printf("Configuration complete!\n") + self.Write() +} + +func ensureNonEmptyOption(buffer *string) { + for { + fmt.Scanln(buffer) + if len(strings.TrimSpace(*buffer)) != 0 { + break + } + fmt.Println("Please enter a nonempty value") + } +} + +func ensureBooleanOption(buffer *string) bool { + for { + fmt.Scanln(buffer) + trimmedBuf := strings.TrimSpace(*buffer) + v, err := strconv.ParseBool(trimmedBuf) + if err == nil { + return v + } + fmt.Println("Please enter a true or false value") + } +} + +func ensureNumberOption(buffer *string) int { + for { + fmt.Scanln(buffer) + trimmedBuf := strings.TrimSpace(*buffer) + v, err := strconv.ParseInt(trimmedBuf, 10, 32) + if err == nil && v > 0 { + return int(v) + } + fmt.Println("Please enter a positive integer") + } +} + +func ensurePortOption(buffer *string) int { + for { + fmt.Scanln(buffer) + trimmedBuf := strings.TrimSpace(*buffer) + v, err := strconv.ParseInt(trimmedBuf, 10, 32) + if err == nil && v > 0 && v <= 65536 { + return int(v) + } + fmt.Println("Please enter a valid port [1, 65536]") + } +} + +func writeConfig(cfg *Config, configFile string) error { + f, err := os.Create(configFile) + if err != nil { + return err + } + + defer f.Close() + + f.WriteString("mongoURI=" + cfg.MongoURI + "\n") + f.WriteString("uploads=" + cfg.Uploads + "\n") + f.WriteString("uploadMaxMB=" + strconv.FormatInt(int64(cfg.UploadMaxMB), 10) + "\n") + f.WriteString("port=" + strconv.FormatInt(int64(cfg.Port), 10) + "\n") + return nil +} + +func parseConfig(configFile string) *Config { + f, err := os.ReadFile(configFile) + cfg := &Config{} + if err != nil { + return cfg + } + + fileData := string(f[:]) + + lines := strings.Split(fileData, "\n") + + for _, l := range lines { + if len(l) == 0 { + continue + } + if !strings.Contains(l, "=") { + panic("Malformed config not in INI format") + } + + kvp := strings.Split(l, "=") + k := strings.TrimSpace(kvp[0]) + v := strings.TrimSpace(kvp[1]) + switch k { + case "mongoURI": + cfg.MongoURI = v + case "uploads": + cfg.Uploads = v + case "port": + port, _ := strconv.ParseInt(v, 10, 32) + cfg.Port = int(port) + case "uploadMaxMB": + maxUpload, _ := strconv.ParseInt(v, 10, 32) + cfg.UploadMaxMB = int(maxUpload) + default: + panic("Unrecognized config option: " + k) + } + } + return cfg +} diff --git a/gametable/server.go b/gametable/server.go index f1c14e5..bff31fe 100644 --- a/gametable/server.go +++ b/gametable/server.go @@ -36,7 +36,7 @@ type GameTableServer struct { dbAdapter mongodb.DbAdapter } -func New(adapter mongodb.DbAdapter, udb auth.UserStore) *GameTableServer { +func New(adapter mongodb.DbAdapter, udb auth.UserStore, uploads string, uploadMaxMB int) *GameTableServer { srvr := &GameTableServer{ subscribeMessageBuffer: 16, logf: log.Printf, @@ -45,7 +45,7 @@ func New(adapter mongodb.DbAdapter, udb auth.UserStore) *GameTableServer { dbAdapter: adapter, } srvr.serveMux.Handle("/table/", http.StripPrefix("/table/", renderer.Subtree("./static"))) - srvr.serveMux.Handle("/admin/", http.StripPrefix("/admin", admin.CreateAdminInterface(udb, adapter))) + srvr.serveMux.Handle("/admin/", http.StripPrefix("/admin", admin.CreateAdminInterface(udb, adapter, uploads, uploadMaxMB))) srvr.serveMux.HandleFunc("/subscribe", srvr.subscribeHandler) srvr.serveMux.HandleFunc("/publish", srvr.publishHandler) diff --git a/main.go b/main.go index d75fad2..1f2cb9e 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,8 @@ package main import ( "context" + "hacklab.nilfm.cc/felt/cmd" + "hacklab.nilfm.cc/felt/config" "hacklab.nilfm.cc/felt/gametable" "hacklab.nilfm.cc/felt/mongodb" "hacklab.nilfm.cc/quartzgun/indentalUserDB" @@ -10,6 +12,8 @@ import ( "net/http" "os" "os/signal" + "path/filepath" + "strconv" "time" ) @@ -21,23 +25,30 @@ func main() { } func run() error { - l, err := net.Listen("tcp", os.Args[1]) + cfg := config.ReadConfig() + if cfg.IsNull() { + cfg.RunWizard() + } + + udb := indentalUserDB.CreateIndentalUserDB( + filepath.Join(config.GetConfigLocation(), "user.db")) + + if cmd.ProcessCmd(os.Args, udb) { + os.Exit(0) + } + + l, err := net.Listen("tcp", ":"+strconv.FormatInt(int64(cfg.Port), 10)) if err != nil { return err } dbEngine := &mongodb.DbEngine{} - err = dbEngine.Init(os.Args[2]) + err = dbEngine.Init(cfg.MongoURI) if err != nil { return err } - udb := indentalUserDB.CreateIndentalUserDB( - "./user.db") - - udb.AddUser("nilix", "questing") - - gt := gametable.New(dbEngine, udb) + gt := gametable.New(dbEngine, udb, cfg.Uploads, cfg.UploadMaxMB) s := &http.Server{ Handler: gt, ReadTimeout: time.Second * 10,