fix: close leaked file handles in config and token key loading#1680
Open
fereidani wants to merge 2 commits into
Open
fix: close leaked file handles in config and token key loading#1680fereidani wants to merge 2 commits into
fereidani wants to merge 2 commits into
Conversation
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Hi,
I've built a static analyzer for Go called Ghoul, and I ran it against the cloudflared codebase. It flagged a couple of file handles that are opened but never closed, which can leak file descriptors over the lifetime of the process (and across config reloads). This PR closes both.
Ghoul related reports:
Changes:
config/configuration.go: the strict-mode re-parse inReadConfigFileopens the config file a second time without closing it. Added a deferred close so the handle is released on every path.token/encrypt.go:Encrypter.fetchKeyopens the key file but never closes it on any return path. Added a deferred close.Both use the project's
defer func() { _ = file.Close() }()convention.