Browse Source

chore: fix linter config and violations

Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
pull/3913/head
Mark Sagi-Kazar 1 year ago
parent
commit
c7fd9620aa
No known key found for this signature in database
GPG Key ID: 31AB0439F4C5C90E
  1. 23
      .golangci.yml
  2. 2
      connector/saml/saml.go
  3. 2
      server/introspectionhandler.go

23
.golangci.yml

@ -1,28 +1,27 @@
run:
timeout: 4m
skip-dirs:
- storage/ent/db # generated ent code
linters-settings:
depguard:
rules:
deprecated:
deny:
- pkg: "io/ioutil"
desc: "The 'io/ioutil' package is deprecated. Use corresponding 'os' or 'io' functions instead."
rules:
deprecated:
deny:
- pkg: "io/ioutil"
desc: "The 'io/ioutil' package is deprecated. Use corresponding 'os' or 'io' functions instead."
gci:
local-prefixes: github.com/dexidp/dex
sections:
- standard
- default
- prefix(github.com/dexidp/dex)
goimports:
local-prefixes: github.com/dexidp/dex
linters:
disable-all: true
enable:
- depguard
- dogsled
- exhaustive
- exportloopref
- gci
- gochecknoinits
- gocritic
@ -92,3 +91,7 @@ linters:
# - nestif
# - testpackage
# - wsl
issues:
exclude-dirs:
- storage/ent/db # generated ent code

2
connector/saml/saml.go

@ -467,7 +467,7 @@ func (p *provider) validateStatus(status *status) error {
if statusMessage != nil && statusMessage.Value != "" {
errorMessage += " -> " + statusMessage.Value
}
return fmt.Errorf(errorMessage)
return errors.New(errorMessage)
}
return nil
}

2
server/introspectionhandler.go

@ -170,7 +170,7 @@ func (s *Server) getTokenFromRequest(r *http.Request) (string, TokenTypeEnum, er
return "", 0, newIntrospectBadRequestError(fmt.Sprintf("HTTP method is \"%s\", expected \"POST\".", r.Method))
} else if err := r.ParseForm(); err != nil {
return "", 0, newIntrospectBadRequestError("Unable to parse HTTP body, make sure to send a properly formatted form request body.")
} else if r.PostForm == nil || len(r.PostForm) == 0 {
} else if len(r.PostForm) == 0 {
return "", 0, newIntrospectBadRequestError("The POST body can not be empty.")
} else if !r.PostForm.Has("token") {
return "", 0, newIntrospectBadRequestError("The POST body doesn't contain 'token' parameter.")

Loading…
Cancel
Save