fix: preserve cloak config defaults when mode omitted

This commit is contained in:
edlsh
2026-04-01 13:20:11 -04:00
parent 37249339ac
commit 15c2f274ea
2 changed files with 35 additions and 19 deletions
+11 -19
View File
@@ -1241,36 +1241,28 @@ func applyCloaking(ctx context.Context, cfg *config.Config, auth *cliproxyauth.A
useExperimentalCCHSigning := experimentalCCHSigningEnabled(cfg, auth)
// Get cloak config from ClaudeKey configuration
cloakCfg := resolveClaudeKeyCloakConfig(cfg, auth)
attrMode, attrStrict, attrWords, attrCache := getCloakConfigFromAuth(auth)
// Determine cloak settings
var cloakMode string
var strictMode bool
var sensitiveWords []string
var cacheUserID bool
cloakMode := attrMode
strictMode := attrStrict
sensitiveWords := attrWords
cacheUserID := attrCache
if cloakCfg != nil {
cloakMode = strings.TrimSpace(cloakCfg.Mode)
if cloakMode == "" {
cloakMode = attrMode
strictMode = attrStrict
sensitiveWords = attrWords
} else {
strictMode = cloakCfg.StrictMode
if mode := strings.TrimSpace(cloakCfg.Mode); mode != "" {
cloakMode = mode
}
if cloakCfg.StrictMode {
strictMode = true
}
if len(cloakCfg.SensitiveWords) > 0 {
sensitiveWords = cloakCfg.SensitiveWords
}
if cloakCfg.CacheUserID != nil {
cacheUserID = *cloakCfg.CacheUserID
} else {
cacheUserID = attrCache
}
} else {
cloakMode = attrMode
strictMode = attrStrict
sensitiveWords = attrWords
cacheUserID = attrCache
}
// Determine if cloaking should be applied