Log when CNB_LAUNCH_UMASK is incorrect

Pass a logger down to the process launcher and log when setting
the umaks is incorrect and continue.

Signed-off-by: adelaney21 <[email protected]>

Author: AidanDelaney

cmd/launcher/cli/launcher.go

@@ -49,6 +49,7 @@ func RunLaunch() error {
 		ExecD:              launch.NewExecDRunner(),
 		Shell:              launch.DefaultShell,
 		Setenv:             os.Setenv,
+		Logger:             cmd.DefaultLogger,
 	}
 
 	if err := launcher.Launch(os.Args[0], os.Args[1:]); err != nil {

launch/launcher.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/buildpacks/lifecycle/api"
 	"github.com/buildpacks/lifecycle/env"
+	"github.com/buildpacks/lifecycle/log"
 )
 
 var (
@@ -26,9 +27,11 @@ type Launcher struct {
 	ExecD              ExecD
 	Shell              Shell
 	LayersDir          string
+	Logger             *log.DefaultLogger
 	PlatformAPI        *api.Version
 	Processes          []Process
 	Setenv             func(string, string) error
+	Setumask           func(Env) error
 }
 
 type ExecFunc func(argv0 string, argv []string, envv []string) error
@@ -69,9 +72,12 @@ func (l *Launcher) LaunchProcess(self string, proc Process) error {
 	}
 	proc.WorkingDirectory = getProcessWorkingDirectory(proc, l.AppDir)
 
-	err := SetUmask(l.Env)
-	if err != nil {
-		return errors.Wrap(err, "umask")
+	if l.Setumask == nil {
+		l.Setumask = SetUmask
+	}
+	err := l.Setumask(l.Env)
+	if err != nil && l.Logger != nil {
+		l.Logger.Errorf("invalid umask: %s", err)
 	}
 
 	if proc.Direct {

launch/launcher_test.go

@@ -124,6 +124,9 @@ func testLauncher(t *testing.T, when spec.G, it spec.S) {
 				// set command to something on the real path so exec.LookPath succeeds
 				process.Command = launch.NewRawCommand([]string{"sh"})
 
+				launcher.Setumask = func(_ launch.Env) error {
+					return nil
+				}
 				mockEnv.EXPECT().Get("PATH").Return("some-path").AnyTimes()
 				launcher.Setenv = func(k string, v string) error {
 					if k == "PATH" {
@@ -373,6 +376,9 @@ func testLauncher(t *testing.T, when spec.G, it spec.S) {
 			it.Before(func() {
 				shell = &fakeShell{}
 				launcher.Shell = shell
+				launcher.Setumask = func(_ launch.Env) error {
+					return nil
+				}
 			})
 
 			it("sets Caller to self", func() {

launch/umask_unix.go

@@ -3,25 +3,33 @@
 package launch
 
 import (
+	"fmt"
 	"strconv"
 	"syscall"
 
 	"github.com/pkg/errors"
 )
 
+const (
+	umaskEnvVar = "CNB_LAUNCH_UMASK"
+)
+
 // SetUmask on unix systems from the value in the `UMASK` environment variable
 func SetUmask(env Env) error {
 	return SetUmaskWith(env, syscall.Umask)
 }
 
 // SetUmaskWith the injected function umaskFn
 func SetUmaskWith(env Env, umaskFn func(int) int) error {
-	if umask := env.Get("UMASK"); umask != "" {
-		u, err := strconv.ParseInt(umask, 8, 0)
-		if err != nil {
-			return errors.Wrap(err, "invalid umask value")
-		}
-		umaskFn(int(u))
+	umask := env.Get(umaskEnvVar)
+	if umask == "" {
+		return nil
+	}
+
+	u, err := strconv.ParseInt(umask, 8, 0)
+	if err != nil {
+		return errors.Wrap(err, fmt.Sprintf("invalid umask value %s", umask))
 	}
+	umaskFn(int(u))
 	return nil
 }

launch/umask_unix_test.go

@@ -33,7 +33,7 @@ func testUmask(t *testing.T, when spec.G, it spec.S) {
 
 			for _, tt := range tests {
 				t.Run(tt.name, func(t *testing.T) {
-					environ := env.NewLaunchEnv([]string{"UMASK=" + tt.umask}, "", "")
+					environ := env.NewLaunchEnv([]string{"CNB_LAUNCH_UMASK=" + tt.umask}, "", "")
 
 					var called int
 					spy := func(m int) int {
@@ -50,7 +50,7 @@ func testUmask(t *testing.T, when spec.G, it spec.S) {
 		})
 
 		it("returns error for invalid umask", func() {
-			environ := env.NewLaunchEnv([]string{"UMASK=invalid"}, "", "")
+			environ := env.NewLaunchEnv([]string{"CNB_LAUNCH_UMASK=invalid"}, "", "")
 
 			err := launch.SetUmaskWith(environ, func(int) int { return 0 })