Changeset 67 in code for trunk/cmd

Timestamp:

Feb 7, 2024, 12:26:14 AM (16 months ago)

Author:

yakumo.izuru

Message:

Fix bugs, many other changes

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

Location:

trunk/cmd/mai

Files:

• main.go (modified) (3 diffs)
• parseflags.go (modified) (1 diff)
• readconf.go (modified) (1 diff)
• usergroupids.go (modified) (1 diff)

trunk/cmd/mai/main.go

@@ -22 +22 @@
 var (
         configfile string
+        groupname string
+        username string
 )
 var conf struct {
-        group string
         listen string
         staticpath string
         tmplpath string
-        user string
 }
 func main() {
@@ -42 +42 @@
         conf.tmplpath = "./views"
 
-        if conf.user != "" {
-                uid, gid, err := usergroupids(conf.user, conf.group)
+        if username != "" {
+                uid, gid, err := usergroupids(username, groupname)
                 if err != nil {
                         fmt.Println(err)
@@ -259 +259 @@
                 }
         })
+        app.Get("/robots.txt", func(c *fiber.Ctx) error {
+                return c.SendString("User-Agent: *\nDisallow: /\n")
+        })
         app.Get("/version", func(c *fiber.Ctx) error {
                 return c.JSON(fiber.Map{

trunk/cmd/mai/parseflags.go

@@ -8 +8 @@
 func parseFlags() {
         flag.StringVar(&configfile, "f", "", "Configuration file")
+        flag.StringVar(&username, "u", "", "Sets the user to which privilege dropping is done")
+        flag.StringVar(&groupname, "g", "", "Sets the group to which privilege dropping is done")
         flag.Parse()
 }

trunk/cmd/mai/readconf.go

@@ -11 +11 @@
                 return err                                              
         }
-        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/cmd/mai/usergroupids.go

@@ -15 +15 @@
         gid, _ := strconv.Atoi(u.Gid)
 
-        if conf.group != "" {
+        if groupname != "" {
                 g, err := user.LookupGroup(groupname)
                 if err != nil {