fix(server): env setup

This commit is contained in:
Lakhan Samani
2022-01-19 23:19:20 +05:30
parent 5ecc49f861
commit 7785f98dcd
4 changed files with 40 additions and 7 deletions

View File

@@ -28,6 +28,7 @@ func PersistEnv() error {
if err != nil {
return err
}
encryptedConfig, err := utils.EncryptAES(configData)
if err != nil {
return err
@@ -121,6 +122,7 @@ func PersistEnv() error {
}
}
envstore.EnvInMemoryStoreObj.UpdateEnvStore(jsonData)
if hasChanged {
encryptedConfig, err := utils.EncryptEnvData(jsonData)
if err != nil {

View File

@@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"log"
"strings"
"github.com/authorizerdev/authorizer/server/constants"
@@ -58,6 +59,7 @@ func AdminSignupResolver(ctx context.Context, params model.AdminSignupInput) (*m
}
configData, err := utils.EncryptEnvData(jsonData)
log.Println("=> config data from signup:", configData)
if err != nil {
return res, err
}

View File

@@ -18,8 +18,8 @@ func IsValidEmail(email string) bool {
// IsValidOrigin validates origin based on ALLOWED_ORIGINS
func IsValidOrigin(url string) bool {
allowedOrigins := envstore.EnvInMemoryStoreObj.GetEnvVariable(constants.EnvKeyAllowedOrigins).([]string)
if len(allowedOrigins) == 1 && allowedOrigins[0] == "*" {
allowedOrigins := envstore.EnvInMemoryStoreObj.GetEnvVariable(constants.EnvKeyAllowedOrigins).([]interface{})
if len(allowedOrigins) == 1 && allowedOrigins[0].(string) == "*" {
return true
}
@@ -28,10 +28,10 @@ func IsValidOrigin(url string) bool {
currentOrigin := hostName + ":" + port
for _, origin := range allowedOrigins {
replacedString := origin
replacedString := origin.(string)
// if has regex whitelisted domains
if strings.Contains(origin, "*") {
replacedString = strings.Replace(origin, ".", "\\.", -1)
if strings.Contains(origin.(string), "*") {
replacedString = strings.Replace(origin.(string), ".", "\\.", -1)
replacedString = strings.Replace(replacedString, "*", ".*", -1)
if strings.HasPrefix(replacedString, ".*") {