Skip to content

fix: skip hashing unloaded env reference #3029

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

Merged
merged 2 commits into from
Jan 10, 2025
Merged

fix: skip hashing unloaded env reference #3029

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
8cc981d
fix: skip hashing unloaded env reference
sweatybridge Jan 10, 2025
9cb374f
fix: zero maps and arrays before unmarshaling
sweatybridge Jan 10, 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
60 changes: 30 additions & 30 deletions pkg/config/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,23 +265,23 @@ func (h hook) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
if hook := h.CustomAccessToken; hook != nil {
if body.HookCustomAccessTokenEnabled = &hook.Enabled; hook.Enabled {
body.HookCustomAccessTokenUri = &hook.URI
if len(hook.Secrets.Value) > 0 {
if len(hook.Secrets.SHA256) > 0 {
body.HookCustomAccessTokenSecrets = &hook.Secrets.Value
}
}
}
if hook := h.SendEmail; hook != nil {
if body.HookSendEmailEnabled = &hook.Enabled; hook.Enabled {
body.HookSendEmailUri = &hook.URI
if len(hook.Secrets.Value) > 0 {
if len(hook.Secrets.SHA256) > 0 {
body.HookSendEmailSecrets = &hook.Secrets.Value
}
}
}
if hook := h.SendSMS; hook != nil {
if body.HookSendSmsEnabled = &hook.Enabled; hook.Enabled {
body.HookSendSmsUri = &hook.URI
if len(hook.Secrets.Value) > 0 {
if len(hook.Secrets.SHA256) > 0 {
body.HookSendSmsSecrets = &hook.Secrets.Value
}
}
Expand All @@ -290,15 +290,15 @@ func (h hook) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
if hook := h.MFAVerificationAttempt; hook != nil {
if body.HookMfaVerificationAttemptEnabled = &hook.Enabled; hook.Enabled {
body.HookMfaVerificationAttemptUri = &hook.URI
if len(hook.Secrets.Value) > 0 {
if len(hook.Secrets.SHA256) > 0 {
body.HookMfaVerificationAttemptSecrets = &hook.Secrets.Value
}
}
}
if hook := h.PasswordVerificationAttempt; hook != nil {
if body.HookPasswordVerificationAttemptEnabled = &hook.Enabled; hook.Enabled {
body.HookPasswordVerificationAttemptUri = &hook.URI
if len(hook.Secrets.Value) > 0 {
if len(hook.Secrets.SHA256) > 0 {
body.HookPasswordVerificationAttemptSecrets = &hook.Secrets.Value
}
}
Expand Down Expand Up @@ -512,7 +512,7 @@ func (s smtp) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
body.SmtpHost = &s.Host
body.SmtpPort = cast.Ptr(strconv.Itoa(int(s.Port)))
body.SmtpUser = &s.User
if len(s.Pass.Value) > 0 {
if len(s.Pass.SHA256) > 0 {
body.SmtpPass = &s.Pass.Value
}
body.SmtpAdminEmail = &s.AdminEmail
Expand Down Expand Up @@ -556,33 +556,33 @@ func (s sms) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
switch {
case s.Twilio.Enabled:
body.SmsProvider = cast.Ptr("twilio")
if len(s.Twilio.AuthToken.Value) > 0 {
if len(s.Twilio.AuthToken.SHA256) > 0 {
body.SmsTwilioAuthToken = &s.Twilio.AuthToken.Value
}
body.SmsTwilioAccountSid = &s.Twilio.AccountSid
body.SmsTwilioMessageServiceSid = &s.Twilio.MessageServiceSid
case s.TwilioVerify.Enabled:
body.SmsProvider = cast.Ptr("twilio_verify")
if len(s.TwilioVerify.AuthToken.Value) > 0 {
if len(s.TwilioVerify.AuthToken.SHA256) > 0 {
body.SmsTwilioVerifyAuthToken = &s.TwilioVerify.AuthToken.Value
}
body.SmsTwilioVerifyAccountSid = &s.TwilioVerify.AccountSid
body.SmsTwilioVerifyMessageServiceSid = &s.TwilioVerify.MessageServiceSid
case s.Messagebird.Enabled:
body.SmsProvider = cast.Ptr("messagebird")
if len(s.Messagebird.AccessKey.Value) > 0 {
if len(s.Messagebird.AccessKey.SHA256) > 0 {
body.SmsMessagebirdAccessKey = &s.Messagebird.AccessKey.Value
}
body.SmsMessagebirdOriginator = &s.Messagebird.Originator
case s.Textlocal.Enabled:
body.SmsProvider = cast.Ptr("textlocal")
if len(s.Textlocal.ApiKey.Value) > 0 {
if len(s.Textlocal.ApiKey.SHA256) > 0 {
body.SmsTextlocalApiKey = &s.Textlocal.ApiKey.Value
}
body.SmsTextlocalSender = &s.Textlocal.Sender
case s.Vonage.Enabled:
body.SmsProvider = cast.Ptr("vonage")
if len(s.Vonage.ApiSecret.Value) > 0 {
if len(s.Vonage.ApiSecret.SHA256) > 0 {
body.SmsVonageApiSecret = &s.Vonage.ApiSecret.Value
}
body.SmsVonageApiKey = &s.Vonage.ApiKey
Expand Down Expand Up @@ -647,15 +647,15 @@ func (e external) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
if p, ok := e["apple"]; ok {
if body.ExternalAppleEnabled = &p.Enabled; *body.ExternalAppleEnabled {
body.ExternalAppleClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalAppleSecret = &p.Secret.Value
}
}
}
if p, ok := e["azure"]; ok {
if body.ExternalAzureEnabled = &p.Enabled; *body.ExternalAzureEnabled {
body.ExternalAzureClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalAzureSecret = &p.Secret.Value
}
body.ExternalAzureUrl = &p.Url
Expand All @@ -664,47 +664,47 @@ func (e external) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
if p, ok := e["bitbucket"]; ok {
if body.ExternalBitbucketEnabled = &p.Enabled; *body.ExternalBitbucketEnabled {
body.ExternalBitbucketClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalBitbucketSecret = &p.Secret.Value
}
}
}
if p, ok := e["discord"]; ok {
if body.ExternalDiscordEnabled = &p.Enabled; *body.ExternalDiscordEnabled {
body.ExternalDiscordClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalDiscordSecret = &p.Secret.Value
}
}
}
if p, ok := e["facebook"]; ok {
if body.ExternalFacebookEnabled = &p.Enabled; *body.ExternalFacebookEnabled {
body.ExternalFacebookClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalFacebookSecret = &p.Secret.Value
}
}
}
if p, ok := e["figma"]; ok {
if body.ExternalFigmaEnabled = &p.Enabled; *body.ExternalFigmaEnabled {
body.ExternalFigmaClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalFigmaSecret = &p.Secret.Value
}
}
}
if p, ok := e["github"]; ok {
if body.ExternalGithubEnabled = &p.Enabled; *body.ExternalGithubEnabled {
body.ExternalGithubClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalGithubSecret = &p.Secret.Value
}
}
}
if p, ok := e["gitlab"]; ok {
if body.ExternalGitlabEnabled = &p.Enabled; *body.ExternalGitlabEnabled {
body.ExternalGitlabClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalGitlabSecret = &p.Secret.Value
}
body.ExternalGitlabUrl = &p.Url
Expand All @@ -713,7 +713,7 @@ func (e external) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
if p, ok := e["google"]; ok {
if body.ExternalGoogleEnabled = &p.Enabled; *body.ExternalGoogleEnabled {
body.ExternalGoogleClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalGoogleSecret = &p.Secret.Value
}
body.ExternalGoogleSkipNonceCheck = &p.SkipNonceCheck
Expand All @@ -722,15 +722,15 @@ func (e external) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
if p, ok := e["kakao"]; ok {
if body.ExternalKakaoEnabled = &p.Enabled; *body.ExternalKakaoEnabled {
body.ExternalKakaoClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalKakaoSecret = &p.Secret.Value
}
}
}
if p, ok := e["keycloak"]; ok {
if body.ExternalKeycloakEnabled = &p.Enabled; *body.ExternalKeycloakEnabled {
body.ExternalKeycloakClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalKeycloakSecret = &p.Secret.Value
}
body.ExternalKeycloakUrl = &p.Url
Expand All @@ -739,55 +739,55 @@ func (e external) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
if p, ok := e["linkedin_oidc"]; ok {
if body.ExternalLinkedinOidcEnabled = &p.Enabled; *body.ExternalLinkedinOidcEnabled {
body.ExternalLinkedinOidcClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalLinkedinOidcSecret = &p.Secret.Value
}
}
}
if p, ok := e["notion"]; ok {
if body.ExternalNotionEnabled = &p.Enabled; *body.ExternalNotionEnabled {
body.ExternalNotionClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalNotionSecret = &p.Secret.Value
}
}
}
if p, ok := e["slack_oidc"]; ok {
if body.ExternalSlackOidcEnabled = &p.Enabled; *body.ExternalSlackOidcEnabled {
body.ExternalSlackOidcClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalSlackOidcSecret = &p.Secret.Value
}
}
}
if p, ok := e["spotify"]; ok {
if body.ExternalSpotifyEnabled = &p.Enabled; *body.ExternalSpotifyEnabled {
body.ExternalSpotifyClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalSpotifySecret = &p.Secret.Value
}
}
}
if p, ok := e["twitch"]; ok {
if body.ExternalTwitchEnabled = &p.Enabled; *body.ExternalTwitchEnabled {
body.ExternalTwitchClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalTwitchSecret = &p.Secret.Value
}
}
}
if p, ok := e["twitter"]; ok {
if body.ExternalTwitterEnabled = &p.Enabled; *body.ExternalTwitterEnabled {
body.ExternalTwitterClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalTwitterSecret = &p.Secret.Value
}
}
}
if p, ok := e["workos"]; ok {
if body.ExternalWorkosEnabled = &p.Enabled; *body.ExternalWorkosEnabled {
body.ExternalWorkosClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalWorkosSecret = &p.Secret.Value
}
body.ExternalWorkosUrl = &p.Url
Expand All @@ -796,7 +796,7 @@ func (e external) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
if p, ok := e["zoom"]; ok {
if body.ExternalZoomEnabled = &p.Enabled; *body.ExternalZoomEnabled {
body.ExternalZoomClientId = &p.ClientId
if len(p.Secret.Value) > 0 {
if len(p.Secret.SHA256) > 0 {
body.ExternalZoomSecret = &p.Secret.Value
}
}
Expand Down
1 change: 1 addition & 0 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@ func (c *config) loadFromReader(v *viper.Viper, r io.Reader) error {
if err := v.UnmarshalExact(c, func(dc *mapstructure.DecoderConfig) {
dc.TagName = "toml"
dc.Squash = true
dc.ZeroFields = true
dc.DecodeHook = c.newDecodeHook(LoadEnvHook)
}); err != nil {
return errors.Errorf("failed to parse config: %w", err)
Expand Down
15 changes: 7 additions & 8 deletions pkg/config/secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,16 @@ func DecryptSecretHookFunc(hashKey string) mapstructure.DecodeHookFunc {
if t != reflect.TypeOf(result) {
return data, nil
}
ciphertext := data.(string)
// Skip hashing unloaded env
if matches := envPattern.FindStringSubmatch(ciphertext); len(matches) > 1 {
return result, nil
}
var err error
privKey := os.Getenv("DOTENV_PRIVATE_KEY")
for _, k := range strings.Split(privKey, ",") {
result.Value, err = decrypt(k, ciphertext)
if err == nil && len(result.Value) > 0 {
result.SHA256 = sha256Hmac(hashKey, result.Value)
// Use the first private key that successfully decrypts the secret
if result.Value, err = decrypt(k, data.(string)); err == nil {
// Unloaded env() references may be returned verbatim.
// Don't hash those values as they are meaningless.
if !envPattern.MatchString(result.Value) {
result.SHA256 = sha256Hmac(hashKey, result.Value)
}
break
}
}
Expand Down
Loading