Changeset 37 in code for trunk/partage.go

Timestamp:

Oct 19, 2021, 5:39:20 PM (4 years ago)

Author:

dev

Message:

Keep setuid/setgid syscalls in main()

File:

• trunk/partage.go (modified) (3 diffs)

trunk/partage.go

@@ -266 +266 @@
 }
 
-func dropprivilege(username string, groupname string) error {
+func usergroupids(username string, groupname string) (int, int, error) {
         u, err := user.Lookup(username)
         if err != nil {
-                return err
+                return -1, -1, err
         }
 
@@ -278 +278 @@
                 g, err := user.LookupGroup(groupname)
                 if err != nil {
-                        return err
+                        return uid, -1, err
                 }
                 gid, _ = strconv.Atoi(g.Gid)
         }
 
-        syscall.Setuid(uid)
-        syscall.Setgid(gid)
-
-        return nil
+        return uid, gid, nil
 }
 
@@ -326 +323 @@
                         log.Printf("Dropping privileges to %s", conf.user)
                 }
-                dropprivilege(conf.user, conf.group)
+                uid, gid, err := usergroupids(conf.user, conf.group)
+                if err != nil {
+                        log.Fatal(err)
+                }
+                syscall.Setuid(uid)
+                syscall.Setgid(gid)
         }