christian/rmm2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backend: Customers, Auth (JWT), Agent-Kundenzuordnung, CORS

Browse Source
This commit is contained in:
cynfo3000
2026-02-28 15:28:02 +01:00
parent 5daf81b9de
commit c6c8257cf0
15 changed files with 717 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/db/customers.go
+67
View File
@@ -0,0 +1,67 @@
package db
import (
"database/sql"
"github.com/cynfo/rmm-backend/models"
)
func (d *Database) CreateCustomer(number, name string) (*models.Customer, error) {
var c models.Customer
err := d.db.QueryRow(
"INSERT INTO customers (number, name) VALUES ($1, $2) RETURNING id, number, name, created_at",
number, name,
).Scan(&c.ID, &c.Number, &c.Name, &c.CreatedAt)
if err != nil {
return nil, err
}
return &c, nil
}
func (d *Database) GetCustomers() ([]models.Customer, error) {
rows, err := d.db.Query("SELECT id, number, name, created_at FROM customers ORDER BY name")
if err != nil {
return nil, err
}
defer rows.Close()
var customers []models.Customer
for rows.Next() {
var c models.Customer
if err := rows.Scan(&c.ID, &c.Number, &c.Name, &c.CreatedAt); err != nil {
return nil, err
}
customers = append(customers, c)
}
if customers == nil {
customers = []models.Customer{}
}
return customers, rows.Err()
}
func (d *Database) GetCustomer(id int) (*models.Customer, error) {
var c models.Customer
err := d.db.QueryRow("SELECT id, number, name, created_at FROM customers WHERE id = $1", id).
Scan(&c.ID, &c.Number, &c.Name, &c.CreatedAt)
if err == sql.ErrNoRows {
return nil, nil
}
if err != nil {
return nil, err
}
return &c, nil
}
func (d *Database) UpdateCustomer(id int, number, name string) error {
_, err := d.db.Exec("UPDATE customers SET number = $1, name = $2 WHERE id = $3", number, name, id)
return err
}
func (d *Database) DeleteCustomer(id int) (bool, error) {
res, err := d.db.Exec("DELETE FROM customers WHERE id = $1", id)
if err != nil {
return false, err
}
rows, _ := res.RowsAffected()
return rows > 0, nil
}
backend/db/postgres.go
+77 -4
View File
@@ -97,12 +97,33 @@ func (d *Database) migrate() error {
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
);
CREATE INDEX IF NOT EXISTS idx_agent_events_agent ON agent_events(agent_id, created_at DESC);
CREATE TABLE IF NOT EXISTS customers (
id SERIAL PRIMARY KEY,
number TEXT NOT NULL UNIQUE,
name TEXT NOT NULL,
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
);
CREATE TABLE IF NOT EXISTS users (
id SERIAL PRIMARY KEY,
username TEXT NOT NULL UNIQUE,
password_hash TEXT NOT NULL,
display_name TEXT NOT NULL DEFAULT '',
role TEXT NOT NULL DEFAULT 'admin',
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
last_login TIMESTAMPTZ
);
`
if _, err := d.db.Exec(schema); err != nil {
return fmt.Errorf("Schema anlegen: %w", err)
}
// Agents um customer_id erweitern
d.db.Exec("ALTER TABLE agents ADD COLUMN IF NOT EXISTS customer_id INTEGER REFERENCES customers(id)")
d.db.Exec("CREATE INDEX IF NOT EXISTS idx_agents_customer ON agents(customer_id)")
// Metrics Hypertable
metricsSchema := `
CREATE TABLE IF NOT EXISTS metrics (
@@ -321,7 +342,7 @@ func (d *Database) writeMetrics(tx *sql.Tx, agentID string, ts time.Time, data *
}
func (d *Database) GetAgents() ([]models.Agent, error) {
rows, err := d.db.Query("SELECT id, name, hostname, ip, opnsense_version, registered_at, last_heartbeat FROM agents ORDER BY name")
rows, err := d.db.Query("SELECT id, name, hostname, ip, opnsense_version, registered_at, last_heartbeat, customer_id FROM agents ORDER BY name")
if err != nil {
return nil, err
}
@@ -331,13 +352,18 @@ func (d *Database) GetAgents() ([]models.Agent, error) {
for rows.Next() {
var a models.Agent
var lastHB sql.NullTime
var custID sql.NullInt64
if err := rows.Scan(&a.ID, &a.Name, &a.Hostname, &a.IP, &a.OPNsenseVersion, &a.RegisteredAt, &lastHB); err != nil {
if err := rows.Scan(&a.ID, &a.Name, &a.Hostname, &a.IP, &a.OPNsenseVersion, &a.RegisteredAt, &lastHB, &custID); err != nil {
return nil, err
}
if lastHB.Valid {
a.LastHeartbeat = &lastHB.Time
}
if custID.Valid {
id := int(custID.Int64)
a.CustomerID = &id
}
agents = append(agents, a)
}
if agents == nil {
@@ -370,11 +396,12 @@ func (d *Database) GetAgentByHostname(hostname string) (*models.Agent, error) {
func (d *Database) GetAgent(id string) (*models.Agent, *models.SystemData, error) {
var a models.Agent
var lastHB sql.NullTime
var custID sql.NullInt64
err := d.db.QueryRow(
"SELECT id, name, hostname, ip, opnsense_version, registered_at, last_heartbeat FROM agents WHERE id = $1",
"SELECT id, name, hostname, ip, opnsense_version, registered_at, last_heartbeat, customer_id FROM agents WHERE id = $1",
id,
).Scan(&a.ID, &a.Name, &a.Hostname, &a.IP, &a.OPNsenseVersion, &a.RegisteredAt, &lastHB)
).Scan(&a.ID, &a.Name, &a.Hostname, &a.IP, &a.OPNsenseVersion, &a.RegisteredAt, &lastHB, &custID)
if err == sql.ErrNoRows {
return nil, nil, nil
@@ -385,6 +412,10 @@ func (d *Database) GetAgent(id string) (*models.Agent, *models.SystemData, error
if lastHB.Valid {
a.LastHeartbeat = &lastHB.Time
}
if custID.Valid {
cid := int(custID.Int64)
a.CustomerID = &cid
}
// Systemdaten laden
var dataJSON sql.NullString
@@ -729,6 +760,48 @@ func (d *Database) GetAllAgentEvents(eventType string, limit int) ([]models.Agen
return events, rows.Err()
}
// --- Agent-Customer Zuordnung ---
func (d *Database) AssignAgentCustomer(agentID string, customerID int) error {
_, err := d.db.Exec("UPDATE agents SET customer_id = $1 WHERE id = $2", customerID, agentID)
return err
}
func (d *Database) UnassignAgentCustomer(agentID string) error {
_, err := d.db.Exec("UPDATE agents SET customer_id = NULL WHERE id = $1", agentID)
return err
}
func (d *Database) GetAgentsByCustomer(customerID int) ([]models.Agent, error) {
rows, err := d.db.Query("SELECT id, name, hostname, ip, opnsense_version, registered_at, last_heartbeat, customer_id FROM agents WHERE customer_id = $1 ORDER BY name", customerID)
if err != nil {
return nil, err
}
defer rows.Close()
var agents []models.Agent
for rows.Next() {
var a models.Agent
var lastHB sql.NullTime
var custID sql.NullInt64
if err := rows.Scan(&a.ID, &a.Name, &a.Hostname, &a.IP, &a.OPNsenseVersion, &a.RegisteredAt, &lastHB, &custID); err != nil {
return nil, err
}
if lastHB.Valid {
a.LastHeartbeat = &lastHB.Time
}
if custID.Valid {
cid := int(custID.Int64)
a.CustomerID = &cid
}
agents = append(agents, a)
}
if agents == nil {
agents = []models.Agent{}
}
return agents, rows.Err()
}
// GetAgentStatus berechnet den Status eines Agents aus last_heartbeat
func (d *Database) GetAgentStatus(agentID string) string {
var lastHB sql.NullTime
backend/db/users.go
+89
View File
@@ -0,0 +1,89 @@
package db
import (
"database/sql"
"github.com/cynfo/rmm-backend/models"
"golang.org/x/crypto/bcrypt"
)
func (d *Database) CreateUser(username, password, displayName, role string) (*models.User, error) {
hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
if err != nil {
return nil, err
}
var u models.User
err = d.db.QueryRow(
"INSERT INTO users (username, password_hash, display_name, role) VALUES ($1, $2, $3, $4) RETURNING id, username, display_name, role, created_at",
username, string(hash), displayName, role,
).Scan(&u.ID, &u.Username, &u.DisplayName, &u.Role, &u.CreatedAt)
if err != nil {
return nil, err
}
return &u, nil
}
func (d *Database) GetUserByUsername(username string) (*models.User, error) {
var u models.User
var lastLogin sql.NullTime
err := d.db.QueryRow(
"SELECT id, username, password_hash, display_name, role, created_at, last_login FROM users WHERE username = $1",
username,
).Scan(&u.ID, &u.Username, &u.PasswordHash, &u.DisplayName, &u.Role, &u.CreatedAt, &lastLogin)
if err == sql.ErrNoRows {
return nil, nil
}
if err != nil {
return nil, err
}
if lastLogin.Valid {
u.LastLogin = &lastLogin.Time
}
return &u, nil
}
func (d *Database) GetUsers() ([]models.User, error) {
rows, err := d.db.Query("SELECT id, username, display_name, role, created_at, last_login FROM users ORDER BY username")
if err != nil {
return nil, err
}
defer rows.Close()
var users []models.User
for rows.Next() {
var u models.User
var lastLogin sql.NullTime
if err := rows.Scan(&u.ID, &u.Username, &u.DisplayName, &u.Role, &u.CreatedAt, &lastLogin); err != nil {
return nil, err
}
if lastLogin.Valid {
u.LastLogin = &lastLogin.Time
}
users = append(users, u)
}
if users == nil {
users = []models.User{}
}
return users, rows.Err()
}
func (d *Database) UpdateUserLastLogin(id int) error {
_, err := d.db.Exec("UPDATE users SET last_login = NOW() WHERE id = $1", id)
return err
}
func (d *Database) DeleteUser(id int) (bool, error) {
res, err := d.db.Exec("DELETE FROM users WHERE id = $1", id)
if err != nil {
return false, err
}
rows, _ := res.RowsAffected()
return rows > 0, nil
}
func (d *Database) UserCount() (int, error) {
var count int
err := d.db.QueryRow("SELECT COUNT(*) FROM users").Scan(&count)
return count, err
}