fix(server): secrets inspectation for the config analyzer in client server mode #8418
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
…e with redis backend
|
|
iamtraining
changed the title
There was a problem hiding this comment.
@iamtraining Thanks for your work!
Looks good.
Left small comments
pkg/rpc/convert.go
Outdated
| } | ||
| } | ||
|
|
||
| // ConvertFromRPCSecret converts fanal.Secret to common.Secret |
There was a problem hiding this comment.
Suggested change
| // ConvertFromRPCSecret converts fanal.Secret to common.Secret | |
| // ConvertToRPCSecret converts fanal.Secret to common.Secret |
| } | ||
|
|
||
| // ConvertFromRPCSecret converts fanal.Secret to common.Secret | ||
| func ConvertToRPCSecret(secret *ftypes.Secret) *common.Secret { |
There was a problem hiding this comment.
I think we can use this function in ConvertToRPCSecrets:
Lines 149 to 152 in a280cbb
| @@ -1015,3 +1017,25 @@ func ConvertFromDeleteBlobsRequest(deleteBlobsRequest *cache.DeleteBlobsRequest) | |||
| } | |||
| return deleteBlobsRequest.GetBlobIds() | |||
| } | |||
|
|
|||
| // ConvertFromRPCSecret converts common.Secret to fanal.Secret | |||
| func ConvertFromRPCSecret(rpcSecret *common.Secret) *ftypes.Secret { | |||
There was a problem hiding this comment.
same for ConvertFromRPCSecrets
rpc/cache/service.proto
Outdated
| @@ -21,6 +21,7 @@ message ArtifactInfo { | |||
| string docker_version = 4; | |||
| string os = 5; | |||
| repeated common.Package history_packages = 6; | |||
| common.Secret secret = 7; | |||
DmitriyLewen
changed the title
DmitriyLewen
approved these changes
Feb 19, 2025
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.
fix secrets inspectation for the config analyzer in client server mode
Description
secrets that were found when inspecting the config in client/server mode are not saved in the remote cache
func (a Artifact) inspectConfig( ... )
the secret field for PutArtifact is not sent to the server so these secrets are lost
before
{ "SchemaVersion":1, "Architecture":"amd64", "Created":"2023-10-24T22:44:45Z", "DockerVersion":"", "OS":"linux" }after this huge and massive fix
{"SchemaVersion":1,"Architecture":"amd64","Created":"2023-10-24T22:44:45Z","DockerVersion":"","OS":"linux","Secret":{"FilePath":"config.json","Findings":[{ ... }]}}Related issues
Checklist