diff --git a/libs/semver/internal/utils/str/parsers.go b/libs/semver/internal/utils/str/parsers.go index 57786a3..10fd062 100644 --- a/libs/semver/internal/utils/str/parsers.go +++ b/libs/semver/internal/utils/str/parsers.go @@ -14,10 +14,14 @@ package str -import "strconv" +import ( + "strconv" + + "github.com/ZupIT/horusec-devkit/pkg/enums/ozzovalidation" +) func ParseUIntOrDefault(s string) uint { - value, err := strconv.ParseUint(s, 10, 64) + value, err := strconv.ParseUint(s, ozzovalidation.Length10, ozzovalidation.Length64) if err != nil { return 0 } diff --git a/pkg/enums/ozzovalidation/values.go b/pkg/enums/ozzovalidation/values.go new file mode 100644 index 0000000..4c35007 --- /dev/null +++ b/pkg/enums/ozzovalidation/values.go @@ -0,0 +1,12 @@ +package ozzovalidation + +const ( + Length0 = 0 + Length1 = 1 + Length5 = 5 + Length6 = 6 + Length10 = 10 + Length64 = 64 + Length255 = 255 + Length500 = 500 +) diff --git a/pkg/services/http/router/router.go b/pkg/services/http/router/router.go index f34ae38..212f107 100644 --- a/pkg/services/http/router/router.go +++ b/pkg/services/http/router/router.go @@ -20,6 +20,8 @@ import ( "net/http" "time" + "github.com/ZupIT/horusec-devkit/pkg/enums/ozzovalidation" + "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" "github.com/go-chi/cors" @@ -47,7 +49,7 @@ type Router struct { func NewHTTPRouter(corsOptions *cors.Options, defaultPort string) IRouter { router := &Router{ port: env.GetEnvOrDefault(enums.HorusecPort, defaultPort), - timeout: time.Duration(env.GetEnvOrDefaultInt(enums.HorusecRouterTimeout, 10)) * time.Second, + timeout: time.Duration(env.GetEnvOrDefaultInt(enums.HorusecRouterTimeout, ozzovalidation.Length10)) * time.Second, corsOptions: corsOptions, router: chi.NewRouter(), } diff --git a/pkg/utils/jwt/entities/jwt_claims.go b/pkg/utils/jwt/entities/jwt_claims.go index 0aa87e6..777ba15 100644 --- a/pkg/utils/jwt/entities/jwt_claims.go +++ b/pkg/utils/jwt/entities/jwt_claims.go @@ -19,6 +19,8 @@ import ( validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/go-ozzo/ozzo-validation/v4/is" "github.com/google/uuid" + + "github.com/ZupIT/horusec-devkit/pkg/enums/ozzovalidation" ) type JWTClaims struct { @@ -30,8 +32,10 @@ type JWTClaims struct { func (j *JWTClaims) Validate() error { return validation.ValidateStruct(j, - validation.Field(&j.Username, validation.Required, validation.Length(1, 255)), - validation.Field(&j.Email, validation.Required, validation.Length(1, 255)), + validation.Field(&j.Username, validation.Required, + validation.Length(ozzovalidation.Length1, ozzovalidation.Length255)), + validation.Field(&j.Email, validation.Required, + validation.Length(ozzovalidation.Length1, ozzovalidation.Length255)), validation.Field(&j.Subject, validation.Required, is.UUID, validation.NotIn(uuid.Nil)), ) }