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

use a custom logger

Browse Source
This commit is contained in:
Lou Knauer
2022-01-27 10:35:26 +01:00
parent 436eaf0a9d
commit f8ad53caf0
5 changed files with 142 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
auth/auth.go
View File

@@ -9,11 +9,11 @@ import (
"encoding/json"
"errors"
"fmt"
"log"
"net/http"
"os"
"strings"
"github.com/ClusterCockpit/cc-backend/log"
"github.com/ClusterCockpit/cc-backend/templates"
sq "github.com/Masterminds/squirrel"
"github.com/golang-jwt/jwt/v4"
@@ -72,7 +72,7 @@ func Init(db *sqlx.DB, ldapConfig *LdapConfig) error {
sessKey := os.Getenv("SESSION_KEY")
if sessKey == "" {
log.Println("warning: environment variable 'SESSION_KEY' not set (will use non-persistent random key)")
log.Warn("environment variable 'SESSION_KEY' not set (will use non-persistent random key)")
bytes := make([]byte, 32)
if _, err := rand.Read(bytes); err != nil {
return err
@@ -88,7 +88,7 @@ func Init(db *sqlx.DB, ldapConfig *LdapConfig) error {
pubKey, privKey := os.Getenv("JWT_PUBLIC_KEY"), os.Getenv("JWT_PRIVATE_KEY")
if pubKey == "" || privKey == "" {
log.Println("warning: environment variables 'JWT_PUBLIC_KEY' or 'JWT_PRIVATE_KEY' not set (token based authentication will not work)")
log.Warn("environment variables 'JWT_PUBLIC_KEY' or 'JWT_PRIVATE_KEY' not set (token based authentication will not work)")
} else {
bytes, err := base64.StdEncoding.DecodeString(pubKey)
if err != nil {
@@ -143,7 +143,7 @@ func AddUserToDB(db *sqlx.DB, arg string) error {
if err != nil {
return err
}
log.Printf("new user '%s' added (roles: %s)\n", parts[0], roles)
log.Infof("new user %#v added (roles: %s)", parts[0], roles)
return nil
}
@@ -188,7 +188,7 @@ func Login(db *sqlx.DB) http.Handler {
}
if err != nil {
log.Printf("login failed: %s\n", err.Error())
log.Warnf("login of user %#v failed: %s", username, err.Error())
rw.WriteHeader(http.StatusUnauthorized)
templates.Render(rw, r, "login.html", &templates.Page{
Title: "Login failed",
@@ -201,7 +201,7 @@ func Login(db *sqlx.DB) http.Handler {
session, err := sessionStore.New(r, "session")
if err != nil {
log.Printf("session creation failed: %s\n", err.Error())
log.Errorf("session creation failed: %s", err.Error())
http.Error(rw, err.Error(), http.StatusInternalServerError)
return
}
@@ -210,12 +210,12 @@ func Login(db *sqlx.DB) http.Handler {
session.Values["username"] = user.Username
session.Values["roles"] = user.Roles
if err := sessionStore.Save(r, rw, session); err != nil {
log.Printf("session save failed: %s\n", err.Error())
log.Errorf("session save failed: %s", err.Error())
http.Error(rw, err.Error(), http.StatusInternalServerError)
return
}
log.Printf("login successfull: user: %#v (roles: %v)\n", user.Username, user.Roles)
log.Infof("login successfull: user: %#v (roles: %v)", user.Username, user.Roles)
http.Redirect(rw, r, "/", http.StatusTemporaryRedirect)
})
}
@@ -269,7 +269,7 @@ func Auth(next http.Handler) http.Handler {
return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
user, err := authViaToken(r)
if err == ErrTokenInvalid {
log.Printf("authentication failed: invalid token\n")
log.Warn("authentication failed: invalid token")
http.Error(rw, err.Error(), http.StatusUnauthorized)
return
}
@@ -288,7 +288,7 @@ func Auth(next http.Handler) http.Handler {
}
if session.IsNew {
log.Printf("authentication failed: no session or jwt found\n")
log.Warn("authentication failed: no session or jwt found")
rw.WriteHeader(http.StatusUnauthorized)
templates.Render(rw, r, "login.html", &templates.Page{

10
auth/ldap.go
View File

@@ -3,11 +3,11 @@ package auth
import (
"crypto/tls"
"errors"
"fmt"
"log"
"os"
"strings"
"github.com/ClusterCockpit/cc-backend/log"
"github.com/go-ldap/ldap/v3"
"github.com/jmoiron/sqlx"
)
@@ -28,7 +28,7 @@ var ldapAdminPassword string
func initLdap(config *LdapConfig) error {
ldapAdminPassword = os.Getenv("LDAP_ADMIN_PASSWORD")
if ldapAdminPassword == "" {
log.Println("warning: environment variable 'LDAP_ADMIN_PASSWORD' not set (ldap sync or authentication will not work)")
log.Warn("environment variable 'LDAP_ADMIN_PASSWORD' not set (ldap sync or authentication will not work)")
}
ldapConfig = config
@@ -138,13 +138,13 @@ func SyncWithLDAP(db *sqlx.DB) error {
for username, where := range users {
if where == IN_DB {
fmt.Printf("ldap-sync: remove '%s' (does not show up in LDAP anymore)\n", username)
log.Infof("ldap-sync: remove %#v (does not show up in LDAP anymore)", username)
if _, err := db.Exec(`DELETE FROM user WHERE user.username = ?`, username); err != nil {
return err
}
} else if where == IN_LDAP {
name := newnames[username]
fmt.Printf("ldap-sync: add '%s' (name: '%s', roles: [], ldap: true)\n", username, name)
log.Infof("ldap-sync: add %#v (name: %#v, roles: [], ldap: true)", username, name)
if _, err := db.Exec(`INSERT INTO user (username, ldap, name, roles) VALUES (?, ?, ?, ?)`,
username, 1, name, "[]"); err != nil {
return err