ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2026-03-17 21:37:30 +01:00
Code Issues Packages Releases Activity

Ignore ErrNoRows error. Include calling function in log.

Browse Source 
Entire-Checkpoint: 20746187d135
This commit is contained in:
Jan Eitzinger
2026-03-16 20:09:44 +01:00
parent 6855d62bf2
commit 3314b8e284
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/repository/user.go
View File

@@ -2,6 +2,7 @@
// All rights reserved. This file is part of cc-backend. // All rights reserved. This file is part of cc-backend.
// Use of this source code is governed by a MIT-style // Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
package repository package repository
import ( import (
@@ -10,7 +11,9 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"path/filepath"
"reflect" "reflect"
"runtime"
"strings" "strings"
"sync" "sync"
@@ -73,7 +76,11 @@ func (r *UserRepository) GetUser(username string) (*schema.User, error) {
if err := sq.Select("password", "ldap", "name", "roles", "email", "projects").From("hpc_user"). if err := sq.Select("password", "ldap", "name", "roles", "email", "projects").From("hpc_user").
Where("hpc_user.username = ?", username).RunWith(r.DB). Where("hpc_user.username = ?", username).RunWith(r.DB).
QueryRow().Scan(&hashedPassword, &user.AuthSource, &name, &rawRoles, &email, &rawProjects); err != nil { QueryRow().Scan(&hashedPassword, &user.AuthSource, &name, &rawRoles, &email, &rawProjects); err != nil {
cclog.Warnf("Error while querying user '%v' from database", username) if err != sql.ErrNoRows {
_, file, line, _ := runtime.Caller(1)
cclog.Warnf("Error while querying user '%v' from database (%s:%d): %v",
username, filepath.Base(file), line, err)
}
return nil, err return nil, err
} }
@@ -124,11 +131,11 @@ func (r *UserRepository) GetLdapUsernames() ([]string, error) {
// Required fields: Username, Roles // Required fields: Username, Roles
// Optional fields: Name, Email, Password, Projects, AuthSource // Optional fields: Name, Email, Password, Projects, AuthSource
func (r *UserRepository) AddUser(user *schema.User) error { func (r *UserRepository) AddUser(user *schema.User) error {
rolesJson, _ := json.Marshal(user.Roles) rolesJSON, _ := json.Marshal(user.Roles)
projectsJson, _ := json.Marshal(user.Projects) projectsJSON, _ := json.Marshal(user.Projects)
cols := []string{"username", "roles", "projects"} cols := []string{"username", "roles", "projects"}
vals := []any{user.Username, string(rolesJson), string(projectsJson)} vals := []any{user.Username, string(rolesJSON), string(projectsJSON)}
if user.Name != "" { if user.Name != "" {
cols = append(cols, "name") cols = append(cols, "name")
@@ -157,7 +164,7 @@ func (r *UserRepository) AddUser(user *schema.User) error {
return err return err
} }
cclog.Infof("new user %#v created (roles: %s, auth-source: %d, projects: %s)", user.Username, rolesJson, user.AuthSource, projectsJson) cclog.Infof("new user %#v created (roles: %s, auth-source: %d, projects: %s)", user.Username, rolesJSON, user.AuthSource, projectsJSON)
// DEPRECATED: SUPERSEDED BY NEW USER CONFIG - userConfig.go / web.go // DEPRECATED: SUPERSEDED BY NEW USER CONFIG - userConfig.go / web.go
defaultMetricsCfg, err := config.LoadDefaultMetricsConfig() defaultMetricsCfg, err := config.LoadDefaultMetricsConfig()
@@ -193,13 +200,13 @@ func (r *UserRepository) AddUser(user *schema.User) error {
// concurrently created (e.g., by a login while LDAP sync is running). // concurrently created (e.g., by a login while LDAP sync is running).
// Unlike AddUser, this intentionally skips the deprecated default metrics config insertion. // Unlike AddUser, this intentionally skips the deprecated default metrics config insertion.
func (r *UserRepository) AddUserIfNotExists(user *schema.User) error { func (r *UserRepository) AddUserIfNotExists(user *schema.User) error {
rolesJson, _ := json.Marshal(user.Roles) rolesJSON, _ := json.Marshal(user.Roles)
projectsJson, _ := json.Marshal(user.Projects) projectsJSON, _ := json.Marshal(user.Projects)
cols := "username, name, roles, projects, ldap" cols := "username, name, roles, projects, ldap"
_, err := r.DB.Exec( _, err := r.DB.Exec(
`INSERT OR IGNORE INTO hpc_user (`+cols+`) VALUES (?, ?, ?, ?, ?)`, `INSERT OR IGNORE INTO hpc_user (`+cols+`) VALUES (?, ?, ?, ?, ?)`,
user.Username, user.Name, string(rolesJson), string(projectsJson), int(user.AuthSource)) user.Username, user.Name, string(rolesJSON), string(projectsJSON), int(user.AuthSource))
return err return err
} }