Skip to content

Fix permissions for resolv.conf and hosts #3708

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.

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

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions pkg/dnsutil/hostsstore/hostsstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ func (x *hostsStore) Acquire(meta Meta) (err error) {
return errors.Join(store.ErrSystemFailure, err)
}

// os.WriteFile relies on syscall.Open. Unless there are ACLs, the effective mode of the file will be matched
// against the current process umask.
// See https://www.man7.org/linux/man-pages/man2/open.2.html for details.
// Since we must make sure that these files are world readable, explicitly chmod them here.
if err = os.Chmod(loc, 0o644); err != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment to explain why 0o644 in the arg of WriteFile doesn't take an expected effect?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

err = errors.Join(store.ErrSystemFailure, err)
}

var content []byte
content, err = json.Marshal(meta)
if err != nil {
Expand Down Expand Up @@ -176,6 +184,14 @@ func (x *hostsStore) AllocHostsFile(id string, content []byte) (location string,
err = errors.Join(store.ErrSystemFailure, err)
}

// os.WriteFile relies on syscall.Open. Unless there are ACLs, the effective mode of the file will be matched
// against the current process umask.
// See https://www.man7.org/linux/man-pages/man2/open.2.html for details.
// Since we must make sure that these files are world readable, explicitly chmod them here.
if err = os.Chmod(loc, 0o644); err != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

err = errors.Join(store.ErrSystemFailure, err)
}

return err
})
if err != nil {
Expand Down Expand Up @@ -333,6 +349,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
}
11 changes: 10 additions & 1 deletion pkg/resolvconf/resolvconf.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,16 @@ 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
}

// os.WriteFile relies on syscall.Open. Unless there are ACLs, the effective mode of the file will be matched
// against the current process umask.
// See https://www.man7.org/linux/man-pages/man2/open.2.html for details.
// Since we must make sure that these files are world readable, explicitly chmod them here.
return &File{Content: content.Bytes(), Hash: hash}, os.Chmod(path, 0o644)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

}

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