toolshed/abra
4
2
Fork 18
Code Issues 33 Pull Requests 3 Packages Releases 40 Activity

Move secret checking to a shared location.

Browse Source
This commit is contained in:
Rich M
2023-10-05 18:13:37 +01:00
parent 2abb7264b8
commit 66cf63a665
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cli/app/new.go
View File

@ -111,7 +111,7 @@ var appNewCommand = cli.Command{
return err return err
} }
if err := ensureSecretLengths(secretsConfig, internal.Domain, sanitisedAppName); err != nil { if err := secret.EnsureSecretLengths(secretsConfig, internal.Domain, sanitisedAppName); err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }
@ -260,19 +260,3 @@ func ensureServerFlag() error {
return nil return nil
} }
func ensureSecretLengths(secrets map[string]string, domainName string, sanitisedAppName string) error {
if len(sanitisedAppName) > config.MAX_SANITISED_APP_NAME_LENGTH {
sanitisedAppName = sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH]
}
domainAndFormatLength := len(sanitisedAppName) + 4
for secretName := range secrets {
if len(secretName)+domainAndFormatLength > config.MAX_DOCKER_SECRET_LENGTH {
return fmt.Errorf("secret %s is too long (> %d chars when combined with %s)", secretName, config.MAX_DOCKER_SECRET_LENGTH, sanitisedAppName)
}
}
return nil
}

17
pkg/secret/secret.go
View File

@ -11,6 +11,7 @@ import (
"sync" "sync"
"coopcloud.tech/abra/pkg/client" "coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/abra/pkg/upstream/stack" "coopcloud.tech/abra/pkg/upstream/stack"
loader "coopcloud.tech/abra/pkg/upstream/stack" loader "coopcloud.tech/abra/pkg/upstream/stack"
"github.com/decentral1se/passgen" "github.com/decentral1se/passgen"
@ -209,3 +210,19 @@ func GenerateSecrets(cl *dockerClient.Client, secretsFromConfig map[string]strin
return secrets, nil return secrets, nil
} }
func EnsureSecretLengths(secrets map[string]string, domainName string, sanitisedAppName string) error {
if len(sanitisedAppName) > config.MAX_SANITISED_APP_NAME_LENGTH {
sanitisedAppName = sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH]
}
domainAndFormatLength := len(sanitisedAppName) + 4
for secretName := range secrets {
if len(secretName)+domainAndFormatLength > config.MAX_DOCKER_SECRET_LENGTH {
return fmt.Errorf("secret %s is too long (> %d chars when combined with %s)", secretName, config.MAX_DOCKER_SECRET_LENGTH, sanitisedAppName)
}
}
return nil
}