Merge pull request #16190 from enj/enj/i/validate_provider_username

openshift-merge-robot · web-flow · commit 2ee1145f8ce2 · 2017-09-06T23:37:27.000-07:00
Automatic merge from submit-queue (batch tested with PRs 15994, 16182, 16190, 16174) Correctly validate identity provider username `ValidateIdentityProviderUserName` should be used to validate the provider username, not `ValidateIdentityProviderName`. This makes it so that `~` cannot be used as a provider username. Signed-off-by: Monis Khan <mkhan@redhat.com> /assign @liggitt @openshift/sig-security
diff --git a/pkg/user/apis/user/validation/validation.go b/pkg/user/apis/user/validation/validation.go
@@ -139,7 +139,7 @@ func ValidateIdentity(identity *userapi.Identity) field.ErrorList {
 
 	if len(identity.ProviderUserName) == 0 {
 		allErrs = append(allErrs, field.Required(field.NewPath("providerUserName"), ""))
-	} else if reasons := ValidateIdentityProviderName(identity.ProviderUserName); len(reasons) != 0 {
+	} else if reasons := ValidateIdentityProviderUserName(identity.ProviderUserName); len(reasons) != 0 {
 		allErrs = append(allErrs, field.Invalid(field.NewPath("providerUserName"), identity.ProviderUserName, strings.Join(reasons, ", ")))
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func ValidateIdentity(identity *userapi.Identity) field.ErrorList {`
`139`	`139`
`140`	`140`	`if len(identity.ProviderUserName) == 0 {`
`141`	`141`	`allErrs = append(allErrs, field.Required(field.NewPath("providerUserName"), ""))`
`142`		`- } else if reasons := ValidateIdentityProviderName(identity.ProviderUserName); len(reasons) != 0 {`
	`142`	`+ } else if reasons := ValidateIdentityProviderUserName(identity.ProviderUserName); len(reasons) != 0 {`
`143`	`143`	`allErrs = append(allErrs, field.Invalid(field.NewPath("providerUserName"), identity.ProviderUserName, strings.Join(reasons, ", ")))`
`144`	`144`	`}`
`145`	`145`