-
Notifications
You must be signed in to change notification settings - Fork 650
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
+27
−1
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 { | ||
err = errors.Join(store.ErrSystemFailure, err) | ||
} | ||
|
||
var content []byte | ||
content, err = json.Marshal(meta) | ||
if err != nil { | ||
|
@@ -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 { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 { | ||
|
@@ -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 | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same as above |
||
} | ||
|
||
func hashData(src io.Reader) (string, error) { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 ofWriteFile
doesn't take an expected effect?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done