jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2026-04-21 04:01:50 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge branch 'main' into feat/network-probes

Browse Source 
Resolved conflict in internal/records/records.go:
- Upstream refactor moved deletion code to records_deletion.go and
  switched averaging functions from package-level globals to local
  variables (var row StatsRecord / params := make(dbx.Params, 1)).
- Kept AverageProbeStats and rewrote it to match the new local-variable
  pattern.
- Dropped duplicated deletion helpers from records.go (they now live in
  records_deletion.go).
- Added "network_probe_stats" to the collections list in
  records_deletion.go:deleteOldSystemStats so probe stats keep the same
  retention policy.
This commit is contained in:
xiaomiku01
2026-04-17 13:49:18 +08:00
parent 485830452e e5507fa106
commit 578ba985e9
20 changed files with 1688 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/hub/systems/system.go
View File

@@ -8,7 +8,6 @@ import (
"hash/fnv"
"math/rand"
"net"
"slices"
"strings"
"sync/atomic"
"time"
@@ -368,12 +367,16 @@ func (sys *System) HasUser(app core.App, user *core.Record) bool {
if v, _ := utils.GetEnv("SHARE_ALL_SYSTEMS"); v == "true" {
return true
}
record, err := sys.getRecord(app)
if err != nil {
var recordData = struct {
Users string
}{}
err := app.DB().NewQuery("SELECT users FROM systems WHERE id={:id}").
Bind(dbx.Params{"id": sys.Id}).
One(&recordData)
if err != nil || recordData.Users == "" {
return false
}
users := record.GetStringSlice("users")
return slices.Contains(users, user.Id)
return strings.Contains(recordData.Users, user.Id)
}
// setDown marks a system as down in the database.

13
internal/hub/systems/systems_test.go
View File

@@ -436,7 +436,7 @@ func TestHasUser(t *testing.T) {
user2, err := tests.CreateUser(hub, "user2@test.com", "password123")
require.NoError(t, err)
record, err := tests.CreateRecord(hub, "systems", map[string]any{
systemRecord, err := tests.CreateRecord(hub, "systems", map[string]any{
"name": "has-user-test",
"host": "127.0.0.1",
"port": "33914",
@@ -444,7 +444,7 @@ func TestHasUser(t *testing.T) {
})
require.NoError(t, err)
sys, err := sm.GetSystemFromStore(record.Id)
sys, err := sm.GetSystemFromStore(systemRecord.Id)
require.NoError(t, err)
t.Run("user in list returns true", func(t *testing.T) {
@@ -468,4 +468,13 @@ func TestHasUser(t *testing.T) {
t.Setenv("BESZEL_HUB_SHARE_ALL_SYSTEMS", "true")
assert.True(t, sys.HasUser(hub, user2))
})
t.Run("additional user works", func(t *testing.T) {
assert.False(t, sys.HasUser(hub, user2))
systemRecord.Set("users", []string{user1.Id, user2.Id})
err = hub.Save(systemRecord)
require.NoError(t, err)
assert.True(t, sys.HasUser(hub, user1))
assert.True(t, sys.HasUser(hub, user2))
})
}