Skip to content

fix(config): prevent profile inheritance loops #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(config): prevent profile inheritance loops #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2432e9e
This commit introduces two main changes to the config loading logic t…
xilu0 Sep 16, 2025
8fd3a89
Fix: nil map panic in ConfigLoader tests
xilu0 Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions vault/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,15 @@ type ConfigLoader struct {
ActiveProfile string

visitedProfiles []string
sourceChain map[string]bool
}

func NewConfigLoader(baseConfig ProfileConfig, file *ConfigFile, activeProfile string) *ConfigLoader {
return &ConfigLoader{
BaseConfig: baseConfig,
File: file,
ActiveProfile: activeProfile,
sourceChain: make(map[string]bool),
}
}

Expand Down Expand Up @@ -405,11 +407,6 @@ func (cl *ConfigLoader) populateFromConfigFile(config *ProfileConfig, profileNam
if err != nil {
return err
}
} else if profileName != defaultSectionName {
err := cl.populateFromConfigFile(config, defaultSectionName)
if err != nil {
return err
}
Comment on lines -408 to -412
Copy link

@mbevc1 mbevc1 Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't we want to inherit default profile? At least in all non-chained profiles? 🤔

}

// Ignore source_profile if it recursively refers to the profile
Expand Down Expand Up @@ -516,6 +513,14 @@ func (cl *ConfigLoader) hydrateSourceConfig(config *ProfileConfig) error {

// GetProfileConfig loads the profile from the config file and environment variables into config
func (cl *ConfigLoader) GetProfileConfig(profileName string) (*ProfileConfig, error) {
if cl.sourceChain[profileName] {
return nil, fmt.Errorf("Loop detected in source_profile chain for profile '%s'", profileName)
}
cl.sourceChain[profileName] = true
defer func() {
delete(cl.sourceChain, profileName)
}()

config := cl.BaseConfig
config.ProfileName = profileName
cl.populateFromEnv(&config)
Expand Down
14 changes: 7 additions & 7 deletions vault/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ func TestIncludeProfile(t *testing.T) {
t.Fatal(err)
}

configLoader := &vault.ConfigLoader{File: configFile}
configLoader := vault.NewConfigLoader(vault.ProfileConfig{}, configFile, "")
config, err := configLoader.GetProfileConfig("testincludeprofile2")
if err != nil {
t.Fatalf("Should have found a profile: %v", err)
Expand All @@ -273,7 +273,7 @@ func TestIncludeSsoSession(t *testing.T) {
t.Fatal(err)
}

configLoader := &vault.ConfigLoader{File: configFile}
configLoader := vault.NewConfigLoader(vault.ProfileConfig{}, configFile, "")
config, err := configLoader.GetProfileConfig("with-sso-session")
if err != nil {
t.Fatalf("Should have found a profile: %v", err)
Expand Down Expand Up @@ -368,7 +368,7 @@ source_profile=foo
t.Fatalf("Expected '%s', got '%s'", expectedSourceProfile, def.SourceProfile)
}

configLoader := &vault.ConfigLoader{File: configFile}
configLoader := vault.NewConfigLoader(vault.ProfileConfig{}, configFile, "")
config, err := configLoader.GetProfileConfig("foo")
if err != nil {
t.Fatalf("Should have found a profile: %v", err)
Expand Down Expand Up @@ -405,7 +405,7 @@ source_profile=root
t.Fatalf("Expected '%s', got '%s'", expectedSourceProfile, def.SourceProfile)
}

configLoader := &vault.ConfigLoader{File: configFile}
configLoader := vault.NewConfigLoader(vault.ProfileConfig{}, configFile, "")
config, err := configLoader.GetProfileConfig("foo")
if err != nil {
t.Fatalf("Should have found a profile: %v", err)
Expand Down Expand Up @@ -495,7 +495,7 @@ transitive_session_tags = tagOne ,tagTwo,tagThree
if err != nil {
t.Fatal(err)
}
configLoader := &vault.ConfigLoader{File: configFile, ActiveProfile: "tagged"}
configLoader := vault.NewConfigLoader(vault.ProfileConfig{}, configFile, "tagged")
config, err := configLoader.GetProfileConfig("tagged")
if err != nil {
t.Fatalf("Should have found a profile: %v", err)
Expand Down Expand Up @@ -532,7 +532,7 @@ transitive_session_tags = tagOne ,tagTwo,tagThree
if err != nil {
t.Fatal(err)
}
configLoader := &vault.ConfigLoader{File: configFile, ActiveProfile: "tagged"}
configLoader := vault.NewConfigLoader(vault.ProfileConfig{}, configFile, "tagged")
config, err := configLoader.GetProfileConfig("tagged")
if err != nil {
t.Fatalf("Should have found a profile: %v", err)
Expand Down Expand Up @@ -577,7 +577,7 @@ source_profile = interim
if err != nil {
t.Fatal(err)
}
configLoader := &vault.ConfigLoader{File: configFile, ActiveProfile: "target"}
configLoader := vault.NewConfigLoader(vault.ProfileConfig{}, configFile, "target")
config, err := configLoader.GetProfileConfig("target")
if err != nil {
t.Fatalf("Should have found a profile: %v", err)
Expand Down
6 changes: 3 additions & 3 deletions vault/vault_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ web_identity_token_process = oidccli raw
if err != nil {
t.Fatal(err)
}
configLoader := &vault.ConfigLoader{File: configFile, ActiveProfile: "role2"}
configLoader := vault.NewConfigLoader(vault.ProfileConfig{}, configFile, "role2")
config, err := configLoader.GetProfileConfig("role2")
if err != nil {
t.Fatalf("Should have found a profile: %v", err)
Expand Down Expand Up @@ -55,7 +55,7 @@ role_arn=arn:aws:iam::12345678901:role/allow-view-only-access-from-other-account
if err != nil {
t.Fatal(err)
}
configLoader := &vault.ConfigLoader{File: configFile, ActiveProfile: "my-shared-base-profile"}
configLoader := vault.NewConfigLoader(vault.ProfileConfig{}, configFile, "my-shared-base-profile")
config, err := configLoader.GetProfileConfig("my-shared-base-profile")
if err != nil {
t.Fatalf("Should have found a profile: %v", err)
Expand Down Expand Up @@ -103,7 +103,7 @@ sso_registration_scopes=sso:account:access
if err != nil {
t.Fatal(err)
}
configLoader := &vault.ConfigLoader{File: configFile, ActiveProfile: "test"}
configLoader := vault.NewConfigLoader(vault.ProfileConfig{}, configFile, "test")
config, err := configLoader.GetProfileConfig("test")
if err != nil {
t.Fatalf("Should have found a profile: %v", err)
Expand Down
Loading