Skip to content

fix(sdk): everything is mixedSplits now #1861

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
merged 7 commits into from
Jan 17, 2025
Merged

fix(sdk): everything is mixedSplits now #1861

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ac3c1a3
everything is `mixedSplits` now
mkleene Jan 15, 2025
a55595c
maybe
mkleene Jan 16, 2025
61e5e25
try this
mkleene Jan 16, 2025
31dc2a1
these conditions shouldn't be negated
mkleene Jan 16, 2025
53a4de7
these should be exclusive
mkleene Jan 16, 2025
8c215d3
syntax
mkleene Jan 16, 2025
ca52a99
error handling
mkleene Jan 16, 2025
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
45 changes: 15 additions & 30 deletions sdk/tdf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,6 @@ func (r *Reader) doPayloadKeyUnwrap(ctx context.Context) error { //nolint:gocogn
knownSplits := make(map[string]bool)
foundSplits := make(map[string]bool)
skippedSplits := make(map[keySplitStep]error)
mixedSplits := len(r.manifest.KeyAccessObjs) > 1 && r.manifest.KeyAccessObjs[0].SplitID != ""

for _, keyAccessObj := range r.manifest.EncryptionInformation.KeyAccessObjs {
client := newKASClient(r.dialOptions, r.tokenSource, &r.kasSessionKey)
Expand All @@ -800,36 +799,22 @@ func (r *Reader) doPayloadKeyUnwrap(ctx context.Context) error { //nolint:gocogn

var err error
var wrappedKey []byte
if !mixedSplits { //nolint:nestif // todo: subfunction
wrappedKey, err = client.unwrap(ctx, keyAccessObj, r.manifest.EncryptionInformation.Policy)
if err != nil {
errToReturn := fmt.Errorf("doPayloadKeyUnwrap splitKey.rewrap failed: %w", err)
if strings.Contains(err.Error(), codes.InvalidArgument.String()) {
return fmt.Errorf("%w: %w", ErrRewrapBadRequest, errToReturn)
}
if strings.Contains(err.Error(), codes.PermissionDenied.String()) {
return fmt.Errorf("%w: %w", errRewrapForbidden, errToReturn)
}
return errToReturn
}
} else {
knownSplits[ss.SplitID] = true
if foundSplits[ss.SplitID] {
// already found
continue
knownSplits[ss.SplitID] = true
if foundSplits[ss.SplitID] {
// already found
continue
}
wrappedKey, err = client.unwrap(ctx, keyAccessObj, r.manifest.EncryptionInformation.Policy)
if err != nil {
errToReturn := fmt.Errorf("kao unwrap failed for split %v: %w", ss, err)
if strings.Contains(err.Error(), codes.InvalidArgument.String()) {
errToReturn = fmt.Errorf("%w: %w", ErrRewrapBadRequest, errToReturn)
}
wrappedKey, err = client.unwrap(ctx, keyAccessObj, r.manifest.EncryptionInformation.Policy)
if err != nil {
errToReturn := fmt.Errorf("kao unwrap failed for split %v: %w", ss, err)
if !strings.Contains(err.Error(), codes.InvalidArgument.String()) {
skippedSplits[ss] = fmt.Errorf("%w: %w", ErrRewrapBadRequest, errToReturn)
}
if !strings.Contains(err.Error(), codes.PermissionDenied.String()) {
skippedSplits[ss] = fmt.Errorf("%w: %w", errRewrapForbidden, errToReturn)
}
skippedSplits[ss] = errToReturn
continue
if strings.Contains(err.Error(), codes.PermissionDenied.String()) {
errToReturn = fmt.Errorf("%w: %w", errRewrapForbidden, errToReturn)
}
skippedSplits[ss] = errToReturn
continue
}

for keyByteIndex, keyByte := range wrappedKey {
Expand Down Expand Up @@ -865,7 +850,7 @@ func (r *Reader) doPayloadKeyUnwrap(ctx context.Context) error { //nolint:gocogn
}
}

if mixedSplits && len(knownSplits) > len(foundSplits) {
if len(knownSplits) > len(foundSplits) {
v := make([]error, 1, len(skippedSplits))
v[0] = fmt.Errorf("splitKey.unable to reconstruct split key: %v", skippedSplits)
for _, e := range skippedSplits {
Expand Down
Loading