Fix panic if there is a plugin configuration error in the server #3166
Conversation
This file contains 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
Signed-off-by: Agustín Martínez Fayó <amartinezfayo@gmail.com>
amartinezfayo
requested review from
evan2645,
azdagron,
MarcosDY and
rturner3
as code owners
azdagron
reviewed
Jun 16, 2022
pkg/server/catalog/catalog.go
Outdated
| @@ -122,11 +122,6 @@ func Load(ctx context.Context, config Config) (_ *Repository, err error) { | |||
| repo := &Repository{ | |||
| log: config.Log, | |||
| } | |||
| defer func() { | |||
There was a problem hiding this comment.
I think the correct behavior here is to keep the defer and instead change the Close() method to test if the dataStoreCloser and catalogClosers are set before trying to close them individually. This defer cleans up and closes the datastore connection on configuration error.
There was a problem hiding this comment.
That was my first fix, but then I thought that was redundant. Thanks for pointing the reason, now I see the point.
Signed-off-by: Agustín Martínez Fayó <amartinezfayo@gmail.com>
stevend-uber
pushed a commit
to stevend-uber/spire
that referenced
this pull request
Oct 16, 2023
…ffe#3166) Signed-off-by: Agustín Martínez Fayó <amartinezfayo@gmail.com>
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.
There is a deferred function in the server's
catalog.Loadfunc that callsrepo.Close().The problem is that this could be called before the catalog could be loaded (which can happen when there is an error).
I'm removing this deferred call since we already do that call here: https://github.com/spiffe/spire/blob/main/pkg/server/server.go#L107-L111 (as we do in the agent).