Fix race condition in concurrent creation of config and fallback dirs

drichardson · nmanoogian · commit b008b823ec58 · 2025-06-23T15:01:10.000-04:00
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
@@ -564,13 +564,11 @@ func initFallbackDir(cmd *cobra.Command, config models.ScopedOptions, format mod
 			legacyFallbackPath = legacyFallbackFile(config.EnclaveProject.Value, config.EnclaveConfig.Value)
 		}
 
-		if !utils.Exists(configuration.UserFallbackDir) {
-			err := os.Mkdir(configuration.UserFallbackDir, 0700)
-			if err != nil {
-				utils.LogDebug("Unable to create directory for fallback file")
-				if exitOnWriteFailure {
-					utils.HandleError(err, "Unable to create directory for fallback file", strings.Join(controllers.WriteFailureMessage(), "\n"))
-				}
+		err := os.Mkdir(configuration.UserFallbackDir, 0700)
+		if err != nil && !os.IsExist(err) {
+			utils.LogDebug("Unable to create directory for fallback file")
+			if exitOnWriteFailure {
+				utils.HandleError(err, "Unable to create directory for fallback file", strings.Join(controllers.WriteFailureMessage(), "\n"))
 			}
 		}
 	}
diff --git a/pkg/configuration/config.go b/pkg/configuration/config.go
@@ -70,12 +70,9 @@ func Setup() {
 	utils.LogDebug(fmt.Sprintf("Using config dir %s", UserConfigDir))
 	utils.LogDebug(fmt.Sprintf("Using config file %s", UserConfigFile))
 
-	if !utils.Exists(UserConfigDir) {
-		utils.LogDebug(fmt.Sprintf("Creating the config directory %s", UserConfigDir))
-		err := os.Mkdir(UserConfigDir, 0700)
-		if err != nil {
-			utils.HandleError(err, fmt.Sprintf("Unable to create config directory %s", UserConfigDir))
-		}
+	err := os.Mkdir(UserConfigDir, 0700)
+	if err != nil && !os.IsExist(err) {
+		utils.HandleError(err, fmt.Sprintf("Unable to create config directory %s", UserConfigDir))
 	}
 
 	// This may be different from `UserConfigDir` if `--configuration` was provided

Original file line number	Diff line number	Diff line change
`@@ -564,13 +564,11 @@ func initFallbackDir(cmd *cobra.Command, config models.ScopedOptions, format mod`
`564`	`564`	`legacyFallbackPath = legacyFallbackFile(config.EnclaveProject.Value, config.EnclaveConfig.Value)`
`565`	`565`	`}`
`566`	`566`
`567`		`- if !utils.Exists(configuration.UserFallbackDir) {`
`568`		`- err := os.Mkdir(configuration.UserFallbackDir, 0700)`
`569`		`- if err != nil {`
`570`		`- utils.LogDebug("Unable to create directory for fallback file")`
`571`		`- if exitOnWriteFailure {`
`572`		`- utils.HandleError(err, "Unable to create directory for fallback file", strings.Join(controllers.WriteFailureMessage(), "\n"))`
`573`		`- }`
	`567`	`+ err := os.Mkdir(configuration.UserFallbackDir, 0700)`
	`568`	`+ if err != nil && !os.IsExist(err) {`
	`569`	`+ utils.LogDebug("Unable to create directory for fallback file")`
	`570`	`+ if exitOnWriteFailure {`
	`571`	`+ utils.HandleError(err, "Unable to create directory for fallback file", strings.Join(controllers.WriteFailureMessage(), "\n"))`
`574`	`572`	`}`
`575`	`573`	`}`
`576`	`574`	`}`