Skip to content

fix: add a default assertion id if one is not specified #341

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
mkleene merged 3 commits into from
Feb 24, 2026
Merged

fix: add a default assertion id if one is not specified #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a10868
fix: add a default id if one is not specified
mkleene Feb 23, 2026
f15f352
Fix formatting of assertionsWithoutIds variable declaration
mkleene Feb 23, 2026
3d980dc
Refactor assertion size check to use hasSize method
mkleene Feb 23, 2026
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
2 changes: 1 addition & 1 deletion 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 @@ -462,7 +462,7 @@ TDFObject createTDF(InputStream payload, OutputStream outputStream, Config.TDFCo

for (var assertionConfig : tdfConfig.assertionConfigList) {
var assertion = new Manifest.Assertion();
assertion.id = assertionConfig.id;
assertion.id = assertionConfig.id != null && !assertionConfig.id.isEmpty() ? assertionConfig.id : UUID.randomUUID().toString();
assertion.type = assertionConfig.type.toString();
assertion.scope = assertionConfig.scope.toString();
assertion.statement = assertionConfig.statement;
Expand Down
70 changes: 69 additions & 1 deletion sdk/src/test/java/io/opentdf/platform/sdk/TDFTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,6 +994,74 @@ public void cancel() {
.isEqualTo(plainText);
}

@Test
void testAssertionWithoutIdGeneratesUUID() throws Exception {
// Create an assertion WITHOUT specifying an ID
var assertionConfigNoId = new AssertionConfig();
assertionConfigNoId.id = null; // No ID specified
assertionConfigNoId.type = AssertionConfig.Type.BaseAssertion;
assertionConfigNoId.scope = AssertionConfig.Scope.TrustedDataObj;
assertionConfigNoId.appliesToState = AssertionConfig.AppliesToState.Unencrypted;
assertionConfigNoId.statement = new AssertionConfig.Statement();
assertionConfigNoId.statement.format = "json";
assertionConfigNoId.statement.schema = "test-schema";
assertionConfigNoId.statement.value = "{\"test\":\"value\"}";

var assertionConfigEmptyId = new AssertionConfig();
assertionConfigEmptyId.id = ""; // empty id
assertionConfigEmptyId.type = AssertionConfig.Type.BaseAssertion;
assertionConfigEmptyId.scope = AssertionConfig.Scope.TrustedDataObj;
assertionConfigEmptyId.appliesToState = AssertionConfig.AppliesToState.Unencrypted;
assertionConfigEmptyId.statement = new AssertionConfig.Statement();
assertionConfigEmptyId.statement.format = "json";
assertionConfigEmptyId.statement.schema = "another-schema";
assertionConfigEmptyId.statement.value = "{\"test\":\"value\"}";

// Create an assertion WITH an explicit ID for comparison
var assertionConfigWithId = new AssertionConfig();
assertionConfigWithId.id = "explicit-id";
assertionConfigWithId.type = AssertionConfig.Type.HandlingAssertion;
assertionConfigWithId.scope = AssertionConfig.Scope.Payload;
assertionConfigWithId.appliesToState = AssertionConfig.AppliesToState.Encrypted;
assertionConfigWithId.statement = new AssertionConfig.Statement();
assertionConfigWithId.statement.format = "json";
assertionConfigWithId.statement.schema = "handling-schema";
assertionConfigWithId.statement.value = "{\"handling\":\"data\"}";

Config.TDFConfig tdfConfig = Config.newTDFConfig(
Config.withAutoconfigure(false),
Config.withKasInformation(getRSAKASInfos()),
Config.withAssertionConfig(assertionConfigNoId, assertionConfigEmptyId, assertionConfigWithId));

String plainText = "Test data for UUID assertion generation.";
InputStream plainTextInputStream = new ByteArrayInputStream(plainText.getBytes(StandardCharsets.UTF_8));
ByteArrayOutputStream tdfOutputStream = new ByteArrayOutputStream();

TDF tdf = new TDF(
new FakeServicesBuilder().setKas(kas)
.setKeyAccessServerRegistryService(kasRegistryService).build());
var createdManifest = tdf.createTDF(plainTextInputStream, tdfOutputStream, tdfConfig).getManifest();

// Verify both assertions exist and have the correct IDs
assertThat(createdManifest.assertions).isNotNull();
assertThat(createdManifest.assertions).hasSize(3);

var assertionsWithoutIds = createdManifest.assertions.subList(0, 2);
for (var assertionWithoutId: assertionsWithoutIds) {
// Verify the assertion without an ID now has a UUID
assertThat(assertionWithoutId).isNotNull();
assertThat(assertionWithoutId.id).isNotNull();
assertThat(assertionWithoutId.id).isNotEmpty();
// Verify it's a valid UUID format (basic check)
assertThat(assertionWithoutId.id).matches("[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}");
}

var assertionWithId = createdManifest.assertions.get(2);
// Verify the assertion with explicit ID kept its ID
assertThat(assertionWithId).isNotNull();
assertThat(assertionWithId.id).isEqualTo("explicit-id");
}

@Nonnull
private static Config.KASInfo[] getKASInfos(Predicate<Integer> filter) {
var kasInfos = new ArrayList<Config.KASInfo>();
Expand Down Expand Up @@ -1021,4 +1089,4 @@ private static Config.KASInfo[] getECKASInfos() {
private static boolean isHexChar(byte b) {
return (b >= 'a' && b <= 'f') || (b >= '0' && b <= '9');
}
}
}
Loading