fix: replace api key with SendKey before transmission #1404
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
MikeGoldsmith
requested changes
Nov 4, 2024
| if a.AcceptOnlyListedKeys && !slices.Contains(a.ReceiveKeys, apiKey) { | ||
| err := fmt.Errorf("api key %s not found in list of authorized keys", a.sanitize(apiKey)) | ||
| return "", err | ||
| func (a *AccessKeyConfig) IsAccepted(key string) bool { |
There was a problem hiding this comment.
I think this could be a little clearer, maybe something like IsValid instead? We should add a function description too as it's public function.
There was a problem hiding this comment.
Also, we create similar errors when this returns false so we could update this func to return the error and check if it's nil when calling it.
| SendKeyMode: tt.fields.SendKeyMode, | ||
| AcceptOnlyListedKeys: tt.fields.AcceptOnlyListedKeys, | ||
| } | ||
| if got := a.IsAccepted(tt.key); got != tt.want { |
There was a problem hiding this comment.
This isn't very clear, let's separate it out a little:
Suggested change
| if got := a.IsAccepted(tt.key); got != tt.want { | |
| got := a.IsAccepted(tt.key) | |
| if got != tt.want { |
| @@ -13,7 +13,7 @@ import ( | |||
|
|
|||
| // for generating request IDs | |||
| func init() { | |||
| rand.Seed(time.Now().UnixNano()) | |||
| rand.New(rand.NewSource(time.Now().UnixNano())) | |||
There was a problem hiding this comment.
What's the change for?
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.
Which problem is this PR solving?
Replacing API key with the configured SendKey in the router causes peer communication to fail due to api key validation on both peer and incoming traffic.
To resolve this issue, this PR adjusts the replacement logic to occur immediately before transmission.
Short description of the changes
sendTraces