-
Notifications
You must be signed in to change notification settings - Fork 61
cmek split 2/8: TiKV encryption metadata HTTP client #4571
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
Merged
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
2802c4f
feat(encryption): add tikv encryption metadata http client
tenfyzhong cf27855
fix(encryption): make tikv meta client self-contained
tenfyzhong fa5cd5a
fix(encryption): remove JSON fallback and simplify TikV HTTP client
tenfyzhong fc6c88b
fix(encryption): restore json fallback for tikv meta response
tenfyzhong ff66a44
Revert "fix(encryption): restore json fallback for tikv meta response"
tenfyzhong 890e178
encryption: remove json handling from tikv meta client
tenfyzhong 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 |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| // Copyright 2026 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package encryption | ||
|
|
||
| import ( | ||
| "encoding/base64" | ||
| "encoding/json" | ||
| "fmt" | ||
| ) | ||
|
|
||
| // ByteArray supports decoding either: | ||
| // - a JSON string (base64-encoded bytes), or | ||
| // - a JSON array of uint8 values (TiKV status API style). | ||
| type ByteArray []byte | ||
|
|
||
| func (b *ByteArray) UnmarshalJSON(data []byte) error { | ||
| if len(data) == 0 || string(data) == "null" { | ||
| *b = nil | ||
| return nil | ||
| } | ||
|
|
||
| switch data[0] { | ||
| case '"': | ||
| var s string | ||
| if err := json.Unmarshal(data, &s); err != nil { | ||
| return err | ||
| } | ||
| decoded, err := base64.StdEncoding.DecodeString(s) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| *b = decoded | ||
| return nil | ||
| case '[': | ||
| var ints []int | ||
| if err := json.Unmarshal(data, &ints); err != nil { | ||
| return err | ||
| } | ||
| out := make([]byte, len(ints)) | ||
| for i, v := range ints { | ||
| if v < 0 || v > 255 { | ||
| return fmt.Errorf("byte value out of range: %d", v) | ||
| } | ||
| out[i] = byte(v) | ||
| } | ||
| *b = out | ||
| return nil | ||
| default: | ||
| return fmt.Errorf("unsupported JSON type for bytes: %s", string(data)) | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
The logic for unmarshaling a JSON array of numbers can be simplified. Instead of unmarshaling into a slice of
ints and then converting to[]bytewith manual range checks, you can unmarshal directly into a[]byte(which is an alias for[]uint8). Thejsonpackage handles the conversion and range checking for you, making the code more concise and efficient.