Skip to content

fix: Align identifier bytes correctly in ResourceLocator #148

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 10 commits into from
Sep 13, 2024
Merged

fix: Align identifier bytes correctly in ResourceLocator #148

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
47ddf47
Align identifier bytes correctly in ResourceLocator
pflynn-virtru Aug 27, 2024
c019117
Trim whitespace from ResourceLocator identifier
pflynn-virtru Aug 27, 2024
f4005ce
Merge branch 'main' into fix/kid-pad
pflynn-virtru Sep 10, 2024
d841930
Fix array copy logic in ResourceLocator identifier
pflynn-virtru Sep 10, 2024
9e631f5
Fix identifier nibble masking in ResourceLocator
pflynn-virtru Sep 10, 2024
a4add25
Simplify identifierNibble calculation
pflynn-virtru Sep 10, 2024
e9a3423
Fix identifierNibble calculation and improve protocol writing
pflynn-virtru Sep 10, 2024
be8bfa6
Enhance ResourceLocatorTest with golden bytearray validation
pflynn-virtru Sep 11, 2024
5220a60
Merge branch 'main' into fix/kid-pad
pflynn-virtru Sep 11, 2024
4f7892a
Fix incorrect bitmask for THIRTY_TWO_BYTES case in ResourceLocator
pflynn-virtru Sep 11, 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
9 changes: 5 additions & 4 deletions sdk/src/main/java/io/opentdf/platform/sdk/nanotdf/ResourceLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ public ResourceLocator(final String resourceUrl, final String identifier) {
} else if (identifierLen <= 2) {
this.identifierType = NanoTDFType.IdentifierType.TWO_BYTES;
this.identifier = new byte[NanoTDFType.IdentifierType.TWO_BYTES.getLength()];
System.arraycopy(identifier.getBytes(), 0, this.identifier, 0, identifierLen);
System.arraycopy(identifier.getBytes(), 0, this.identifier, this.identifier.length - identifierLen, identifierLen);
} else if (identifierLen <= 8) {
this.identifierType = NanoTDFType.IdentifierType.EIGHT_BYTES;
this.identifier = new byte[NanoTDFType.IdentifierType.EIGHT_BYTES.getLength()];
System.arraycopy(identifier.getBytes(), 0, this.identifier, 0, identifierLen);
System.arraycopy(identifier.getBytes(), 0, this.identifier, this.identifier.length - identifierLen, identifierLen);
} else if (identifierLen <= 32) {
this.identifierType = NanoTDFType.IdentifierType.THIRTY_TWO_BYTES;
this.identifier = new byte[NanoTDFType.IdentifierType.THIRTY_TWO_BYTES.getLength()];
System.arraycopy(identifier.getBytes(), 0, this.identifier, 0, identifierLen);
System.arraycopy(identifier.getBytes(), 0, this.identifier, this.identifier.length - identifierLen, identifierLen);
} else {
throw new IllegalArgumentException("Unsupported identifier length: " + identifierLen);
}
Expand Down Expand Up @@ -220,6 +220,7 @@ public String getIdentifierString() {
actualLength = i + 1;
}
}
return new String(this.identifier, 0, actualLength);
String identifierPadded = new String(this.identifier, 0, actualLength);
return identifierPadded.trim();
}
}
Loading