ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-07-23 12:51:40 +02:00
Code Issues Packages Releases Activity

Merge pull request #148 from ClusterCockpit/hotfix

Browse Source 
Hotfix
This commit is contained in:
Jan Eitzinger
2023-06-16 14:37:10 +02:00
committed by GitHub
parent bf9b1c7d83 369d20930b
commit 07f8950838
20 changed files with 228 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/auth/ldap.go
View File

@@ -6,6 +6,7 @@ package auth
import (
"errors"
"fmt"
"net/http"
"os"
"strings"
@@ -85,8 +86,8 @@ func (la *LdapAuthenticator) Login(
userDn := strings.Replace(la.config.UserBind, "{username}", user.Username, -1)
if err := l.Bind(userDn, r.FormValue("password")); err != nil {
log.Error("Error while binding to ldap connection")
return nil, err
log.Errorf("AUTH/LOCAL > Authentication for user %s failed: %v", user.Username, err)
return nil, fmt.Errorf("AUTH/LDAP > Authentication failed")
}
return user, nil

4
internal/auth/local.go
View File

@@ -8,6 +8,7 @@ import (
"fmt"
"net/http"
"github.com/ClusterCockpit/cc-backend/pkg/log"
"golang.org/x/crypto/bcrypt"
)
@@ -39,7 +40,8 @@ func (la *LocalAuthenticator) Login(
r *http.Request) (*User, error) {
if e := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(r.FormValue("password"))); e != nil {
return nil, fmt.Errorf("AUTH/LOCAL > user '%s' provided the wrong password (%w)", user.Username, e)
log.Errorf("AUTH/LOCAL > Authentication for user %s failed!", user.Username)
return nil, fmt.Errorf("AUTH/LOCAL > Authentication failed")
}
return user, nil