sdk: use uint32 for uid,gid (#1648)

Author: davies

cmd/gateway_noop.go

@@ -26,9 +26,9 @@ import (
 
 func cmdGateway() *cli.Command {
 	return &cli.Command{
-		Name:     "gateway",
-		Category: "SERVICE",
-		Usage:    "Start an S3-compatible gateway (not included)",
+		Name:        "gateway",
+		Category:    "SERVICE",
+		Usage:       "Start an S3-compatible gateway (not included)",
 		Description: `This feature is not included. If you want it, recompile juicefs without "nogateway" flag`,
 		Action: func(*cli.Context) error {
 			return errors.New("not supported")

sdk/java/libjfs/guid.go

@@ -25,48 +25,49 @@ import (
 )
 
 type pwent struct {
-	id   int
+	id   uint32
 	name string
 }
 
 type mapping struct {
 	sync.Mutex
 	salt      string
-	usernames map[string]int
-	userIDs   map[int]string
-	groups    map[string]int
-	groupIDs  map[int]string
+	usernames map[string]uint32
+	userIDs   map[uint32]string
+	groups    map[string]uint32
+	groupIDs  map[uint32]string
 }
 
 func newMapping(salt string) *mapping {
 	m := &mapping{
 		salt:      salt,
-		usernames: make(map[string]int),
-		userIDs:   make(map[int]string),
-		groups:    make(map[string]int),
-		groupIDs:  make(map[int]string),
+		usernames: make(map[string]uint32),
+		userIDs:   make(map[uint32]string),
+		groups:    make(map[string]uint32),
+		groupIDs:  make(map[uint32]string),
 	}
 	m.update(genAllUids(), genAllGids())
 	return m
 }
 
-func (m *mapping) genGuid(name string) int {
+func (m *mapping) genGuid(name string) uint32 {
 	digest := md5.Sum([]byte(m.salt + name + m.salt))
 	a := binary.LittleEndian.Uint64(digest[0:8])
 	b := binary.LittleEndian.Uint64(digest[8:16])
-	return int(uint32(a ^ b))
+	return uint32(a ^ b)
 }
 
-func (m *mapping) lookupUser(name string) int {
+func (m *mapping) lookupUser(name string) uint32 {
 	m.Lock()
 	defer m.Unlock()
-	var id int
+	var id uint32
 	if id, ok := m.usernames[name]; ok {
 		return id
 	}
 	u, _ := user.Lookup(name)
 	if u != nil {
-		id, _ = strconv.Atoi(u.Uid)
+		id_, _ := strconv.ParseUint(u.Uid, 10, 32)
+		id = uint32(id_)
 	} else {
 		id = m.genGuid(name)
 	}
@@ -75,33 +76,34 @@ func (m *mapping) lookupUser(name string) int {
 	return id
 }
 
-func (m *mapping) lookupGroup(name string) int {
+func (m *mapping) lookupGroup(name string) uint32 {
 	m.Lock()
 	defer m.Unlock()
-	var id int
+	var id uint32
 	if id, ok := m.groups[name]; ok {
 		return id
 	}
 	g, _ := user.LookupGroup(name)
 	if g == nil {
 		id = m.genGuid(name)
 	} else {
-		id, _ = strconv.Atoi(g.Gid)
+		id_, _ := strconv.ParseUint(g.Gid, 10, 32)
+		id = uint32(id_)
 	}
 	m.groups[name] = id
 	m.groupIDs[id] = name
 	return 0
 }
 
-func (m *mapping) lookupUserID(id int) string {
+func (m *mapping) lookupUserID(id uint32) string {
 	m.Lock()
 	defer m.Unlock()
 	if name, ok := m.userIDs[id]; ok {
 		return name
 	}
-	u, _ := user.LookupId(strconv.Itoa(id))
+	u, _ := user.LookupId(strconv.Itoa(int(id)))
 	if u == nil {
-		u = &user.User{Username: strconv.Itoa(id)}
+		u = &user.User{Username: strconv.Itoa(int(id))}
 	}
 	name := u.Username
 	if len(name) > 49 {
@@ -112,15 +114,15 @@ func (m *mapping) lookupUserID(id int) string {
 	return name
 }
 
-func (m *mapping) lookupGroupID(id int) string {
+func (m *mapping) lookupGroupID(id uint32) string {
 	m.Lock()
 	defer m.Unlock()
 	if name, ok := m.groupIDs[id]; ok {
 		return name
 	}
-	g, _ := user.LookupGroupId(strconv.Itoa(id))
+	g, _ := user.LookupGroupId(strconv.Itoa(int(id)))
 	if g == nil {
-		g = &user.Group{Name: strconv.Itoa(id)}
+		g = &user.Group{Name: strconv.Itoa(int(id))}
 	}
 	name := g.Name
 	if len(name) > 49 {

sdk/java/libjfs/guid_unix.go

@@ -42,7 +42,7 @@ func genAllUids() []pwent {
 		}
 		name := C.GoString(p.pw_name)
 		if name != "root" {
-			uids = append(uids, pwent{int(p.pw_uid), name})
+			uids = append(uids, pwent{uint32(p.pw_uid), name})
 		}
 	}
 	return uids
@@ -61,7 +61,7 @@ func genAllGids() []pwent {
 		}
 		name := C.GoString(p.gr_name)
 		if name != "root" {
-			gids = append(gids, pwent{int(p.gr_gid), name})
+			gids = append(gids, pwent{uint32(p.gr_gid), name})
 		}
 	}
 	return gids

sdk/java/libjfs/guid_windows.go

@@ -42,14 +42,14 @@ func genAllUids() []pwent {
 		name := fields[len(fields)-2]
 		sid := fields[len(fields)-1]
 		ps := strings.Split(sid, "-")
-		auth, _ := strconv.Atoi(ps[2])
+		auth, _ := strconv.ParseUint(ps[2], 10, 32)
 		count := len(ps) - 3
-		var subAuth int
+		var subAuth uint64
 		if count > 0 {
-			subAuth, _ = strconv.Atoi(ps[3])
+			subAuth, _ = strconv.ParseUint(ps[3], 10, 32)
 		}
-		rid, _ := strconv.Atoi(ps[len(ps)-1])
-		var uid int
+		rid, _ := strconv.ParseUint(ps[len(ps)-1], 10, 32)
+		var uid uint64
 		if auth == 5 {
 			if count == 1 {
 				// "SYSTEM" S-1-5-18                   <=> uid/gid: 18
@@ -72,7 +72,7 @@ func genAllUids() []pwent {
 			uid = 0x60000*subAuth + rid
 		}
 		if uid > 0 {
-			uids = append(uids, pwent{uid, name})
+			uids = append(uids, pwent{uint32(uid), name})
 			logger.Tracef("found account %s -> %d (%s)", name, uid, sid)
 		}
 	}
@@ -101,14 +101,14 @@ func genAllGids() []pwent {
 		name := strings.TrimSpace(line[nameIndex : sidIndex-1])
 		sid := strings.TrimSpace(line[sidIndex:])
 		ps := strings.Split(sid, "-")
-		auth, _ := strconv.Atoi(ps[2])
+		auth, _ := strconv.ParseUint(ps[2], 10, 32)
 		count := len(ps) - 3
-		var subAuth int
+		var subAuth uint64
 		if count > 0 {
-			subAuth, _ = strconv.Atoi(ps[3])
+			subAuth, _ = strconv.ParseUint(ps[3], 10, 32)
 		}
-		rid, _ := strconv.Atoi(ps[len(ps)-1])
-		var gid int
+		rid, _ := strconv.ParseUint(ps[len(ps)-1], 10, 32)
+		var gid uint64
 		if auth == 5 {
 			if count == 1 {
 				// "SYSTEM" S-1-5-18                   <=> uid/gid: 18
@@ -131,7 +131,7 @@ func genAllGids() []pwent {
 			gid = 0x60000*subAuth + rid
 		}
 		if gid > 0 {
-			gids = append(gids, pwent{gid, name})
+			gids = append(gids, pwent{uint32(gid), name})
 			logger.Tracef("found group %s -> %d (%s)", name, gid, sid)
 		}
 	}

sdk/java/libjfs/main.go

@@ -186,15 +186,15 @@ func (w *wrapper) lookupGids(groups string) []uint32 {
 func (w *wrapper) uid2name(uid uint32) string {
 	name := w.superuser
 	if uid > 0 {
-		name = w.m.lookupUserID(int(uid))
+		name = w.m.lookupUserID(uid)
 	}
 	return name
 }
 
 func (w *wrapper) gid2name(gid uint32) string {
 	group := w.supergroup
 	if gid > 0 {
-		group = w.m.lookupGroupID(int(gid))
+		group = w.m.lookupGroupID(gid)
 	}
 	return group
 }
@@ -539,8 +539,8 @@ func jfs_update_uid_grouping(h uintptr, uidstr *C.char, grouping *C.char) {
 				continue
 			}
 			username := strings.TrimSpace(fields[0])
-			uid, _ := strconv.Atoi(strings.TrimSpace(fields[1]))
-			uids = append(uids, pwent{uid, username})
+			uid, _ := strconv.ParseUint(strings.TrimSpace(fields[1]), 10, 32)
+			uids = append(uids, pwent{uint32(uid), username})
 		}
 
 		var buffer bytes.Buffer
@@ -559,8 +559,8 @@ func jfs_update_uid_grouping(h uintptr, uidstr *C.char, grouping *C.char) {
 				continue
 			}
 			gname := strings.TrimSpace(fields[0])
-			gid, _ := strconv.Atoi(strings.TrimSpace(fields[1]))
-			gids = append(gids, pwent{gid, gname})
+			gid, _ := strconv.ParseUint(strings.TrimSpace(fields[1]), 10, 32)
+			gids = append(gids, pwent{uint32(gid), gname})
 			if len(fields) > 2 {
 				for _, user := range strings.Split(fields[len(fields)-1], ",") {
 					if strings.TrimSpace(user) == w.user {