Skip to content

Commit

Permalink
Fix permissions for resolv.conf and hosts
Browse files Browse the repository at this point in the history
WriteFile uses syscall.Open, so permissions are modified by umask, if set.
For people using agressive umasks (0077), /etc/resolv.conf will end-up unreadable for non root processes.

See #3704

Signed-off-by: apostasie <[email protected]>
  • Loading branch information
apostasie committed Dec 2, 2024
1 parent 3c41efe commit 750d400
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
9 changes: 9 additions & 0 deletions pkg/dnsutil/hostsstore/hostsstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ func (x *hostsStore) Acquire(meta Meta) (err error) {
if err = os.WriteFile(loc, []byte{}, 0o644); err != nil {
return errors.Join(store.ErrSystemFailure, err)
}
// See https://www.man7.org/linux/man-pages/man2/open.2.html
if err = os.Chmod(loc, 0o644); err != nil {
err = errors.Join(store.ErrSystemFailure, err)
}

var content []byte
content, err = json.Marshal(meta)
Expand Down Expand Up @@ -175,6 +179,10 @@ func (x *hostsStore) AllocHostsFile(id string, content []byte) (location string,
if err != nil {
err = errors.Join(store.ErrSystemFailure, err)
}
// See https://www.man7.org/linux/man-pages/man2/open.2.html
if err = os.Chmod(loc, 0o644); err != nil {
err = errors.Join(store.ErrSystemFailure, err)
}

return err
})
Expand Down Expand Up @@ -333,6 +341,7 @@ func (x *hostsStore) updateAllHosts() (err error) {
if err != nil {
log.L.WithError(err).Errorf("failed to write hosts file for %q", entry)
}
_ = os.Chmod(loc, 0o644)
}
return nil
}
8 changes: 7 additions & 1 deletion pkg/resolvconf/resolvconf.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,13 @@ func Build(path string, dns, dnsSearch, dnsOptions []string) (*File, error) {
return nil, err
}

return &File{Content: content.Bytes(), Hash: hash}, os.WriteFile(path, content.Bytes(), 0644)
err = os.WriteFile(path, content.Bytes(), 0o644)
if err != nil {
return nil, err
}

// See https://www.man7.org/linux/man-pages/man2/open.2.html
return &File{Content: content.Bytes(), Hash: hash}, os.Chmod(path, 0o644)
}

func hashData(src io.Reader) (string, error) {
Expand Down

0 comments on commit 750d400

Please sign in to comment.