Merge pull request #1337 from nalind/fix-runasuser-cache

imageService: cache information about images

server/container_create.go

@@ -449,7 +449,7 @@ func setupContainerUser(specgen *generate.Generator, rootfs string, sc *pb.Linux
 		containerUser := ""
 		// Case 1: run as user is set by kubelet
 		if sc.GetRunAsUser() != nil {
-			containerUser = strconv.FormatInt(sc.GetRunAsUser().Value, 10)
+			containerUser = strconv.FormatInt(sc.GetRunAsUser().GetValue(), 10)
 		} else {
 			// Case 2: run as username is set by kubelet
 			userName := sc.GetRunAsUsername()

server/image_list.go

@@ -31,20 +31,20 @@ func (s *Server) ListImages(ctx context.Context, req *pb.ListImagesRequest) (res
 	}
 	resp = &pb.ListImagesResponse{}
 	for _, result := range results {
-		if result.Size != nil {
-			resp.Images = append(resp.Images, &pb.Image{
-				Id:          result.ID,
-				RepoTags:    result.RepoTags,
-				RepoDigests: result.RepoDigests,
-				Size_:       *result.Size,
-			})
-		} else {
-			resp.Images = append(resp.Images, &pb.Image{
-				Id:          result.ID,
-				RepoTags:    result.RepoTags,
-				RepoDigests: result.RepoDigests,
-			})
+		resImg := &pb.Image{
+			Id:          result.ID,
+			RepoTags:    result.RepoTags,
+			RepoDigests: result.RepoDigests,
 		}
+		uid, username := getUserFromImage(result.User)
+		if uid != nil {
+			resImg.Uid = &pb.Int64Value{Value: *uid}
+		}
+		resImg.Username = username
+		if result.Size != nil {
+			resImg.Size_ = *result.Size
+		}
+		resp.Images = append(resp.Images, resImg)
 	}
 	logrus.Debugf("ListImagesResponse: %+v", resp)
 	return resp, nil

server/image_status.go

@@ -2,6 +2,8 @@ package server
 
 import (
 	"fmt"
+	"strconv"
+	"strings"
 	"time"
 
 	"github.com/containers/storage"
@@ -37,23 +39,62 @@ func (s *Server) ImageStatus(ctx context.Context, req *pb.ImageStatusRequest) (r
 			return nil, err
 		}
 	}
-	// match just the first registry as that's what kube meant
-	image = images[0]
-	status, err := s.StorageImageServer().ImageStatus(s.ImageContext(), image)
-	if err != nil {
-		if errors.Cause(err) == storage.ErrImageUnknown {
-			return &pb.ImageStatusResponse{}, nil
+	var (
+		notfound bool
+		lastErr  error
+	)
+	for _, image := range images {
+		status, err := s.StorageImageServer().ImageStatus(s.ImageContext(), image)
+		if err != nil {
+			if errors.Cause(err) == storage.ErrImageUnknown {
+				logrus.Warnf("imageStatus: can't find %s", image)
+				notfound = true
+				continue
+			}
+			logrus.Warnf("imageStatus: error getting status from %s: %v", image, err)
+			lastErr = err
+			continue
 		}
-		return nil, err
+		resp = &pb.ImageStatusResponse{
+			Image: &pb.Image{
+				Id:          status.ID,
+				RepoTags:    status.RepoTags,
+				RepoDigests: status.RepoDigests,
+				Size_:       *status.Size,
+			},
+		}
+		uid, username := getUserFromImage(status.User)
+		if uid != nil {
+			resp.Image.Uid = &pb.Int64Value{Value: *uid}
+		}
+		resp.Image.Username = username
+		break
 	}
-	resp = &pb.ImageStatusResponse{
-		Image: &pb.Image{
-			Id:          status.ID,
-			RepoTags:    status.RepoTags,
-			RepoDigests: status.RepoDigests,
-			Size_:       *status.Size,
-		},
+	if lastErr != nil && resp == nil {
+		return nil, lastErr
+	}
+	if notfound && resp == nil {
+		return &pb.ImageStatusResponse{}, nil
 	}
 	logrus.Debugf("ImageStatusResponse: %+v", resp)
 	return resp, nil
 }
+
+// getUserFromImage gets uid or user name of the image user.
+// If user is numeric, it will be treated as uid; or else, it is treated as user name.
+func getUserFromImage(user string) (*int64, string) {
+	// return both empty if user is not specified in the image.
+	if user == "" {
+		return nil, ""
+	}
+	// split instances where the id may contain user:group
+	user = strings.Split(user, ":")[0]
+	// user could be either uid or user name. Try to interpret as numeric uid.
+	uid, err := strconv.ParseInt(user, 10, 64)
+	if err != nil {
+		// If user is non numeric, assume it's user name.
+		return nil, user
+	}
+	// If user is a numeric uid.
+	return &uid, ""
+}