Allow any uuid version

This commit is contained in:
ErickSkrauch 2018-03-19 01:16:37 +03:00
parent 9fc6ca54d9
commit 34598e39bc
No known key found for this signature in database
GPG Key ID: 669339FCBB30EE0E

View File

@ -18,6 +18,10 @@ import (
"github.com/thedevsaddam/govalidator" "github.com/thedevsaddam/govalidator"
) )
//noinspection GoSnakeCaseUsage
const UUID_ANY = "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"
var regexUuidAny = regexp.MustCompile(UUID_ANY)
func init() { func init() {
govalidator.AddCustomRule("md5", func(field string, rule string, message string, value interface{}) error { govalidator.AddCustomRule("md5", func(field string, rule string, message string, value interface{}) error {
val := []byte(value.(string)) val := []byte(value.(string))
@ -39,6 +43,20 @@ func init() {
return errors.New(message) return errors.New(message)
}) })
// Add ability to validate any possible uuid form
govalidator.AddCustomRule("uuid_any", func(field string, rule string, message string, value interface{}) error {
str := value.(string)
if !regexUuidAny.MatchString(str) {
if message == "" {
message = fmt.Sprintf("The %s field must contain valid UUID", field)
}
return errors.New(message)
}
return nil
})
} }
func (cfg *Config) PostSkin(resp http.ResponseWriter, req *http.Request) { func (cfg *Config) PostSkin(resp http.ResponseWriter, req *http.Request) {
@ -152,7 +170,7 @@ func validatePostSkinRequest(request *http.Request) map[string][]string {
validationRules := govalidator.MapData{ validationRules := govalidator.MapData{
"identityId": {"required", "numeric", "min:1"}, "identityId": {"required", "numeric", "min:1"},
"username": {"required"}, "username": {"required"},
"uuid": {"required", "uuid"}, "uuid": {"required", "uuid_any"},
"skinId": {"required", "numeric", "min:1"}, "skinId": {"required", "numeric", "min:1"},
"url": {"url"}, "url": {"url"},
"file:skin": {"ext:png", "size:24576", "mime:image/png"}, "file:skin": {"ext:png", "size:24576", "mime:image/png"},