Skip to content

Commit

Permalink
Fix incorrect CurrentUser check for docker rootless (#24441)
Browse files Browse the repository at this point in the history
The IsRunUserMatchCurrentUser logic is fragile, the "SSH" config is not
ready when it executes.
  • Loading branch information
wxiaoguang authored Apr 30, 2023
1 parent f7cf7e6 commit 2a56666
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions modules/setting/setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,9 @@ func loadCommonSettingsFrom(cfg ConfigProvider) {
loadLogFrom(cfg)
loadServerFrom(cfg)
loadSSHFrom(cfg)

mustCurrentRunUserMatch(cfg) // it depends on the SSH config, only non-builtin SSH server requires this check

loadOAuth2From(cfg)
loadSecurityFrom(cfg)
loadAttachmentFrom(cfg)
Expand Down Expand Up @@ -282,14 +285,6 @@ func loadRunModeFrom(rootCfg ConfigProvider) {
RunMode = rootSec.Key("RUN_MODE").MustString("prod")
}
IsProd = strings.EqualFold(RunMode, "prod")
// Does not check run user when the install lock is off.
installLock := rootCfg.Section("security").Key("INSTALL_LOCK").MustBool(false)
if installLock {
currentUser, match := IsRunUserMatchCurrentUser(RunUser)
if !match {
log.Fatal("Expect user '%s' but current user is: %s", RunUser, currentUser)
}
}

// check if we run as root
if os.Getuid() == 0 {
Expand All @@ -301,6 +296,17 @@ func loadRunModeFrom(rootCfg ConfigProvider) {
}
}

func mustCurrentRunUserMatch(rootCfg ConfigProvider) {
// Does not check run user when the "InstallLock" is off.
installLock := rootCfg.Section("security").Key("INSTALL_LOCK").MustBool(false)
if installLock {
currentUser, match := IsRunUserMatchCurrentUser(RunUser)
if !match {
log.Fatal("Expect user '%s' but current user is: %s", RunUser, currentUser)
}
}
}

// LoadSettings initializes the settings for normal start up
func LoadSettings() {
loadDBSetting(CfgProvider)
Expand Down

0 comments on commit 2a56666

Please sign in to comment.