Fix env config parsing for "GITEA____APP_NAME" (#26001) (#26013)

Backport #26001 by @wxiaoguang Regression of #24832 Fix the bug and add a test for it Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
go-gitea · Jul 20, 2023 · 4d5e3b9 · 4d5e3b9
1 parent 1ba0baa
commit 4d5e3b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/modules/setting/config_env.go b/modules/setting/config_env.go
@@ -86,7 +86,7 @@ func decodeEnvSectionKey(encoded string) (ok bool, section, key string) {
 		key += remaining
 	}
 	section = strings.ToLower(section)
-	ok = section != "" && key != ""
+	ok = key != ""
 	if !ok {
 		section = ""
 		key = ""

diff --git a/modules/setting/config_env_test.go b/modules/setting/config_env_test.go
@@ -48,6 +48,12 @@ func TestDecodeEnvironmentKey(t *testing.T) {
 	assert.Equal(t, "", key)
 	assert.False(t, file)
 
+	ok, section, key, file = decodeEnvironmentKey(prefix, suffix, "GITEA____KEY")
+	assert.True(t, ok)
+	assert.Equal(t, "", section)
+	assert.Equal(t, "KEY", key)
+	assert.False(t, file)
+
 	ok, section, key, file = decodeEnvironmentKey(prefix, suffix, "GITEA__SEC__KEY")
 	assert.True(t, ok)
 	assert.Equal(t, "sec", section)