Skip to content
Snippets Groups Projects
Commit 48917ba5 authored by Gabriel Zachmann's avatar Gabriel Zachmann
Browse files

refactor empty string comparison

parent 8921c7e9
No related branches found
No related tags found
No related merge requests found
Showing
with 31 additions and 35 deletions
......@@ -161,7 +161,7 @@ func createTables(tx *sqlx.Tx) error {
}
for _, cmd := range dbdefinition.DDL {
cmd = strings.TrimSpace(cmd)
if len(cmd) > 0 && !strings.HasPrefix(cmd, "--") {
if cmd != "" && !strings.HasPrefix(cmd, "--") {
log.Trace(cmd)
if _, err := tx.Exec(cmd); err != nil {
return err
......
......@@ -181,7 +181,7 @@ func validate() error {
return fmt.Errorf("invalid config: server.hostname not set")
}
if conf.Server.TLS.Enabled {
if len(conf.Server.TLS.Key) > 0 && len(conf.Server.TLS.Cert) > 0 {
if conf.Server.TLS.Key != "" && conf.Server.TLS.Cert != "" {
conf.Server.Port = 443
} else {
conf.Server.TLS.Enabled = false
......
......@@ -31,17 +31,15 @@ type ConsentCode struct {
}
func (c *ConsentCode) String() string {
if len(c.public) > 0 {
return c.public
if c.public == "" {
c.public = c.r + c.encodedInfo
}
c.public = c.r + c.encodedInfo
return c.public
}
func (c *ConsentCode) GetState() string {
if len(c.state) > 0 {
return c.state
if c.state == "" {
c.state = hashUtils.HMACSHA512Str([]byte(c.r), []byte("state"))[:stateLen] + c.encodedInfo
}
c.state = hashUtils.HMACSHA512Str([]byte(c.r), []byte("state"))[:stateLen] + c.encodedInfo
return c.state
}
......@@ -38,7 +38,7 @@ func createProxyToken(token string) *proxyToken {
// parseProxyToken parses the proxy token string into a proxyToken
func parseProxyToken(token string) *proxyToken {
var id string
if len(token) > 0 {
if token != "" {
id = hashUtils.SHA512Str([]byte(token))
}
return &proxyToken{
......@@ -74,7 +74,7 @@ func (pt *proxyToken) SetJWT(jwt string) (err error) {
// JWT returns the decrypted jwt that is linked to this proxyToken
func (pt *proxyToken) JWT(tx *sqlx.Tx) (jwt string, valid bool, err error) {
jwt = pt.decryptedJWT
if len(jwt) > 0 {
if jwt != "" {
valid = true
return
}
......
......@@ -20,8 +20,8 @@ func HandleOIDCRedirect(ctx *fiber.Ctx) error {
log.Debug("Handle redirect")
oidcError := ctx.Query("error")
state := state.NewState(ctx.Query("state"))
if len(oidcError) > 0 {
if len(state.State()) > 0 {
if oidcError != "" {
if state.State() != "" {
if err := db.Transact(func(tx *sqlx.Tx) error {
if err := transfercoderepo.DeleteTransferCodeByState(tx, state); err != nil {
return err
......
......@@ -86,7 +86,7 @@ func revokeSuperToken(tx *sqlx.Tx, jwt, issuer string, recursive bool) (errRes *
if err != nil {
return nil
}
if len(issuer) > 0 && st.OIDCIssuer != issuer {
if issuer != "" && st.OIDCIssuer != issuer {
return &model.Response{
Status: fiber.StatusBadRequest,
Response: pkgModel.BadRequestError("token not for specified issuer"),
......
......@@ -126,9 +126,9 @@ func handleAccessTokenRefresh(st *supertoken.SuperToken, req request.AccessToken
}
}
usedRestriction = &possibleRestrictions[0]
if len(req.Scope) > 0 {
if req.Scope != "" {
scopes = req.Scope
} else if len(usedRestriction.Scope) > 0 {
} else if usedRestriction.Scope != "" {
scopes = usedRestriction.Scope
}
if req.Audience != "" {
......@@ -159,7 +159,7 @@ func handleAccessTokenRefresh(st *supertoken.SuperToken, req request.AccessToken
}
}
retScopes := scopes
if len(oidcRes.Scopes) > 0 {
if oidcRes.Scopes != "" {
retScopes = oidcRes.Scopes
}
retAudiences, _ := jwtutils.GetAudiencesFromJWT(oidcRes.AccessToken)
......
......@@ -19,10 +19,8 @@ type Response struct {
// Send sends this response using the passed fiber.Ctx
func (r Response) Send(ctx *fiber.Ctx) error {
if r.Cookies != nil && len(r.Cookies) > 0 {
for _, c := range r.Cookies {
ctx.Cookie(c)
}
for _, c := range r.Cookies {
ctx.Cookie(c)
}
if fasthttp.StatusCodeIsRedirect(r.Status) {
return ctx.Redirect(r.Response.(string), r.Status)
......
......@@ -38,7 +38,7 @@ func (r *RefreshRequest) ToFormData() map[string]string {
m := make(map[string]string)
for i := 0; i < t.NumField(); i++ {
f := t.Field(i)
if key := f.Tag.Get("json"); len(key) > 0 {
if key := f.Tag.Get("json"); key != "" {
if key == "resource" {
key = r.resourceParameter
}
......
......@@ -28,7 +28,7 @@ func RefreshFlowAndUpdate(provider *config.ProviderConf, superToken, rt, scopes,
if err != nil {
return nil, nil, err
}
if errRes, ok := httpRes.Error().(*oidcReqRes.OIDCErrorResponse); ok && errRes != nil && len(errRes.Error) > 0 {
if errRes, ok := httpRes.Error().(*oidcReqRes.OIDCErrorResponse); ok && errRes != nil && errRes.Error != "" {
errRes.Status = httpRes.RawResponse.StatusCode
return nil, errRes, nil
}
......
......@@ -18,7 +18,7 @@ func RefreshToken(provider *config.ProviderConf, rt string) *model.Response {
if err != nil {
return model.ErrorToInternalServerErrorResponse(err)
}
if errRes, ok := httpRes.Error().(*oidcReqRes.OIDCErrorResponse); ok && errRes != nil && len(errRes.Error) > 0 {
if errRes, ok := httpRes.Error().(*oidcReqRes.OIDCErrorResponse); ok && errRes != nil && errRes.Error != "" {
return &model.Response{
Status: httpRes.RawResponse.StatusCode,
Response: pkgModel.OIDCError(errRes.Error, errRes.ErrorDescription),
......
......@@ -20,7 +20,7 @@ func handleError(ctx *fiber.Ctx, err error) error {
msg = e.Message
}
if len(ctx.Accepts(fiber.MIMETextHTML, fiber.MIMETextHTMLCharsetUTF8)) > 0 {
if ctx.Accepts(fiber.MIMETextHTML, fiber.MIMETextHTMLCharsetUTF8) != "" {
return handleErrorHTML(ctx, code, msg)
}
return handleErrorJSON(ctx, code, msg)
......
......@@ -45,7 +45,7 @@ func Init() {
addMiddlewares(server)
addRoutes(server)
server.Use(func(ctx *fiber.Ctx) error {
if len(ctx.Accepts(fiber.MIMETextHTML, fiber.MIMETextHTMLCharsetUTF8)) > 0 {
if ctx.Accepts(fiber.MIMETextHTML, fiber.MIMETextHTMLCharsetUTF8) != "" {
return ctx.Render("sites/404", map[string]interface{}{
"empty-navbar": true,
}, "layouts/main")
......
......@@ -13,14 +13,14 @@ import (
func GetSuperTokenStr(ctx *fiber.Ctx) string {
req := pkg.CreateTransferCodeRequest{}
if err := json.Unmarshal(ctx.Body(), &req); err == nil {
if len(req.SuperToken) > 0 {
if req.SuperToken != "" {
return req.SuperToken
}
}
if tok := GetAuthHeaderToken(ctx); len(tok) > 0 {
if tok := GetAuthHeaderToken(ctx); tok != "" {
return tok
}
if tok := ctx.Cookies("mytoken-supertoken"); len(tok) > 0 {
if tok := ctx.Cookies("mytoken-supertoken"); tok != "" {
return tok
}
return ""
......
......@@ -23,7 +23,7 @@ func (my *Mytoken) GetAccessToken(superToken, oidcIssuer string, scopes, audienc
return "", newMytokenErrorFromError("error while sending http request", err)
}
if e := resp.Error(); e != nil {
if errRes := e.(*model.APIError); errRes != nil && len(errRes.Error) > 0 {
if errRes := e.(*model.APIError); errRes != nil && errRes.Error != "" {
return "", &MytokenError{
err: errRes.Error,
errorDetails: errRes.ErrorDescription,
......
......@@ -8,7 +8,7 @@ type MytokenError struct {
func (err *MytokenError) Error() string {
e := err.err
if len(err.errorDetails) > 0 {
if err.errorDetails != "" {
e += ": " + err.errorDetails
}
return e
......
......@@ -18,7 +18,7 @@ func NewMytokenInstance(url string) (*Mytoken, error) {
return nil, newMytokenErrorFromError("could not connect to mytoken instance", err)
}
if e := resp.Error(); e != nil {
if errRes := e.(*model.APIError); errRes != nil && len(errRes.Error) > 0 {
if errRes := e.(*model.APIError); errRes != nil && errRes.Error != "" {
return nil, &MytokenError{
err: errRes.Error,
errorDetails: errRes.ErrorDescription,
......
......@@ -17,7 +17,7 @@ func (my *Mytoken) Revoke(superToken, oidcIssuer string, recursive bool) error {
return newMytokenErrorFromError("error while sending http request", err)
}
if e := resp.Error(); e != nil {
if errRes := e.(*model.APIError); errRes != nil && len(errRes.Error) > 0 {
if errRes := e.(*model.APIError); errRes != nil && errRes.Error != "" {
return &MytokenError{
err: errRes.Error,
errorDetails: errRes.ErrorDescription,
......
......@@ -19,7 +19,7 @@ func (my *Mytoken) GetSuperToken(req interface{}) (string, error) {
return "", newMytokenErrorFromError("error while sending http request", err)
}
if e := resp.Error(); e != nil {
if errRes := e.(*model.APIError); errRes != nil && len(errRes.Error) > 0 {
if errRes := e.(*model.APIError); errRes != nil && errRes.Error != "" {
return "", &MytokenError{
err: errRes.Error,
errorDetails: errRes.ErrorDescription,
......@@ -91,7 +91,7 @@ func (my *Mytoken) InitAuthorizationFlow(issuer string, restrictions restriction
return nil, newMytokenErrorFromError("error while sending http request", err)
}
if e := resp.Error(); e != nil {
if errRes := e.(*model.APIError); errRes != nil && len(errRes.Error) > 0 {
if errRes := e.(*model.APIError); errRes != nil && errRes.Error != "" {
return nil, &MytokenError{
err: errRes.Error,
errorDetails: errRes.ErrorDescription,
......
......@@ -24,7 +24,7 @@ func init() {
// Init initializes the http client
func Init(hostURL string) {
if len(hostURL) > 0 {
if hostURL != "" {
client.SetHostURL(hostURL)
}
if log.IsLevelEnabled(log.DebugLevel) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment