Skip to content

fix(sdk): group splits with empty/missing split IDs together #217

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

fix(sdk): group splits with empty/missing split IDs together #217

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b050b1
see if this works
mkleene Jan 14, 2025
4029a7b
try using `null`
mkleene Jan 15, 2025
19fabff
Update TDF.java
mkleene Jan 17, 2025
578a7be
Merge branch 'main' into use-implicit-empty-split
mkleene Jan 17, 2025
c7ed4ae
don't include this
mkleene Jan 17, 2025
f953303
Update TDF.java
mkleene Jan 17, 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
30 changes: 12 additions & 18 deletions sdk/src/main/java/io/opentdf/platform/sdk/TDF.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
*/
public class TDF {

private static final String EMPTY_SPLIT_ID = "";
private static final String TDF_VERSION = "4.3.0";
private static final String KEY_ACCESS_SECHMA_VERSION = "4.3.0";
private final long maximumSize;
Expand Down Expand Up @@ -607,29 +608,22 @@ public Reader loadTDF(SeekableByteChannel tdf, SDK.KAS kas,
Set<String> foundSplits = new HashSet<>();

Map<Autoconfigure.KeySplitStep, Exception> skippedSplits = new HashMap<>();
boolean mixedSplits = manifest.encryptionInformation.keyAccessObj.size() > 1 &&
(manifest.encryptionInformation.keyAccessObj.get(0).sid != null) &&
!manifest.encryptionInformation.keyAccessObj.get(0).sid.isEmpty();

MessageDigest digest = MessageDigest.getInstance("SHA-256");

if (manifest.payload.isEncrypted) {
for (Manifest.KeyAccess keyAccess : manifest.encryptionInformation.keyAccessObj) {
Autoconfigure.KeySplitStep ss = new Autoconfigure.KeySplitStep(keyAccess.url, keyAccess.sid);
String splitId = keyAccess.sid == null || keyAccess.sid.isEmpty() ? EMPTY_SPLIT_ID : keyAccess.sid;
Autoconfigure.KeySplitStep ss = new Autoconfigure.KeySplitStep(keyAccess.url, splitId);
byte[] unwrappedKey;
if (!mixedSplits) {
if (foundSplits.contains(ss.splitID)) {
continue;
}
knownSplits.add(ss.splitID);
try {
unwrappedKey = kas.unwrap(keyAccess, manifest.encryptionInformation.policy);
} else {
if (foundSplits.contains(ss.splitID)) {
continue;
}
knownSplits.add(ss.splitID);
try {
unwrappedKey = kas.unwrap(keyAccess, manifest.encryptionInformation.policy);
} catch (Exception e) {
skippedSplits.put(ss, e);
continue;
}
} catch (Exception e) {
skippedSplits.put(ss, e);
continue;
}

for (int index = 0; index < unwrappedKey.length; index++) {
Expand All @@ -656,7 +650,7 @@ public Reader loadTDF(SeekableByteChannel tdf, SDK.KAS kas,
}
}

if (mixedSplits && knownSplits.size() > foundSplits.size()) {
if (knownSplits.size() > foundSplits.size()) {
List<Exception> exceptionList = new ArrayList<>(skippedSplits.size() + 1);
exceptionList.add(new Exception("splitKey.unable to reconstruct split key: " + skippedSplits));

Expand Down
Loading