admin/felhom-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.56.0: resolve a raw enrolled drive's durable-id from the mount table

Browse Source 
durableIDForMount was Observe-only, so a raw (non-PVE-storage) drive's enroll
intent + guest-bind went unrecorded ("durable-id unresolved") — it mounted+bound
but wasn't intent-tracked (RegistryKnownTargets skips intent==new). Fall back to
resolving the mount's device fs-UUID (HostReader.Mounts + ResolveUUID) →
uuid:<fs-uuid>, same scheme as Observe. Test + red-proof. Residual:
ReassertGuestBinds still Observe-based (raw guest-bind not re-asserted post-reboot).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
authentik Default Admin
2026-07-01 18:29:22 +02:00
parent 4f8d2fcb57
commit e593fb277a
4 changed files with 84 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/localapi/disks.go
+21 -6
View File
@@ -883,13 +883,28 @@ func (s *Server) ReassertGuestBinds(ctx context.Context) {
// durableIDForMount resolves the durable-id of the storage mounted at `where` (from the agent's own
// storage view) — the key the intent store records enroll/eject against. "" if not resolvable.
func (s *Server) durableIDForMount(ctx context.Context, where string) string {
targets, err := s.storage.Observe(ctx)
if err != nil {
return ""
// Preferred: the storage view (PVE storages) already carries the derived durable-id.
if targets, err := s.storage.Observe(ctx); err == nil {
for _, t := range targets {
if t.MountPath == where {
return t.DurableID
}
}
}
for _, t := range targets {
if t.MountPath == where {
return t.DurableID
// Fallback (Impl-2b): a RAW enrolled drive is NOT a PVE storage, so it never appears in Observe —
// which left its enroll/eject intent + guest-bind unrecorded ("durable-id unresolved"). Resolve the
// fs-UUID directly from the mount table: the device mounted at `where` → its by-uuid identity. This
// is the SAME scheme Observe derives ("uuid:<fs-uuid>"), so intent keys stay consistent.
if s.host != nil {
if mounts, err := s.host.Mounts(); err == nil {
for _, m := range mounts {
if m.MountPoint == where {
if uuid, ok := s.host.ResolveUUID(m.Device); ok && uuid != "" {
return "uuid:" + uuid
}
break
}
}
}
}
return ""