diff options
Diffstat (limited to 'modules/auth/auth.go')
| -rw-r--r-- | modules/auth/auth.go | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 49ace507..2f773491 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -13,6 +13,7 @@ import ( "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/log" + "github.com/gogits/gogs/modules/middleware/binding" ) // Web form interface. @@ -21,7 +22,7 @@ type Form interface { } type RegisterForm struct { - UserName string `form:"username" binding:"Required;AlphaDash;MaxSize(30)"` + UserName string `form:"username" binding:"Required;AlphaDashDot;MaxSize(30)"` Email string `form:"email" binding:"Required;Email;MaxSize(50)"` Password string `form:"passwd" binding:"Required;MinSize(6);MaxSize(30)"` RetypePasswd string `form:"retypepasswd"` @@ -38,7 +39,7 @@ func (f *RegisterForm) Name(field string) string { return names[field] } -func (f *RegisterForm) Validate(errors *base.BindingErrors, req *http.Request, context martini.Context) { +func (f *RegisterForm) Validate(errors *binding.BindingErrors, req *http.Request, context martini.Context) { if req.Method == "GET" || errors.Count() == 0 { return } @@ -58,7 +59,7 @@ func (f *RegisterForm) Validate(errors *base.BindingErrors, req *http.Request, c } type LogInForm struct { - UserName string `form:"username" binding:"Required;AlphaDash;MaxSize(30)"` + UserName string `form:"username" binding:"Required;MaxSize(35)"` Password string `form:"passwd" binding:"Required;MinSize(6);MaxSize(30)"` Remember string `form:"remember"` } @@ -71,7 +72,7 @@ func (f *LogInForm) Name(field string) string { return names[field] } -func (f *LogInForm) Validate(errors *base.BindingErrors, req *http.Request, context martini.Context) { +func (f *LogInForm) Validate(errors *binding.BindingErrors, req *http.Request, context martini.Context) { if req.Method == "GET" || errors.Count() == 0 { return } @@ -99,7 +100,7 @@ func getMinMaxSize(field reflect.StructField) string { return "" } -func validate(errors *base.BindingErrors, data base.TmplData, form Form) { +func validate(errors *binding.BindingErrors, data base.TmplData, form Form) { typ := reflect.TypeOf(form) val := reflect.ValueOf(form) @@ -120,17 +121,19 @@ func validate(errors *base.BindingErrors, data base.TmplData, form Form) { if err, ok := errors.Fields[field.Name]; ok { data["Err_"+field.Name] = true switch err { - case base.BindingRequireError: + case binding.BindingRequireError: data["ErrorMsg"] = form.Name(field.Name) + " cannot be empty" - case base.BindingAlphaDashError: + case binding.BindingAlphaDashError: data["ErrorMsg"] = form.Name(field.Name) + " must be valid alpha or numeric or dash(-_) characters" - case base.BindingMinSizeError: + case binding.BindingAlphaDashDotError: + data["ErrorMsg"] = form.Name(field.Name) + " must be valid alpha or numeric or dash(-_) or dot characters" + case binding.BindingMinSizeError: data["ErrorMsg"] = form.Name(field.Name) + " must contain at least " + getMinMaxSize(field) + " characters" - case base.BindingMaxSizeError: + case binding.BindingMaxSizeError: data["ErrorMsg"] = form.Name(field.Name) + " must contain at most " + getMinMaxSize(field) + " characters" - case base.BindingEmailError: + case binding.BindingEmailError: data["ErrorMsg"] = form.Name(field.Name) + " is not a valid e-mail address" - case base.BindingUrlError: + case binding.BindingUrlError: data["ErrorMsg"] = form.Name(field.Name) + " is not a valid URL" default: data["ErrorMsg"] = "Unknown error: " + err @@ -175,7 +178,7 @@ type InstallForm struct { RunUser string `form:"run_user"` Domain string `form:"domain"` AppUrl string `form:"app_url"` - AdminName string `form:"admin_name" binding:"Required"` + AdminName string `form:"admin_name" binding:"Required;AlphaDashDot;MaxSize(30)"` AdminPasswd string `form:"admin_pwd" binding:"Required;MinSize(6);MaxSize(30)"` AdminEmail string `form:"admin_email" binding:"Required;Email;MaxSize(50)"` SmtpHost string `form:"smtp_host"` @@ -195,7 +198,7 @@ func (f *InstallForm) Name(field string) string { return names[field] } -func (f *InstallForm) Validate(errors *base.BindingErrors, req *http.Request, context martini.Context) { +func (f *InstallForm) Validate(errors *binding.BindingErrors, req *http.Request, context martini.Context) { if req.Method == "GET" || errors.Count() == 0 { return } |