Changeset 63 in code for trunk

Timestamp:

Jan 21, 2024, 3:23:44 AM (17 months ago)

Author:

yakumo.izuru

Message:

今すぐv1をリリースすべきでしょうか?

Signed-off-by: Izuru Yakumo <yakumo.izuru@…>

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• cmd/mai/flag.go (modified) (1 diff)
• cmd/mai/main.go (modified) (6 diffs)
• cmd/mai/readconf.go (modified) (1 diff)
• cmd/mai/usergroupids.go (added)
• doc.go (added)
• mai.ini.5 (modified) (2 diffs)
• version.go (added)

trunk/Makefile

@@ -1 +1 @@
 PREFIX ?= /usr/local
+GOFLAGS ?= -v -ldflags "-w -X `go list`.Version=${VERSION} -X `go list`.Commit=${COMMIT}"
+VERSION = `git describe --abbrev=0 --tags 2>/dev/null || echo "VERSION"`
+COMMIT = `git rev-parse --short HEAD || echo "COMMIT"`
 
 build:
-        go build -v ./cmd/mai
+        go build ${GOFLAGS} ./cmd/mai
 clean:
         rm -f mai

trunk/cmd/mai/flag.go

@@ -8 +8 @@
 func parseFlags() {
         flag.StringVar(&configfile, "f", "", "Configuration file")
+        flag.BoolVar(&verbose, "v", false, "Verbose logging")
         flag.Parse()
 }

trunk/cmd/mai/main.go

@@ -3 +3 @@
 import (
         "bytes"
+        "fmt"
         "net/http"
         "net/url"
@@ -8 +9 @@
         "time"
         "runtime"
-
+        "syscall"
+
+        "marisa.chaotic.ninja/mai"
         "marisa.chaotic.ninja/mai/engines"
+
         "github.com/gofiber/fiber/v2"
         "github.com/gofiber/fiber/v2/middleware/logger"
@@ -17 +21 @@
 var (
         configfile string
+        verbose bool
 )
 var conf struct {
+        group string
         listen string
-        redisuri string
         staticpath string
         tmplpath string
+        user string
 }
 func main() {
@@ -28 +34 @@
 
         if configfile != "" {
+                if verbose {
+                        fmt.Printf("[mai] Reading configuration file")
+                }
                 readConf(configfile)
         }
@@ -35 +44 @@
         conf.staticpath = "./static"
         conf.tmplpath = "./views"
+
+        if conf.user != "" {
+                if verbose {
+                        fmt.Printf("[mai] Dropping privileges to %s", conf.user)
+                }
+                uid, gid, err := usergroupids(conf.user, conf.group)
+                if err != nil {
+                        fmt.Println(err)
+                        os.Exit(1)
+                }
+                syscall.Setuid(uid)
+                syscall.Setgid(gid)
+        }
         
         engine := html.New(conf.tmplpath, ".html")
@@ -266 +288 @@
         })
         app.Listen(conf.listen)
+
+        if verbose {
+                fmt.Printf("Starting mai %v\n", mai.FullVersion())
+                fmt.Printf("Listening on %s", conf.listen)
+        }
 }

trunk/cmd/mai/readconf.go

@@ -12 +12 @@
         }
 
+        conf.group = cfg.Section("mai").Key("group").String()
         conf.listen = cfg.Section("mai").Key("listen").String()
         conf.staticpath = cfg.Section("mai").Key("static").String()
         conf.tmplpath = cfg.Section("mai").Key("templates").String()
+        conf.user = cfg.Section("mai").Key("user").String()
 
         return nil

trunk/mai.ini.5

@@ -8 +8 @@
 .Ss [mai] section
 .Bl -tag -width 11n
+.It group
+Group ID for dropping privileges to.
+If unset, assume the GID of user
 .It listen
 HTTP port for the server to listen.
@@ -17 +20 @@
 Directory where the templates are located.
 Default is "./views"
+.It user
+User ID for dropping privileges to.
 .El
 .Sh ENVIRONMENT