fix env var from host truncated at equal sign

edgelesssys · Apr 24, 2024 · d8a2d7a · d8a2d7a
1 parent 4638e77
commit d8a2d7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ego/premain/core/core.go b/ego/premain/core/core.go
@@ -51,8 +51,8 @@ func PreMain(payload string, mounter Mounter, fs afero.Fs, hostEnviron []string)
 	// Convert host environment string array to key-value map
 	hostEnvironMap := make(map[string]string, len(hostEnviron))
 	for _, envVar := range hostEnviron {
-		splitString := strings.Split(envVar, "=")
-		hostEnvironMap[splitString[0]] = splitString[1]
+		name, val, _ := strings.Cut(envVar, "=")
+		hostEnvironMap[name] = val
 	}
 
 	// Check if we run as a Marble or a normal EGo application

diff --git a/ego/premain/core/core_test.go b/ego/premain/core/core_test.go
@@ -33,7 +33,7 @@ func TestPremain(t *testing.T) {
 	assert := assert.New(t)
 	require := require.New(t)
 
-	hostEnviron := []string{"EDG_CWD=/host"}
+	hostEnviron := []string{"EDG_CWD=/host", "EDG_CONTAINS_EQUAL_SIGN=foo=bar"}
 	fs := afero.NewMemMapFs()
 
 	// sane default values
@@ -51,6 +51,7 @@ func TestPremain(t *testing.T) {
 	// Supply valid payload, no Marble
 	mounter := assertionMounter{assert: assert, expectedMounts: conf.Mounts, usedTargets: make(map[string]bool), remountAsHostFS: false}
 	assert.NoError(PreMain("", &mounter, fs, hostEnviron))
+	assert.Equal("foo=bar", os.Getenv("EDG_CONTAINS_EQUAL_SIGN"))
 
 	// Supply valid payload, no Marble
 	payload, err := json.Marshal(conf)