Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Keep explicit TLS choices stable through consolidation and projection

pulse-triage[bot]00cf46e3248c
diff --git a/internal/api/configapi/config_handlers.go b/internal/api/configapi/config_handlers.go
index 0b900acced..c6c99b2be1 100644
--- a/internal/api/configapi/config_handlers.go
+++ b/internal/api/configapi/config_handlers.go
@@ -1650,7 +1650,7 @@ func (h *ConfigHandlers) GetAllNodesForAPI(ctx context.Context) []NodeResponse {
HasPassword: pve.Password != "",
TokenName: pve.TokenName,
HasToken: pve.TokenValue != "",
- Fingerprint: pve.Fingerprint,
+ Fingerprint: pvePrimaryTLSFingerprint(pve),
VerifySSL: pve.VerifySSL,
MonitorVMs: pve.MonitorVMs,
MonitorContainers: pve.MonitorContainers,
diff --git a/internal/api/configapi/config_handlers_connection_test.go b/internal/api/configapi/config_handlers_connection_test.go
index 09c8729c66..de7d468441 100644
--- a/internal/api/configapi/config_handlers_connection_test.go
+++ b/internal/api/configapi/config_handlers_connection_test.go
@@ -359,7 +359,7 @@ func TestPVEEndpointTrustSavedPolling(t *testing.T) {
t.Setenv("SSL_CERT_FILE", caFile)
t.Setenv("SSL_CERT_DIR", t.TempDir())
makeLeaf := func(serial int64) tls.Certificate {
- pub, key, err := ed25519.GenerateKey(rand.Reader)
+ pub, leafKey, err := ed25519.GenerateKey(rand.Reader)
if err != nil {
t.Fatal(err)
}
@@ -368,7 +368,7 @@ func TestPVEEndpointTrustSavedPolling(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- return tls.Certificate{Certificate: [][]byte{der, ca.Raw}, PrivateKey: key}
+ return tls.Certificate{Certificate: [][]byte{der, ca.Raw}, PrivateKey: leafKey}
}
pin := func(c tls.Certificate) string { return fmt.Sprintf("%x", sha256.Sum256(c.Certificate[0])) }
old := [2]tls.Certificate{makeLeaf(2), makeLeaf(3)}
@@ -562,11 +562,11 @@ func TestPVEEndpointTrustAdmission(t *testing.T) {
}
// A storage failure must not publish the trust/credential candidate in memory.
cfg := &config.Config{DataPath: t.TempDir(), PVEInstances: []config.PVEInstance{instance.DeepCopy()}}
- blocked := filepath.Join(cfg.DataPath, "not-a-directory")
- if err := os.WriteFile(blocked, []byte("blocked"), 0600); err != nil {
+ persistence := config.NewConfigPersistence(cfg.DataPath)
+ if err := os.Mkdir(filepath.Join(cfg.DataPath, "nodes.enc"), 0700); err != nil {
t.Fatal(err)
}
- h := &ConfigHandlers{defaultConfig: cfg, defaultPersistence: config.NewConfigPersistence(blocked), runtime: defaultRuntimeDependencies()}
+ h := &ConfigHandlers{defaultConfig: cfg, defaultPersistence: persistence, runtime: defaultRuntimeDependencies()}
before, _ := json.Marshal(cfg)
rec := httptest.NewRecorder()
h.HandleUpdateNode(rec, httptest.NewRequest("PUT", "/api/config/nodes/pve-0", strings.NewReader(`{"fingerprint":"new-pin"}`)))
diff --git a/internal/api/configapi/config_node_tls.go b/internal/api/configapi/config_node_tls.go
index d0f298be13..a1d5c6fea2 100644
--- a/internal/api/configapi/config_node_tls.go
+++ b/internal/api/configapi/config_node_tls.go
@@ -118,3 +118,10 @@ func pveClusterEndpointTLSResponses(instance config.PVEInstance, discovery confi
}
return responses
}
+
+func pvePrimaryTLSFingerprint(instance config.PVEInstance) string {
+ if fingerprint, known, err := proxmox.ResolveEndpointFingerprint(instance.Host, instance.TLSFingerprintOverrides); err == nil && known {
+ return fingerprint
+ }
+ return instance.Fingerprint
+}
diff --git a/internal/config/config_load_test.go b/internal/config/config_load_test.go
index 6d17f3a259..596ceaec9e 100644
--- a/internal/config/config_load_test.go
+++ b/internal/config/config_load_test.go
@@ -748,3 +748,16 @@ func TestPVEEndpointTrustOverridePersistenceAndClone(t *testing.T) {
t.Fatal("reload lost explicit scoped CA policy or unrelated state")
}
}
+
+func TestPVEEndpointTrustOverrideSurvivesMerge(t *testing.T) {
+ target := PVEInstance{Host: "https://primary.test:8006", VerifySSL: true, TLSFingerprintOverrides: map[string]string{"https://primary.test:8006": ""}}
+ source := PVEInstance{Host: target.Host, Fingerprint: "old-observation", TLSFingerprintOverrides: map[string]string{"https://member.test:8006": "member-pin"}}
+ mergePVEInstanceData(&target, source)
+ if target.Fingerprint != "" || target.TLSFingerprintOverrides[target.Host] != "" || target.TLSFingerprintOverrides["https://member.test:8006"] != "member-pin" {
+ t.Fatal("merge changed explicit trust decisions")
+ }
+ source.TLSFingerprintOverrides["https://PRIMARY.test:8006/"] = "contradictory"
+ if !pveClusterInstancesHaveFingerprintConflict(target, source) {
+ t.Fatal("consolidation ignored contradictory explicit authority trust")
+ }
+}
diff --git a/internal/config/pve_instances.go b/internal/config/pve_instances.go
index ef2914c45c..542436054d 100644
--- a/internal/config/pve_instances.go
+++ b/internal/config/pve_instances.go
@@ -6,6 +6,7 @@ import (
"net/url"
"strings"
+ "github.com/rcourtman/pulse-go-rewrite/pkg/proxmox"
"github.com/rs/zerolog/log"
)
@@ -92,8 +93,14 @@ func ProxmoxFingerprintsConflict(a, b string) bool {
// certificate rotated between discoveries stays as two views rather than two
// distinct clusters being silently folded into one.
func pveClusterInstancesHaveFingerprintConflict(a, b PVEInstance) bool {
+ for _, instance := range []PVEInstance{a, b} {
+ if proxmox.CheckEndpointFingerprintConflicts(instance.TLSFingerprintOverrides) != nil {
+ return true
+ }
+ }
for endpoint, fingerprint := range a.TLSFingerprintOverrides {
- if other, known := b.TLSFingerprintOverrides[endpoint]; known && fingerprint != other {
+ other, known, err := proxmox.ResolveEndpointFingerprint(endpoint, b.TLSFingerprintOverrides)
+ if err != nil || (known && strings.ToLower(strings.ReplaceAll(fingerprint, ":", "")) != strings.ToLower(strings.ReplaceAll(other, ":", ""))) {
return true
}
}
@@ -354,7 +361,8 @@ func mergePVEInstanceData(dst *PVEInstance, src PVEInstance) {
if dst.GuestURL == "" && strings.TrimSpace(src.GuestURL) != "" {
dst.GuestURL = strings.TrimSpace(src.GuestURL)
}
- if dst.Fingerprint == "" && strings.TrimSpace(src.Fingerprint) != "" {
+ _, primaryTrustExplicit, _ := proxmox.ResolveEndpointFingerprint(dst.Host, dst.TLSFingerprintOverrides)
+ if dst.Fingerprint == "" && !primaryTrustExplicit && strings.TrimSpace(src.Fingerprint) != "" {
dst.Fingerprint = strings.TrimSpace(src.Fingerprint)
}
if dst.Source == "" && strings.TrimSpace(src.Source) != "" {