Mercurial > gemma
changeset 425:c49f4c1808b1
Simplified user validation with new UserName type.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 16 Aug 2018 17:31:25 +0200 |
| parents | abe4efa339bc |
| children | 4a03d000c854 |
| files | pkg/controllers/token.go pkg/controllers/types.go pkg/controllers/user.go |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/controllers/token.go Thu Aug 16 15:35:47 2018 +0200 +++ b/pkg/controllers/token.go Thu Aug 16 17:31:25 2018 +0200 @@ -63,7 +63,7 @@ password = req.FormValue("password") ) - if user == "" || !UserName(user).isValid() || password == "" { + if !UserName(user).isValid() || password == "" { http.Error(rw, "Invalid credentials", http.StatusBadRequest) return }
--- a/pkg/controllers/types.go Thu Aug 16 15:35:47 2018 +0200 +++ b/pkg/controllers/types.go Thu Aug 16 17:31:25 2018 +0200 @@ -80,7 +80,7 @@ var errNoValidUser = errors.New("Not a valid user") func (u UserName) isValid() bool { - return !strings.ContainsAny(string(u), `\"':;`) + return u != "" && !strings.ContainsAny(string(u), `\"':;`) } func (u *UserName) UnmarshalJSON(data []byte) error {
--- a/pkg/controllers/user.go Thu Aug 16 15:35:47 2018 +0200 +++ b/pkg/controllers/user.go Thu Aug 16 17:31:25 2018 +0200 @@ -57,8 +57,8 @@ ) (jr JSONResult, err error) { user := mux.Vars(req)["user"] - if user == "" { - err = JSONError{http.StatusBadRequest, "error: user empty"} + if !UserName(user).isValid() { + err = JSONError{http.StatusBadRequest, "error: user invalid"} return } @@ -95,7 +95,7 @@ ) (jr JSONResult, err error) { user := UserName(mux.Vars(req)["user"]) - if user == "" || !user.isValid() { + if !user.isValid() { err = JSONError{http.StatusBadRequest, "error: user invalid"} return } @@ -254,7 +254,7 @@ ) (jr JSONResult, err error) { user := UserName(mux.Vars(req)["user"]) - if user == "" || !user.isValid() { + if !user.isValid() { err = JSONError{http.StatusBadRequest, "error: user invalid"} return }