From b38a3a182fc871c76fc0279ce2c181ebd08dc5cc Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Fri, 23 Aug 2024 11:37:08 +0200
Subject: [PATCH] daemon: SdNotify: add support for abstract unix sockets

As per https://www.freedesktop.org/software/systemd/man/latest/sd_notify.html#
---
 daemon/sdnotify.go | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/daemon/sdnotify.go b/daemon/sdnotify.go
index ba4ae31f..2aedec75 100644
--- a/daemon/sdnotify.go
+++ b/daemon/sdnotify.go
@@ -54,16 +54,29 @@ const (
 // (false, err) - notification supported, but failure happened (e.g. error connecting to NOTIFY_SOCKET or while sending data)
 // (true, nil) - notification supported, data has been sent
 func SdNotify(unsetEnvironment bool, state string) (bool, error) {
-	socketAddr := &net.UnixAddr{
-		Name: os.Getenv("NOTIFY_SOCKET"),
-		Net:  "unixgram",
-	}
+	notifySocket := os.Getenv("NOTIFY_SOCKET")
 
 	// NOTIFY_SOCKET not set
-	if socketAddr.Name == "" {
+	if notifySocket == "" {
+		return false, nil
+	}
+
+	// socket type not supported. We only support unix domain sockets
+	// but NOTIFY_SOCKET can also use vsock
+	if notifySocket[0] != '@' || notifySocket[0] != '/' {
 		return false, nil
 	}
 
+	// abstract unix socket. Start with a 0-byte
+	if notifySocket[0] == '@' {
+		notifySocket = "\x00" + notifySocket[1:]
+	}
+
+	socketAddr := &net.UnixAddr{
+		Name: notifySocket,
+		Net:  "unixgram",
+	}
+
 	if unsetEnvironment {
 		if err := os.Unsetenv("NOTIFY_SOCKET"); err != nil {
 			return false, err