fix: improve agent installer error handling (#1971, #1972)

- Enable set -eu and handle expected failures explicitly
- Validate platform and service manager before making changes
- Fix argument parsing, version fallback, cron setup, and prompt EOF
- Verify downloads before stopping the existing agent
- Add atomic binary replacement, rollback, and cleanup
- Add regression tests for installation failure paths

SECURITY.md

@@ -2,8 +2,6 @@
 
 ## Reporting a Vulnerability
 
-**PLEASE ONLY USE SECURITY ADVISORIES FOR REAL HIGH SEVERITY VULNERABILITIES.**
+If you find a vulnerability in the latest version, please [submit a private advisory](https://github.com/henrygd/beszel/security/advisories/new).
 
-If you find a vulnerability in the latest version, and it is not high severity, open an issue instead of an advisory.
+If it's low severity (use best judgement) you may open an issue instead of an advisory.
-
-I am overwhelmed with advisories, often erroneous, which are clearly found and written by AI. I don't have the capacity to review all of them.

agent/client.go

@@ -25,9 +25,7 @@ import (
 )
 
 const (
-	// Keep the connection alive long enough for a slow collection cycle to
+	wsDeadline = 70 * time.Second
-	// finish before the hub considers the agent disconnected.
-	wsDeadline = 120 * time.Second
 )
 
 type caCertFileError struct {

agent/client_test.go

@@ -700,11 +700,3 @@ func TestGetToken(t *testing.T) {
 		assert.Equal(t, expectedToken, token, "Whitespace should be stripped from token file content")
 	})
 }
-
-func TestWebSocketDeadlineCoversSlowCollection(t *testing.T) {
-	const minimumDeadline = 120 * time.Second
-
-	if wsDeadline < minimumDeadline {
-		t.Fatalf("WebSocket deadline %s is shorter than the slow-collection window of %s", wsDeadline, minimumDeadline)
-	}
-}

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/gliderlabs/ssh v0.3.8
 	github.com/google/uuid v1.6.0
 	github.com/lxzan/gws v1.10.1
-	github.com/nicholas-fedor/shoutrrr v0.20.0
+	github.com/nicholas-fedor/shoutrrr v0.19.0
 	github.com/pocketbase/dbx v1.12.0
 	github.com/pocketbase/pocketbase v0.40.2
 	github.com/shirou/gopsutil/v4 v4.26.8

go.sum

@@ -54,8 +54,8 @@ github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArs
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/pprof v0.0.0-20260906184651-6331bc6350fe h1:QAinXoAFJdGQYztXn3VpFey7KCwpedbZ/EkzbplQ0cY=
+github.com/google/pprof v0.0.0-20260902005441-ca85771921e4 h1:/6mPXfWmhv8eKck12I0YNIcIjwHtxP3YRIMKiEgTjWg=
-github.com/google/pprof v0.0.0-20260906184651-6331bc6350fe/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk=
+github.com/google/pprof v0.0.0-20260902005441-ca85771921e4/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
@@ -83,8 +83,8 @@ github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsRe
 github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A=
 github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
 github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
-github.com/nicholas-fedor/shoutrrr v0.20.0 h1:hMAxIYlfAeZ1FcTDgU0kUOvVXUsOirWo8IWlnzGLkac=
+github.com/nicholas-fedor/shoutrrr v0.19.0 h1:Rl6bpK3DXuR2Trtx2JV8t+wjUwkHdRHrc8nBKoEpHr0=
-github.com/nicholas-fedor/shoutrrr v0.20.0/go.mod h1:hgde37yNWCXh8+N6WemyDRMNYLOFTf326GsBx8Z7CFA=
+github.com/nicholas-fedor/shoutrrr v0.19.0/go.mod h1:Glfdi8AGTbnEn2k2+hW62n8oL0i9vqRVFtXaUIthNks=
 github.com/onsi/ginkgo/v2 v2.32.1 h1:6tlvcDm/3sE8lGJbZ4+d4mO3RLy24/tQWOFzVSQNIfw=
 github.com/onsi/ginkgo/v2 v2.32.1/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44=
 github.com/onsi/gomega v1.43.0 h1:VlG/1FxqNxhSO+lq/OHBNaaqwiBK/mO8JbVkX9Y+FeU=

internal/alerts/alerts.go

@@ -231,20 +231,8 @@ func (am *AlertManager) SendAlert(data AlertMessageData) error {
 		am.hub.Logger().Error("Failed to unmarshal user settings", "err", err)
 	}
 	// send alerts via webhooks
-	send := sendPublicNotification
-	if len(userAlertSettings.Webhooks) > 0 {
-		// Read the owner's current role at delivery time, including for URLs
-		// saved before an admin was demoted. Never fall back on lookup failure.
-		owner, err := am.hub.FindRecordById("users", data.UserID)
-		if err != nil {
-			return fmt.Errorf("load notification owner: %w", err)
-		}
-		if owner.GetString("role") == "admin" {
-			send = shoutrrr.Send
-		}
-	}
 	for _, webhook := range userAlertSettings.Webhooks {
-		if err := am.sendShoutrrrAlert(webhook, data.Title, data.Message, data.Link, data.LinkText, send); err != nil {
+		if err := am.SendShoutrrrAlert(webhook, data.Title, data.Message, data.Link, data.LinkText); err != nil {
 			am.hub.Logger().Error("Failed to send shoutrrr alert", "err", err)
 		}
 	}
@@ -275,10 +263,6 @@ func (am *AlertManager) SendAlert(data AlertMessageData) error {
 
 // SendShoutrrrAlert sends an alert via a Shoutrrr URL
 func (am *AlertManager) SendShoutrrrAlert(notificationUrl, title, message, link, linkText string) error {
-	return am.sendShoutrrrAlert(notificationUrl, title, message, link, linkText, shoutrrr.Send)
-}
-
-func (am *AlertManager) sendShoutrrrAlert(notificationUrl, title, message, link, linkText string, send func(string, string) error) error {
 	// Parse the URL
 	parsedURL, err := url.Parse(notificationUrl)
 	if err != nil {
@@ -321,7 +305,7 @@ func (am *AlertManager) sendShoutrrrAlert(notificationUrl, title, message, link,
 	parsedURL.RawQuery = queryParams.Encode()
 	// log.Println("URL after modification:", parsedURL.String())
 
-	err = send(parsedURL.String(), message)
+	err = shoutrrr.Send(parsedURL.String(), message)
 
 	if err == nil {
 		am.hub.Logger().Info("Sent shoutrrr alert", "title", title)

internal/alerts/alerts_api.go

@@ -3,11 +3,13 @@ package alerts
 import (
 	"database/sql"
 	"errors"
+	"net"
 	"net/http"
+	"net/url"
 	"slices"
+	"strings"
 
 	"github.com/henrygd/beszel/internal/hub/utils"
-	"github.com/nicholas-fedor/shoutrrr"
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/core"
 )
@@ -145,16 +147,72 @@ func (am *AlertManager) SendTestNotification(e *core.RequestEvent) error {
 	if err != nil || data.URL == "" {
 		return e.BadRequestError("URL is required", err)
 	}
-	send := shoutrrr.Send
+	// Only allow admins to send test notifications to internal URLs
 	if !e.Auth.IsSuperuser() && e.Auth.GetString("role") != "admin" {
-		send = sendPublicNotification
+		internalURL, err := isInternalURL(data.URL)
+		if err != nil {
+			return e.BadRequestError(err.Error(), nil)
 		}
-	err = am.sendShoutrrrAlert(data.URL, "Test Alert", "This is a notification from Beszel.", am.hub.Settings().Meta.AppURL, "View Beszel", send)
+		if internalURL {
-	if errors.Is(err, errInternalDestination) || errors.Is(err, errUnrestrictedService) {
+			return e.ForbiddenError("Only admins can send to internal destinations", nil)
-		return e.ForbiddenError(err.Error(), nil)
 		}
+	}
+	err = am.SendShoutrrrAlert(data.URL, "Test Alert", "This is a notification from Beszel.", am.hub.Settings().Meta.AppURL, "View Beszel")
 	if err != nil {
 		return e.JSON(200, map[string]string{"err": err.Error()})
 	}
 	return e.JSON(200, map[string]bool{"err": false})
 }
+
+// isInternalURL checks if the given shoutrrr URL points to an internal destination (localhost or private IP)
+func isInternalURL(rawURL string) (bool, error) {
+	parsedURL, err := url.Parse(rawURL)
+	if err != nil {
+		return false, err
+	}
+
+	host := parsedURL.Hostname()
+	if host == "" {
+		return false, nil
+	}
+
+	if strings.EqualFold(host, "localhost") {
+		return true, nil
+	}
+
+	if ip := net.ParseIP(host); ip != nil {
+		return isInternalIP(ip), nil
+	}
+
+	// Some Shoutrrr URLs use the host position for service identifiers rather than a
+	// network hostname (for example, discord://token@webhookid). Restrict DNS lookups
+	// to names that look like actual hostnames so valid service URLs keep working.
+	if !strings.Contains(host, ".") {
+		return false, nil
+	}
+
+	ips, err := net.LookupIP(host)
+	if err != nil {
+		return false, nil
+	}
+
+	if slices.ContainsFunc(ips, isInternalIP) {
+		return true, nil
+	}
+
+	return false, nil
+}
+
+var cgnatNetwork = &net.IPNet{
+	IP:   net.IPv4(100, 64, 0, 0),
+	Mask: net.CIDRMask(10, 32),
+}
+
+func isInternalIP(ip net.IP) bool {
+	return ip.IsPrivate() ||
+		ip.IsLoopback() ||
+		ip.IsUnspecified() ||
+		ip.IsLinkLocalUnicast() ||
+		ip.IsMulticast() ||
+		cgnatNetwork.Contains(ip)
+}

internal/alerts/alerts_api_test.go

@@ -7,11 +7,10 @@ import (
 	"encoding/json"
 	"io"
 	"net/http"
-	"net/http/httptest"
 	"strings"
-	"sync/atomic"
 	"testing"
 
+	"github.com/henrygd/beszel/internal/alerts"
 	beszelTests "github.com/henrygd/beszel/internal/tests"
 	pbTests "github.com/pocketbase/pocketbase/tests"
 
@@ -30,6 +29,43 @@ func jsonReader(v any) io.Reader {
 	return bytes.NewReader(data)
 }
 
+func TestIsInternalURL(t *testing.T) {
+	testCases := []struct {
+		name     string
+		url      string
+		internal bool
+	}{
+		{name: "loopback ipv4", url: "generic://127.0.0.1", internal: true},
+		{name: "private ipv4", url: "generic://10.0.0.1", internal: true},
+		{name: "localhost hostname", url: "generic://localhost", internal: true},
+		{name: "localhost with path", url: "generic+http://localhost/api/v1/postStuff", internal: true},
+		{name: "loopback with port and path", url: "generic+http://127.0.0.1:8080/api/v1/postStuff", internal: true},
+		{name: "public hostname", url: "generic+https://beszel.dev/api/v1/postStuff", internal: false},
+		{name: "cloud metadata ipv4", url: "generic://169.254.169.254", internal: true},
+		{name: "link-local ipv4", url: "generic://169.254.1.1", internal: true},
+		{name: "link-local ipv6", url: "generic://[fe80::1]", internal: true},
+		{name: "mapped link-local ipv4", url: "generic://[::ffff:169.254.169.254]", internal: true},
+		{name: "cgnat lower boundary", url: "generic://100.64.0.0", internal: true},
+		{name: "cgnat upper boundary", url: "generic://100.127.255.255", internal: true},
+		{name: "below cgnat", url: "generic://100.63.255.255", internal: false},
+		{name: "above cgnat", url: "generic://100.128.0.0", internal: false},
+		{name: "multicast ipv4", url: "generic://224.0.0.1", internal: true},
+		{name: "multicast ipv6", url: "generic://[ff02::1]", internal: true},
+		{name: "public ipv4", url: "generic://8.8.8.8", internal: false},
+		{name: "public ipv6", url: "generic://[2001:4860:4860::8888]", internal: false},
+		{name: "token style service url", url: "discord://abc123@123456789", internal: false},
+		{name: "single label service url", url: "slack://token@team/channel", internal: false},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			internal, err := alerts.IsInternalURL(testCase.url)
+			assert.NoError(t, err)
+			assert.Equal(t, testCase.internal, internal)
+		})
+	}
+}
+
 func TestUserAlertsApi(t *testing.T) {
 	hub, _ := beszelTests.NewTestHub(t.TempDir())
 	defer hub.Cleanup()
@@ -421,17 +457,6 @@ func TestSendTestNotification(t *testing.T) {
 	hub, user := beszelTests.GetHubWithUser(t)
 	defer hub.Cleanup()
 
-	var delivered atomic.Int32
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		delivered.Add(1)
-	}))
-	defer server.Close()
-	localURL := "generic+" + server.URL
-
-	readonlyUser, err := beszelTests.CreateUserWithRole(hub, "readonly@example.com", "password123", "readonly")
-	assert.NoError(t, err)
-	readonlyToken, err := readonlyUser.NewAuthToken()
-	assert.NoError(t, err)
 	userToken, err := user.NewAuthToken()
 
 	adminUser, err := beszelTests.CreateUserWithRole(hub, "admin@example.com", "password123", "admin")
@@ -456,11 +481,11 @@ func TestSendTestNotification(t *testing.T) {
 			ExpectedContent: []string{"requires valid"},
 			TestAppFactory:  testAppFactory,
 			Body: jsonReader(map[string]any{
-				"url": localURL,
+				"url": "generic://127.0.0.1",
 			}),
 		},
 		{
-			Name:           "POST /test-notification - invalid service reports error",
+			Name:           "POST /test-notification - with external auth should succeed",
 			Method:         http.MethodPost,
 			URL:            "/api/beszel/test-notification",
 			TestAppFactory: testAppFactory,
@@ -468,7 +493,7 @@ func TestSendTestNotification(t *testing.T) {
 				"Authorization": userToken,
 			},
 			Body: jsonReader(map[string]any{
-				"url": "unknown://example.com",
+				"url": "generic://8.8.8.8",
 			}),
 			ExpectedStatus:  200,
 			ExpectedContent: []string{"\"err\":"},
@@ -510,10 +535,10 @@ func TestSendTestNotification(t *testing.T) {
 				"Authorization": adminUserToken,
 			},
 			Body: jsonReader(map[string]any{
-				"url": localURL,
+				"url": "generic://127.0.0.1",
 			}),
 			ExpectedStatus:  200,
-			ExpectedContent: []string{"\"err\":false"},
+			ExpectedContent: []string{"\"err\":"},
 		},
 		{
 			Name:           "POST /test-notification - internal url with superuser auth should succeed",
@@ -524,28 +549,14 @@ func TestSendTestNotification(t *testing.T) {
 				"Authorization": superuserToken,
 			},
 			Body: jsonReader(map[string]any{
-				"url": localURL,
+				"url": "generic://127.0.0.1",
 			}),
 			ExpectedStatus:  200,
 			ExpectedContent: []string{"\"err\":"},
 		},
 	}
 
-	for _, url := range []string{localURL, "smtp://user:pass@127.0.0.1/?fromAddress=sender@example.com&toAddresses=recipient@example.com", "mqtt://127.0.0.1/topic"} {
-		scenarios = append(scenarios, beszelTests.ApiScenario{
-			Name:            "readonly cannot send to " + url,
-			Method:          http.MethodPost,
-			URL:             "/api/beszel/test-notification",
-			TestAppFactory:  testAppFactory,
-			Headers:         map[string]string{"Authorization": readonlyToken},
-			Body:            jsonReader(map[string]any{"url": url}),
-			ExpectedStatus:  403,
-			ExpectedContent: []string{"Only admins"},
-		})
-	}
-
 	for _, scenario := range scenarios {
 		scenario.Test(t)
 	}
-	assert.EqualValues(t, 2, delivered.Load(), "only admin and superuser requests should reach the server")
 }

internal/alerts/alerts_test_helpers.go

@@ -100,6 +100,10 @@ func (am *AlertManager) SetAlertTriggered(alert CachedAlertData, triggered bool)
 	return am.setAlertTriggered(alert, triggered)
 }
 
+func IsInternalURL(rawURL string) (bool, error) {
+	return isInternalURL(rawURL)
+}
+
 // BuildContainerLogExcerpt exposes buildContainerLogExcerpt for testing.
 func BuildContainerLogExcerpt(raw string) string {
 	return buildContainerLogExcerpt(raw)

internal/alerts/alerts_webhooks_test.go

@@ -1,66 +0,0 @@
-//go:build testing
-
-package alerts_test
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"sync/atomic"
-	"testing"
-
-	"github.com/henrygd/beszel/internal/alerts"
-	beszelTests "github.com/henrygd/beszel/internal/tests"
-	"github.com/pocketbase/dbx"
-	"github.com/stretchr/testify/require"
-)
-
-func TestPersistedWebhooksUseCurrentOwnerRole(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-	am := alerts.NewTestAlertManagerWithoutWorker(hub)
-
-	var delivered atomic.Int32
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		delivered.Add(1)
-	}))
-	defer server.Close()
-
-	settings, err := hub.FindFirstRecordByFilter("user_settings", "user={:user}", dbx.Params{"user": user.Id})
-	require.NoError(t, err)
-	settings.Set("settings", alerts.UserNotificationSettings{Webhooks: []string{"generic+" + server.URL}})
-	require.NoError(t, hub.Save(settings))
-	message := alerts.AlertMessageData{UserID: user.Id, Title: "Test", Message: "Persisted webhook"}
-
-	// Keep the same URL and manager while changing roles, so cached privileges
-	// or treating previously saved URLs as trusted would fail this test.
-	for _, tc := range []struct {
-		name string
-		role string
-		want int32
-	}{
-		{"regular user", "user", 0},
-		{"readonly user", "readonly", 0},
-		{"promoted admin", "admin", 1},
-		{"demoted admin", "user", 1},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			user.Set("role", tc.role)
-			require.NoError(t, hub.Save(user))
-			// Webhook errors are logged; SendAlert continues to email delivery.
-			require.NoError(t, am.SendAlert(message))
-			require.Equal(t, tc.want, delivered.Load())
-		})
-	}
-
-	t.Run("missing owner fails closed", func(t *testing.T) {
-		// Model an orphaned settings record without deleting it through the
-		// normal user deletion cascade.
-		const missingOwner = "missingowner123"
-		settings.Set("user", missingOwner)
-		require.NoError(t, hub.SaveNoValidate(settings))
-		message.UserID = missingOwner
-		err := am.SendAlert(message)
-		require.ErrorContains(t, err, "load notification owner")
-		require.EqualValues(t, 1, delivered.Load())
-	})
-}

internal/alerts/notification_client.go

@@ -1,150 +0,0 @@
-package alerts
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/netip"
-	"sync/atomic"
-	"syscall"
-	"time"
-
-	"github.com/nicholas-fedor/shoutrrr/pkg/router"
-	"github.com/nicholas-fedor/shoutrrr/pkg/types"
-)
-
-var (
-	errInternalDestination   = errors.New("Only admins can send to internal destinations")
-	errUnrestrictedService   = errors.New("Only admins can use this notification service") // Restrict services w/o custom connection support
-	publicNotificationDialer = &net.Dialer{
-		Timeout: 10 * time.Second,
-		// Control checks each resolved address immediately before connecting.
-		Control: func(_, address string, _ syscall.RawConn) error { return checkNotificationAddress(address) },
-	}
-	publicNotificationClient = newPublicNotificationClient()
-)
-
-func newPublicNotificationClient() *http.Client {
-	return &http.Client{
-		Timeout: 15 * time.Second,
-		Transport: &http.Transport{
-			// Do not use proxies: they can resolve the target themselves and
-			// bypass the destination check on our socket.
-			DialContext:         publicNotificationDialer.DialContext,
-			TLSHandshakeTimeout: 10 * time.Second,
-			IdleConnTimeout:     90 * time.Second,
-		},
-	}
-}
-
-func checkNotificationAddress(address string) error {
-	addr, err := netip.ParseAddrPort(address)
-	if err != nil || addr.Addr().Zone() != "" {
-		return errInternalDestination
-	}
-	ip := net.IP(addr.Addr().AsSlice())
-	if !ip.IsGlobalUnicast() || isInternalIP(ip) {
-		return errInternalDestination
-	}
-	return nil
-}
-
-func sendPublicNotification(rawURL, message string) error {
-	client := &notificationClient{Client: publicNotificationClient}
-	service, err := newPublicNotificationService(rawURL, types.SenderOptions{HTTPClient: client, DialContext: client.dialContext})
-	if err == nil {
-		if closer, ok := service.(io.Closer); ok {
-			defer closer.Close()
-		}
-		err = service.Send(message, &types.Params{})
-	}
-	// Some services format errors without preserving their error chain.
-	if client.blocked.Load() {
-		return errInternalDestination
-	}
-	return err
-}
-
-type notificationClient struct {
-	*http.Client
-	blocked atomic.Bool
-}
-
-func (c *notificationClient) Do(req *http.Request) (*http.Response, error) {
-	response, err := c.Client.Do(req)
-	if errors.Is(err, errInternalDestination) {
-		c.blocked.Store(true)
-	}
-	return response, err
-}
-
-func (c *notificationClient) dialContext(ctx context.Context, network, address string) (net.Conn, error) {
-	conn, err := publicNotificationDialer.DialContext(ctx, network, address)
-	if errors.Is(err, errInternalDestination) {
-		c.blocked.Store(true)
-	}
-	return conn, err
-}
-
-func newPublicNotificationService(rawURL string, opts types.SenderOptions) (types.Service, error) {
-	r := &router.ServiceRouter{}
-	scheme, serviceURL, err := r.ExtractServiceName(rawURL)
-	if err != nil {
-		return nil, err
-	}
-	service, err := r.NewService(scheme)
-	if err != nil {
-		return nil, err
-	}
-	httpSetter, httpOK := service.(types.HTTPClientSetter)
-	dialSetter, dialOK := service.(types.DialContextSetter)
-	if (!httpOK || opts.HTTPClient == nil) && (!dialOK || opts.DialContext == nil) {
-		return nil, errUnrestrictedService
-	}
-	if serviceURL.Scheme != scheme {
-		custom, ok := service.(types.CustomURLService)
-		if !ok {
-			return nil, fmt.Errorf("%w: %s", router.ErrCustomURLsNotSupported, scheme)
-		}
-		serviceURL, err = custom.GetServiceURLFromCustom(serviceURL)
-		if err != nil {
-			return nil, err
-		}
-	}
-	// Shoutrrr v0.20.0 CreateSenderWithOptions injects only AFTER Initialize.
-	// Matrix can log in during Initialize, so inject before it as well.
-	if httpOK {
-		httpSetter.SetHTTPClient(opts.HTTPClient)
-	}
-	if dialOK {
-		dialSetter.SetDialContext(opts.DialContext)
-	}
-	if err := service.Initialize(serviceURL, nil); err != nil {
-		return nil, err
-	}
-	// Some initializers replace their HTTP client with a default client.
-	if httpOK {
-		httpSetter.SetHTTPClient(opts.HTTPClient)
-	}
-	if dialOK {
-		dialSetter.SetDialContext(opts.DialContext)
-	}
-	return service, nil
-}
-
-var cgnatNetwork = &net.IPNet{
-	IP:   net.IPv4(100, 64, 0, 0),
-	Mask: net.CIDRMask(10, 32),
-}
-
-func isInternalIP(ip net.IP) bool {
-	return ip.IsPrivate() ||
-		ip.IsLoopback() ||
-		ip.IsUnspecified() ||
-		ip.IsLinkLocalUnicast() ||
-		ip.IsMulticast() ||
-		cgnatNetwork.Contains(ip)
-}

internal/alerts/notification_client_test.go

@@ -1,217 +0,0 @@
-package alerts
-
-import (
-	"context"
-	"encoding/binary"
-	"errors"
-	"io"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"sync/atomic"
-	"testing"
-
-	"github.com/nicholas-fedor/shoutrrr/pkg/types"
-	"golang.org/x/net/dns/dnsmessage"
-)
-
-func TestCheckNotificationAddress(t *testing.T) {
-	for _, host := range []string{"127.0.0.1", "10.0.0.1", "172.16.0.1", "192.168.0.1", "169.254.169.254", "100.64.0.0", "100.127.255.255", "0.0.0.0", "224.0.0.1", "255.255.255.255", "::1", "::", "fc00::1", "fe80::1", "ff02::1", "::ffff:127.0.0.1", "::ffff:169.254.169.254", "fe80::1%lo", "localhost", "consul"} {
-		t.Run(host, func(t *testing.T) {
-			if err := checkNotificationAddress(net.JoinHostPort(host, "80")); !errors.Is(err, errInternalDestination) {
-				t.Fatalf("expected blocked address, got %v", err)
-			}
-		})
-	}
-	for _, host := range []string{"8.8.8.8", "100.63.255.255", "100.128.0.0", "2001:4860:4860::8888"} {
-		if err := checkNotificationAddress(net.JoinHostPort(host, "443")); err != nil {
-			t.Errorf("public address %s: %v", host, err)
-		}
-	}
-}
-
-func TestPublicNotificationBlocksInternalRequests(t *testing.T) {
-	var hits atomic.Int32
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		hits.Add(1)
-	}))
-	defer server.Close()
-	host := strings.TrimPrefix(server.URL, "http://")
-	for _, rawURL := range []string{
-		"generic+http://" + host,
-		"generic+https://" + host,
-		"generic+http://localhost:" + strings.Split(host, ":")[1],
-		"matrix://user:password@" + host + "/room?disabletls=yes",
-		"mattermost://" + host + "/token?disabletls=yes",
-	} {
-		t.Run(rawURL, func(t *testing.T) {
-			if err := sendPublicNotification(rawURL, "test"); !errors.Is(err, errInternalDestination) {
-				t.Fatalf("expected internal destination error, got %v", err)
-			}
-		})
-	}
-	if hits.Load() != 0 {
-		t.Fatal("internal server received a request")
-	}
-
-}
-
-type notificationRoundTripper func(*http.Request) (*http.Response, error)
-
-func (f notificationRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) { return f(r) }
-
-func TestPublicNotificationRedirect(t *testing.T) {
-	client := newPublicNotificationClient()
-	defer client.CloseIdleConnections()
-	transport := client.Transport
-	client.Transport = notificationRoundTripper(func(r *http.Request) (*http.Response, error) {
-		if r.URL.Host == "public.example" {
-			return &http.Response{StatusCode: 307, Header: http.Header{"Location": {"http://127.0.0.1/"}}, Body: io.NopCloser(strings.NewReader("")), Request: r}, nil
-		}
-		return transport.RoundTrip(r)
-	})
-	_, err := client.Get("http://public.example/")
-	if !errors.Is(err, errInternalDestination) {
-		t.Fatalf("expected redirect to be blocked, got %v", err)
-	}
-}
-
-func TestPublicNotificationServiceClient(t *testing.T) {
-	for _, rawURL := range []string{"generic+http://public.example/path", "discord://token@123456789", "slack://hook:AAAAAAAAA-BBBBBBBBB-123456789123456789123456@webhook"} {
-		t.Run(rawURL, func(t *testing.T) {
-			var hits int
-			client := &http.Client{Transport: notificationRoundTripper(func(r *http.Request) (*http.Response, error) {
-				hits++
-				body := `{"ok":true}`
-				if strings.HasPrefix(rawURL, "slack:") {
-					body = "ok"
-				}
-				return &http.Response{StatusCode: 200, Header: make(http.Header), Body: io.NopCloser(strings.NewReader(body)), Request: r}, nil
-			})}
-			service, err := newPublicNotificationService(rawURL, types.SenderOptions{HTTPClient: client})
-			if err != nil {
-				t.Fatal(err)
-			}
-			if err := service.Send("test", &types.Params{}); err != nil {
-				t.Fatal(err)
-			}
-			if hits == 0 {
-				t.Fatal("injected client was not used")
-			}
-		})
-	}
-}
-
-func TestPublicNotificationDNS(t *testing.T) {
-	// Supply deterministic DNS responses over an in-memory TCP connection.
-	// The first lookup sees a public IP; subsequent lookups see loopback.
-	var rebound atomic.Bool
-	resolver := &net.Resolver{PreferGo: true, Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
-		client, server := net.Pipe()
-		go func() {
-			defer server.Close()
-			var size [2]byte
-			if _, err := io.ReadFull(server, size[:]); err != nil {
-				return
-			}
-			buf := make([]byte, binary.BigEndian.Uint16(size[:]))
-			if _, err := io.ReadFull(server, buf); err != nil {
-				return
-			}
-			var msg dnsmessage.Message
-			if err := msg.Unpack(buf); err != nil {
-				return
-			}
-			msg.Header.Response = true
-			msg.Header.RecursionAvailable = true
-			q := msg.Questions[0]
-			if q.Type == dnsmessage.TypeA {
-				ip := [4]byte{8, 8, 8, 8}
-				if rebound.Load() {
-					ip = [4]byte{127, 0, 0, 1}
-				}
-				msg.Answers = []dnsmessage.Resource{{Header: dnsmessage.ResourceHeader{Name: q.Name, Type: q.Type, Class: dnsmessage.ClassINET}, Body: &dnsmessage.AResource{A: ip}}}
-			}
-			buf, err := msg.Pack()
-			if err != nil {
-				return
-			}
-			binary.BigEndian.PutUint16(size[:], uint16(len(buf)))
-			server.Write(append(size[:], buf...))
-		}()
-		return client, nil
-	}}
-	// These tests do not run in parallel; restore the process resolver afterward.
-	previous := net.DefaultResolver
-	net.DefaultResolver = resolver
-	t.Cleanup(func() { net.DefaultResolver = previous })
-	ips, err := resolver.LookupIP(context.Background(), "ip4", "rebind.example")
-	if err != nil || len(ips) != 1 || !ips[0].Equal(net.IPv4(8, 8, 8, 8)) {
-		t.Fatalf("initial DNS lookup: %v, %v", ips, err)
-	}
-	rebound.Store(true)
-	client := newPublicNotificationClient()
-	defer client.CloseIdleConnections()
-	for _, host := range []string{"rebind.example", "consul"} {
-		guarded := &notificationClient{Client: client}
-		conn, dialErr := guarded.dialContext(context.Background(), "tcp", net.JoinHostPort(host, "25"))
-		if conn != nil {
-			conn.Close()
-		}
-		if !errors.Is(dialErr, errInternalDestination) || !guarded.blocked.Load() {
-			t.Errorf("expected TCP dial-time rejection for %s, got %v", host, dialErr)
-		}
-		_, err := client.Get("http://" + host + "/")
-		if !errors.Is(err, errInternalDestination) {
-			t.Errorf("expected dial-time rejection for %s, got %v", host, err)
-		}
-	}
-}
-
-func TestPublicNotificationTCP(t *testing.T) {
-	for _, rawURL := range []string{
-		"smtp://user:pass@HOST:25/?fromAddress=sender@example.com&toAddresses=recipient@example.com",
-		"smtp://user:pass@HOST:465/?fromAddress=sender@example.com&toAddresses=recipient@example.com",
-		"mqtt://HOST:1883/topic",
-		"mqtts://HOST:8883/topic",
-	} {
-		t.Run(rawURL, func(t *testing.T) {
-			t.Parallel()
-			t.Run("internal destination", func(t *testing.T) {
-				err := sendPublicNotification(strings.ReplaceAll(rawURL, "HOST", "127.0.0.1"), "test")
-				if !errors.Is(err, errInternalDestination) {
-					t.Fatalf("expected blocked destination, got %v", err)
-				}
-			})
-			t.Run("public destination uses injected dialer", func(t *testing.T) {
-				var calls atomic.Int32
-				stopped := errors.New("test dial stopped")
-				service, err := newPublicNotificationService(strings.ReplaceAll(rawURL, "HOST", "8.8.8.8"), types.SenderOptions{
-					DialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
-						calls.Add(1)
-						if network != "tcp" || !strings.HasPrefix(address, "8.8.8.8:") {
-							t.Errorf("unexpected dial: %s %s", network, address)
-						}
-						if err := checkNotificationAddress(address); err != nil {
-							t.Error(err)
-						}
-						return nil, stopped
-					},
-				})
-				if err != nil {
-					t.Fatal(err)
-				}
-				if closer, ok := service.(io.Closer); ok {
-					defer closer.Close()
-				}
-				if err := service.Send("test", &types.Params{}); err == nil {
-					t.Fatal("expected dial failure")
-				}
-				if calls.Load() == 0 {
-					t.Fatal("custom dialer was not used")
-				}
-			})
-		})
-	}
-}

internal/site/src/components/routes/system/smart-table.tsx

@@ -75,12 +75,7 @@ export const smartColumns: ColumnDef<SmartAttribute>[] = [
 		header: "Name",
 	},
 	{
-		accessorFn: (row) => {
+		accessorFn: (row) => row.rs || row.rv?.toString(),
-			if (row.n === "DataUnitsWritten" || row.n === "DataUnitsRead") {
-				return formatDataUnits(Number(row.rv ?? 0))
-			}
-			return row.rs || row.rv?.toString()
-		},
 		header: "Value",
 	},
 	{
@@ -108,12 +103,6 @@ function formatCapacity(bytes: number): string {
 	return `${toFixedFloat(value, value >= 10 ? 1 : 2)} ${unit}`
 }
 
-// Function to format NVMe data units
-// (1 unit = 1000 * 512 bytes) as a human-readable size
-function formatDataUnits(units: number): string {
-	return formatCapacity(units * 1000 * 512)
-}
-
 const SMART_DEVICE_FIELDS = "id,system,name,model,state,capacity,temp,type,hours,cycles,updated"
 
 export const createColumns = (