From 3d86094c93bebdf9902534587ea2ebf4bb59ee3f Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Sun, 30 Aug 2020 16:03:53 +0200
Subject: [PATCH] cmd/initContainer: Split out the code to configure the user

https://github.com/containers/toolbox/issues/523
---
 src/cmd/initContainer.go | 96 ++++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 42 deletions(-)

diff --git a/src/cmd/initContainer.go b/src/cmd/initContainer.go
index 8c56285b1..fa57c2006 100644
--- a/src/cmd/initContainer.go
+++ b/src/cmd/initContainer.go
@@ -234,49 +234,12 @@ func initContainer(cmd *cobra.Command, args []string) error {
 	}
 
 	if _, err := user.Lookup(initContainerFlags.user); err != nil {
-		if initContainerFlags.homeLink {
-			if err := redirectPath("/home", "/var/home", true); err != nil {
-				return err
-			}
-		}
-
-		sudoGroup, err := utils.GetGroupForSudo()
-		if err != nil {
-			return fmt.Errorf("failed to get group for sudo: %w", err)
-		}
-
-		logrus.Debugf("Adding user %s with UID %d:", initContainerFlags.user, initContainerFlags.uid)
-
-		useraddArgs := []string{
-			"--home-dir", initContainerFlags.home,
-			"--no-create-home",
-			"--shell", initContainerFlags.shell,
-			"--uid", fmt.Sprint(initContainerFlags.uid),
-			"--groups", sudoGroup,
+		if err := configureUsers(initContainerFlags.uid,
 			initContainerFlags.user,
-		}
-
-		logrus.Debug("useradd")
-		for _, arg := range useraddArgs {
-			logrus.Debugf("%s", arg)
-		}
-
-		if err := shell.Run("useradd", nil, nil, nil, useraddArgs...); err != nil {
-			return fmt.Errorf("failed to add user %s with UID %d",
-				initContainerFlags.user,
-				initContainerFlags.uid)
-		}
-
-		logrus.Debugf("Removing password for user %s", initContainerFlags.user)
-
-		if err := shell.Run("passwd", nil, nil, nil, "--delete", initContainerFlags.user); err != nil {
-			return fmt.Errorf("failed to remove password for user %s", initContainerFlags.user)
-		}
-
-		logrus.Debug("Removing password for user root")
-
-		if err := shell.Run("passwd", nil, nil, nil, "--delete", "root"); err != nil {
-			return errors.New("failed to remove password for root")
+			initContainerFlags.home,
+			initContainerFlags.shell,
+			initContainerFlags.homeLink); err != nil {
+			return err
 		}
 	}
 
@@ -372,6 +335,55 @@ func initContainerHelp(cmd *cobra.Command, args []string) {
 	}
 }
 
+func configureUsers(targetUserUid int,
+	targetUser, targetUserHome, targetUserShell string,
+	homeLink bool) error {
+	if homeLink {
+		if err := redirectPath("/home", "/var/home", true); err != nil {
+			return err
+		}
+	}
+
+	sudoGroup, err := utils.GetGroupForSudo()
+	if err != nil {
+		return fmt.Errorf("failed to get group for sudo: %w", err)
+	}
+
+	logrus.Debugf("Adding user %s with UID %d:", targetUser, targetUserUid)
+
+	useraddArgs := []string{
+		"--groups", sudoGroup,
+		"--home-dir", targetUserHome,
+		"--no-create-home",
+		"--shell", targetUserShell,
+		"--uid", fmt.Sprint(targetUserUid),
+		targetUser,
+	}
+
+	logrus.Debug("useradd")
+	for _, arg := range useraddArgs {
+		logrus.Debugf("%s", arg)
+	}
+
+	if err := shell.Run("useradd", nil, nil, nil, useraddArgs...); err != nil {
+		return fmt.Errorf("failed to add user %s with UID %d", targetUser, targetUserUid)
+	}
+
+	logrus.Debugf("Removing password for user %s", targetUser)
+
+	if err := shell.Run("passwd", nil, nil, nil, "--delete", targetUser); err != nil {
+		return fmt.Errorf("failed to remove password for user %s", targetUser)
+	}
+
+	logrus.Debug("Removing password for user root")
+
+	if err := shell.Run("passwd", nil, nil, nil, "--delete", "root"); err != nil {
+		return errors.New("failed to remove password for root")
+	}
+
+	return nil
+}
+
 func mountBind(containerPath, source, flags string) error {
 	fi, err := os.Stat(source)
 	if err != nil {