Skip to content
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

Fix incorrect validation of AWS Transfer username #17621

Merged
merged 2 commits into from
Feb 19, 2021
Merged

Fix incorrect validation of AWS Transfer username #17621

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b7aa42
Fix incorrect validation of AWS Transfer username
dortort Feb 15, 2021
56a4f0d
Tweak to error message
gdavison Feb 19, 2021
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
4 changes: 2 additions & 2 deletions aws/validators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ func validateTransferServerID(v interface{}, k string) (ws []string, errors []er
func validateTransferUserName(v interface{}, k string) (ws []string, errors []error) {
value := v.(string)
// https://docs.aws.amazon.com/transfer/latest/userguide/API_CreateUser.html
if !regexp.MustCompile(`^[a-zA-Z0-9_][a-zA-Z0-9_-]{2,99}$`).MatchString(value) {
errors = append(errors, fmt.Errorf("Invalid %q: must be between 3 and 100 alphanumeric or special characters hyphen and underscore. However, %q cannot begin with a hyphen", k, k))
if !regexp.MustCompile(`^[\w][\w@.-]{2,99}$`).MatchString(value) {
errors = append(errors, fmt.Errorf("Invalid %q: must be between 3 and 100 alphanumeric or special characters hyphen and underscore. However, %q cannot begin with a hyphen, period, or at sign", k, k))
}
return
}
Expand Down