GitHubMirror/sys
1
0
Fork 0
mirror of https://github.com/rwinkhart/sys.git synced 2026-09-02 23:27:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

unix: add Xucred, GetsockoptXucred on darwin

Browse Source 
Test adapted from CL 134535 from Tyler Julian (@APTy).

For posterity, the auto-generated parts were updated with:

    GOARCH_TARGET=amd64 go tool cgo -godefs types_darwin.go | GOOS=darwin GOARCH_TARGET=amd64 go run mkpost.go > ztypes_darwin_amd64.go
    GOARCH_TARGET=arm64 go tool cgo -godefs types_darwin.go | GOOS=darwin GOARCH_TARGET=arm64 go run mkpost.go > ztypes_darwin_arm64.go
    GOOS=darwin GOARCH=amd64 ./mkerrors.sh -m64 > zerrors_darwin_amd64.go ; gofmt -w zerrors_darwin_amd64.go
    GOOS=darwin GOARCH=arm64 ./mkerrors.sh -m64 > zerrors_darwin_arm64.go ; gofmt -w zerrors_darwin_arm64.go
    perl -i -npe 's,( cgo -godefs(?: -- -m64)? )/.+/(\S+.go),$$1$$2,' zerrors_darwin_amd64.go zerrors_darwin_arm64.go ztypes_darwin_amd64.go ztypes_darwin_arm64.go

Fixes golang/go#27613

Change-Id: Ie41b3da840cb9c8c140c57ecfb78e7abc4f70bea
Reviewed-on: https://go-review.googlesource.com/c/sys/+/292330
Trust: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
This commit is contained in:
Brad Fitzpatrick
2021-02-16 22:45:49 +00:00
parent f7da38b97c
commit f992740a1b
8 changed files with 81 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unix/mkerrors.sh
+2 -1
View File
@@ -65,6 +65,7 @@ includes_Darwin='
#include <sys/ptrace.h> #include <sys/ptrace.h>
#include <sys/select.h> #include <sys/select.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h>
#include <sys/sockio.h> #include <sys/sockio.h>
#include <sys/sys_domain.h> #include <sys/sys_domain.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
@@ -480,7 +481,7 @@ ccflags="$@"
$2 ~ /^LOCK_(SH|EX|NB|UN)$/ || $2 ~ /^LOCK_(SH|EX|NB|UN)$/ ||
$2 ~ /^LO_(KEY|NAME)_SIZE$/ || $2 ~ /^LO_(KEY|NAME)_SIZE$/ ||
$2 ~ /^LOOP_(CLR|CTL|GET|SET)_/ || $2 ~ /^LOOP_(CLR|CTL|GET|SET)_/ ||
$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|ICMP6|TCP|MCAST|EVFILT|NOTE|EV|SHUT|PROT|MAP|MFD|T?PACKET|MSG|SCM|MCL|DT|MADV|PR)_/ || $2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|ICMP6|TCP|MCAST|EVFILT|NOTE|EV|SHUT|PROT|MAP|MFD|T?PACKET|MSG|SCM|MCL|DT|MADV|PR|LOCAL)_/ ||
$2 ~ /^TP_STATUS_/ || $2 ~ /^TP_STATUS_/ ||
$2 ~ /^FALLOC_/ || $2 ~ /^FALLOC_/ ||
$2 == "ICMPV6_FILTER" || $2 == "ICMPV6_FILTER" ||
unix/syscall_darwin.go
+9
View File
@@ -378,6 +378,15 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
return return
} }
// GetsockoptXucred is a getsockopt wrapper that returns an Xucred struct.
// The usual level and opt are SOL_LOCAL and LOCAL_PEERCRED, respectively.
func GetsockoptXucred(fd, level, opt int) (*Xucred, error) {
x := new(Xucred)
vallen := _Socklen(unsafe.Sizeof(Xucred{}))
err := getsockopt(fd, level, opt, unsafe.Pointer(x), &vallen)
return x, err
}
//sys sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) //sys sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error)
/* /*
unix/syscall_darwin_test.go
+36
View File
@@ -7,8 +7,10 @@ package unix_test
import ( import (
"bytes" "bytes"
"io/ioutil" "io/ioutil"
"net"
"os" "os"
"path" "path"
"syscall"
"testing" "testing"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
@@ -217,3 +219,37 @@ func TestFcntlFstore(t *testing.T) {
} }
} }
func TestGetsockoptXucred(t *testing.T) {
fds, err := syscall.Socketpair(syscall.AF_LOCAL, syscall.SOCK_STREAM, 0)
if err != nil {
t.Fatalf("Socketpair: %v", err)
}
defer syscall.Close(fds[0])
defer syscall.Close(fds[1])
srvFile := os.NewFile(uintptr(fds[0]), "server")
defer srvFile.Close()
srv, err := net.FileConn(srvFile)
if err != nil {
t.Fatalf("FileConn: %v", err)
}
defer srv.Close()
cliFile := os.NewFile(uintptr(fds[1]), "client")
defer cliFile.Close()
cli, err := net.FileConn(cliFile)
if err != nil {
t.Fatalf("FileConn: %v", err)
}
defer cli.Close()
cred, err := unix.GetsockoptXucred(fds[1], unix.SOL_LOCAL, unix.LOCAL_PEERCRED)
if err != nil {
t.Fatal(err)
}
t.Logf("got: %+v", cred)
if got, want := cred.Uid, os.Getuid(); int(got) != int(want) {
t.Errorf("uid = %v; want %v", got, want)
}
}
unix/types_darwin.go
+4
View File
@@ -38,6 +38,7 @@ package unix
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/ucred.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/un.h> #include <sys/un.h>
#include <sys/utsname.h> #include <sys/utsname.h>
@@ -150,6 +151,8 @@ type RawSockaddrCtl C.struct_sockaddr_ctl
type _Socklen C.socklen_t type _Socklen C.socklen_t
type Xucred C.struct_xucred
type Linger C.struct_linger type Linger C.struct_linger
type Iovec C.struct_iovec type Iovec C.struct_iovec
@@ -177,6 +180,7 @@ const (
SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un
SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
SizeofSockaddrCtl = C.sizeof_struct_sockaddr_ctl SizeofSockaddrCtl = C.sizeof_struct_sockaddr_ctl
SizeofXucred = C.sizeof_struct_xucred
SizeofLinger = C.sizeof_struct_linger SizeofLinger = C.sizeof_struct_linger
SizeofIovec = C.sizeof_struct_iovec SizeofIovec = C.sizeof_struct_iovec
SizeofIPMreq = C.sizeof_struct_ip_mreq SizeofIPMreq = C.sizeof_struct_ip_mreq
unix/zerrors_darwin_amd64.go
+7
View File
@@ -902,6 +902,12 @@ const (
KERN_OSRELEASE = 0x2 KERN_OSRELEASE = 0x2
KERN_OSTYPE = 0x1 KERN_OSTYPE = 0x1
KERN_VERSION = 0x4 KERN_VERSION = 0x4
LOCAL_PEERCRED = 0x1
LOCAL_PEEREPID = 0x3
LOCAL_PEEREUUID = 0x5
LOCAL_PEERPID = 0x2
LOCAL_PEERTOKEN = 0x6
LOCAL_PEERUUID = 0x4
LOCK_EX = 0x2 LOCK_EX = 0x2
LOCK_NB = 0x4 LOCK_NB = 0x4
LOCK_SH = 0x1 LOCK_SH = 0x1
@@ -1309,6 +1315,7 @@ const (
SOCK_RDM = 0x4 SOCK_RDM = 0x4
SOCK_SEQPACKET = 0x5 SOCK_SEQPACKET = 0x5
SOCK_STREAM = 0x1 SOCK_STREAM = 0x1
SOL_LOCAL = 0x0
SOL_SOCKET = 0xffff SOL_SOCKET = 0xffff
SOMAXCONN = 0x80 SOMAXCONN = 0x80
SO_ACCEPTCONN = 0x2 SO_ACCEPTCONN = 0x2
unix/zerrors_darwin_arm64.go
+7
View File
@@ -902,6 +902,12 @@ const (
KERN_OSRELEASE = 0x2 KERN_OSRELEASE = 0x2
KERN_OSTYPE = 0x1 KERN_OSTYPE = 0x1
KERN_VERSION = 0x4 KERN_VERSION = 0x4
LOCAL_PEERCRED = 0x1
LOCAL_PEEREPID = 0x3
LOCAL_PEEREUUID = 0x5
LOCAL_PEERPID = 0x2
LOCAL_PEERTOKEN = 0x6
LOCAL_PEERUUID = 0x4
LOCK_EX = 0x2 LOCK_EX = 0x2
LOCK_NB = 0x4 LOCK_NB = 0x4
LOCK_SH = 0x1 LOCK_SH = 0x1
@@ -1309,6 +1315,7 @@ const (
SOCK_RDM = 0x4 SOCK_RDM = 0x4
SOCK_SEQPACKET = 0x5 SOCK_SEQPACKET = 0x5
SOCK_STREAM = 0x1 SOCK_STREAM = 0x1
SOL_LOCAL = 0x0
SOL_SOCKET = 0xffff SOL_SOCKET = 0xffff
SOMAXCONN = 0x80 SOMAXCONN = 0x80
SO_ACCEPTCONN = 0x2 SO_ACCEPTCONN = 0x2
unix/ztypes_darwin_amd64.go
+8
View File
@@ -210,6 +210,13 @@ type RawSockaddrCtl struct {
type _Socklen uint32 type _Socklen uint32
type Xucred struct {
Version uint32
Uid uint32
Ngroups int16
Groups [16]uint32
}
type Linger struct { type Linger struct {
Onoff int32 Onoff int32
Linger int32 Linger int32
@@ -273,6 +280,7 @@ const (
SizeofSockaddrUnix = 0x6a SizeofSockaddrUnix = 0x6a
SizeofSockaddrDatalink = 0x14 SizeofSockaddrDatalink = 0x14
SizeofSockaddrCtl = 0x20 SizeofSockaddrCtl = 0x20
SizeofXucred = 0x4c
SizeofLinger = 0x8 SizeofLinger = 0x8
SizeofIovec = 0x10 SizeofIovec = 0x10
SizeofIPMreq = 0x8 SizeofIPMreq = 0x8
unix/ztypes_darwin_arm64.go
+8
View File
@@ -210,6 +210,13 @@ type RawSockaddrCtl struct {
type _Socklen uint32 type _Socklen uint32
type Xucred struct {
Version uint32
Uid uint32
Ngroups int16
Groups [16]uint32
}
type Linger struct { type Linger struct {
Onoff int32 Onoff int32
Linger int32 Linger int32
@@ -273,6 +280,7 @@ const (
SizeofSockaddrUnix = 0x6a SizeofSockaddrUnix = 0x6a
SizeofSockaddrDatalink = 0x14 SizeofSockaddrDatalink = 0x14
SizeofSockaddrCtl = 0x20 SizeofSockaddrCtl = 0x20
SizeofXucred = 0x4c
SizeofLinger = 0x8 SizeofLinger = 0x8
SizeofIovec = 0x10 SizeofIovec = 0x10
SizeofIPMreq = 0x8 SizeofIPMreq = 0x8