Skip to content

feat(tdf): sdk interface changes #123

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.

Sign up for GitHub

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
sujankota merged 5 commits into from
Feb 6, 2024
Merged

feat(tdf): sdk interface changes #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbfd287
feat(tdf): sdk interface changes
sujankota Feb 4, 2024
1a72b4f
minor cleanup
sujankota Feb 5, 2024
984354f
Merge branch 'main' into feature/sdk-tdf-interface
sujankota Feb 5, 2024
b81f220
Benchmark test and WriteTo interface
sujankota Feb 6, 2024
001f739
revert go.work.sum
sujankota Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions internal/archive/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,13 @@ func readBytes(readerSeeker io.ReadSeeker, index, size int64) ([]byte, error) {
}

buf := make([]byte, size)
_, err = readerSeeker.Read(buf)
n, err := readerSeeker.Read(buf)
if errors.Is(err, io.EOF) {
return buf[:n], io.EOF
}

if err != nil {
return nil, fmt.Errorf("readerSeeker.Read failed: %w", err)
return buf[:n], fmt.Errorf("readerSeeker.Read failed: %w", err)
}

return buf, nil
Expand Down
6 changes: 1 addition & 5 deletions internal/archive/tdf3_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@ func (tdfReader TDFReader) Manifest() (string, error) {

// ReadPayload Return the payload of given length from index.
func (tdfReader TDFReader) ReadPayload(index, length int64) ([]byte, error) {
Copy link
Member

@dmihalcik-virtru dmihalcik-virtru Feb 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest having this be ReadAt as well for consistency

buf, err := tdfReader.archiveReader.ReadFileData(TDFPayloadFileName, index, length)
if err != nil {
return nil, err
}
return buf, nil
return tdfReader.archiveReader.ReadFileData(TDFPayloadFileName, index, length)
}

// PayloadSize Return the size of the payload.
Expand Down
4 changes: 2 additions & 2 deletions sdk/auth_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ func NewAuthConfig() (*AuthConfig, error) {
return nil, fmt.Errorf("crypto.PublicKeyInPemFormat failed: %w", err)
}

privateKey, err := rsaKeyPair.PublicKeyInPemFormat()
privateKey, err := rsaKeyPair.PrivateKeyInPemFormat()
if err != nil {
return nil, fmt.Errorf("crypto.PublicKeyInPemFormat failed: %w", err)
return nil, fmt.Errorf("crypto.PrivateKeyInPemFormat failed: %w", err)
}

return &AuthConfig{signingPublicKey: publicKey, signingPrivateKey: privateKey}, nil
Expand Down
2 changes: 1 addition & 1 deletion sdk/split_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const (
kClientPublicKey = "clientPublicKey"
kSignedRequestToken = "signedRequestToken"
kKasURL = "url"
kRewrapV2 = "/v2/upsert"
kRewrapV2 = "/v2/rewrap"
kAuthorizationKey = "Authorization"
kContentTypeKey = "Content-Type"
kAcceptKey = "Accept"
Expand Down
Loading