Skip to content

UAPI socket for the macOS sandboxed Wireguard app #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

UAPI socket for the macOS sandboxed Wireguard app #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ipc/uapi_bsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func UAPIListen(name string, file *os.File) (net.Listener, error) {
if err != nil {
return nil, err
}
uapi.keventFd, err = unix.Open(socketDirectory, unix.O_RDONLY, 0)
uapi.keventFd, err = unix.Open(sockDir(), unix.O_RDONLY, 0)
if err != nil {
unix.Close(uapi.kqueueFd)
return nil, err
Expand Down
17 changes: 15 additions & 2 deletions ipc/uapi_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"fmt"
"net"
"os"
"strings"

"golang.org/x/sys/unix"
)
Expand All @@ -28,12 +29,24 @@ const (
// flag in wireguard-android.
var socketDirectory = "/var/run/wireguard"

const NET_EXT_APP_ID = "com.wireguard.macos.network-extension"

func sockDir() string {
baseDir := socketDirectory
homeDir, err := os.UserHomeDir()
if err == nil && strings.Contains(homeDir, NET_EXT_APP_ID) {
// this is a macOS sandboxed app, so we don't have access to /var/run
baseDir = homeDir
}
return baseDir
}

func sockPath(iface string) string {
return fmt.Sprintf("%s/%s.sock", socketDirectory, iface)
return fmt.Sprintf("%s/%s.sock", sockDir(), iface)
}

func UAPIOpen(name string) (*os.File, error) {
if err := os.MkdirAll(socketDirectory, 0o755); err != nil {
if err := os.MkdirAll(sockDir(), 0o755); err != nil {
return nil, err
}

Expand Down