From e4268104555c53946eb0adc1f2dad0c1539643f9 Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Sun, 9 Apr 2023 14:06:25 +0200 Subject: [PATCH] allow additional characters in usernames and passwords (#1580) (#1666) --- internal/conf/credential.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/conf/credential.go b/internal/conf/credential.go index 85d19978..aa656e65 100644 --- a/internal/conf/credential.go +++ b/internal/conf/credential.go @@ -7,9 +7,9 @@ import ( "strings" ) -var reCredential = regexp.MustCompile(`^[a-zA-Z0-9!\$\(\)\*\+\.;<=>\[\]\^_\-\{\}]+$`) +var reCredential = regexp.MustCompile(`^[a-zA-Z0-9!\$\(\)\*\+\.;<=>\[\]\^_\-\{\}@#&]+$`) -const credentialSupportedChars = "A-Z,0-9,!,$,(,),*,+,.,;,<,=,>,[,],^,_,-,{,}" +const credentialSupportedChars = "A-Z,0-9,!,$,(,),*,+,.,;,<,=,>,[,],^,_,-,\",\",@,#,&" // Credential is a parameter that is used as username or password. type Credential string @@ -29,7 +29,7 @@ func (d *Credential) UnmarshalJSON(b []byte) error { if in != "" && !strings.HasPrefix(in, "sha256:") && !reCredential.MatchString(in) { - return fmt.Errorf("contains unsupported characters (supported are %s)", credentialSupportedChars) + return fmt.Errorf("credential contains unsupported characters. Supported are: %s", credentialSupportedChars) } *d = Credential(in)