Chore: Enable errorlint linter (#29227)

* Enable errorlint linter
* Handle wrapped errors

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
This commit is contained in:
Arve Knudsen
2020-11-19 14:47:17 +01:00
committed by GitHub
parent 993adb72e0
commit 9593d57914
34 changed files with 142 additions and 101 deletions
+5 -4
View File
@@ -2,6 +2,7 @@ package authproxy
import (
"encoding/hex"
"errors"
"fmt"
"hash/fnv"
"net"
@@ -180,12 +181,12 @@ func (auth *AuthProxy) Login(logger log.Logger, ignoreCache bool) (int64, *Error
}
if isLDAPEnabled() {
id, e := auth.LoginViaLDAP()
if e != nil {
if e == ldap.ErrInvalidCredentials {
id, err := auth.LoginViaLDAP()
if err != nil {
if errors.Is(err, ldap.ErrInvalidCredentials) {
return 0, newError("proxy authentication required", ldap.ErrInvalidCredentials)
}
return 0, newError("failed to get the user", e)
return 0, newError("failed to get the user", err)
}
return id, nil