Skip to content
This repository was archived by the owner on Apr 14, 2026. It is now read-only.

cmd/soju: Create unix domain sockets with the right permissions #65

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

cmd/soju: Create unix domain sockets with the right permissions #65

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
29 changes: 12 additions & 17 deletions cmd/soju/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,14 @@ func loadConfig() (*config.Server, *soju.Config, error) {
return raw, cfg, nil
}

func listenWithPerms(path string, permissions os.FileMode) (net.Listener, error) {
umask := int((^permissions) & 0777)
prevUmask := syscall.Umask(umask)
ln, err := net.Listen("unix", path)
syscall.Umask(prevUmask)
return ln, err
}

func main() {
var listen []string
flag.Var((*stringSliceFlag)(&listen), "listen", "listening address")
Expand Down Expand Up @@ -245,14 +253,11 @@ func main() {
}
}()
case "unix":
ln, err := net.Listen("unix", u.Host+u.Path)
ln, err := listenWithPerms(u.Host+u.Path, 0775)
if err != nil {
log.Fatalf("failed to start listener on %q: %v", listen, err)
}
ln = proxyProtoListener(ln, srv)
if err := os.Chmod(u.Path, 0775); err != nil {
log.Printf("failed to chmod Unix IRC socket: %v", err)
}
go func() {
if err := srv.Serve(ln, srv.Handle); err != nil {
log.Printf("serving %q: %v", listen, err)
Expand All @@ -263,15 +268,11 @@ func main() {
if path == "" {
path = config.DefaultUnixAdminPath
}
ln, err := net.Listen("unix", path)
ln, err := listenWithPerms(path, 0600)
if err != nil {
log.Fatalf("failed to start listener on %q: %v", listen, err)
}
ln = proxyProtoListener(ln, srv)
// TODO: this is racy
if err := os.Chmod(path, 0600); err != nil {
log.Fatalf("failed to chmod Unix admin socket: %v", err)
}
go func() {
if err := srv.Serve(ln, srv.HandleAdmin); err != nil {
log.Printf("serving %q: %v", listen, err)
Expand Down Expand Up @@ -309,13 +310,10 @@ func main() {
}
}()
case "ws+unix":
ln, err := net.Listen("unix", u.Path)
ln, err := listenWithPerms(u.Path, 0775)
if err != nil {
log.Fatalf("failed to start listener on %q: %v", listen, err)
}
if err := os.Chmod(u.Path, 0775); err != nil {
log.Printf("failed to chmod Unix WS socket: %v", err)
}
httpSrv := &http.Server{Handler: srv}
httpServers = append(httpServers, httpSrv)
go func() {
Expand Down Expand Up @@ -422,13 +420,10 @@ func main() {
}
}()
case "http+unix":
ln, err := net.Listen("unix", u.Path)
ln, err := listenWithPerms(u.Path, 0775)
if err != nil {
log.Fatalf("failed to start listener on %q: %v", listen, err)
}
if err := os.Chmod(u.Path, 0775); err != nil {
log.Printf("failed to chmod Unix HTTP socket: %v", err)
}
httpSrv := &http.Server{Handler: httpMux}
httpServers = append(httpServers, httpSrv)
go func() {
Expand Down