-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement 3rd party block creation (#104) (#4)
This implements 3rd party block generation and appending to existing tokens. It also fixes existing issues with public key interning which made deserialization of tokens with 3rd party blocks incorrect in some cases. Co-authored-by: Geoffroy Couprie <[email protected]>
- Loading branch information
Showing
16 changed files
with
645 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
src/main/java/org/biscuitsec/biscuit/token/ThirdPartyBlockContents.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| package org.biscuitsec.biscuit.token; | ||
|
|
||
| import biscuit.format.schema.Schema; | ||
| import com.google.protobuf.ByteString; | ||
| import com.google.protobuf.InvalidProtocolBufferException; | ||
| import org.biscuitsec.biscuit.crypto.PublicKey; | ||
| import org.biscuitsec.biscuit.error.Error; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
|
|
||
| public class ThirdPartyBlockContents { | ||
| byte[] payload; | ||
| byte[] signature; | ||
| PublicKey publicKey; | ||
|
|
||
| ThirdPartyBlockContents(byte[] payload, byte[] signature, PublicKey publicKey) { | ||
| this.payload = payload; | ||
| this.signature = signature; | ||
| this.publicKey = publicKey; | ||
| } | ||
|
|
||
| public Schema.ThirdPartyBlockContents serialize() throws Error.FormatError.SerializationError { | ||
| Schema.ThirdPartyBlockContents.Builder b = Schema.ThirdPartyBlockContents.newBuilder(); | ||
| b.setPayload(ByteString.copyFrom(this.payload)); | ||
| b.setExternalSignature(b.getExternalSignatureBuilder() | ||
| .setSignature(ByteString.copyFrom(this.signature)) | ||
| .setPublicKey(this.publicKey.serialize()) | ||
| .build()); | ||
|
|
||
| return b.build(); | ||
| } | ||
|
|
||
| static public ThirdPartyBlockContents deserialize(Schema.ThirdPartyBlockContents b) throws Error.FormatError.DeserializationError { | ||
| byte[] payload = b.getPayload().toByteArray(); | ||
| byte[] signature = b.getExternalSignature().getSignature().toByteArray(); | ||
| PublicKey publicKey = PublicKey.deserialize(b.getExternalSignature().getPublicKey()); | ||
|
|
||
| return new ThirdPartyBlockContents(payload, signature, publicKey); | ||
| } | ||
|
|
||
| static public ThirdPartyBlockContents fromBytes(byte[] slice) throws InvalidProtocolBufferException, Error.FormatError.DeserializationError { | ||
| return ThirdPartyBlockContents.deserialize(Schema.ThirdPartyBlockContents.parseFrom(slice)); | ||
| } | ||
|
|
||
| public byte[] toBytes() throws IOException, Error.FormatError.SerializationError { | ||
| Schema.ThirdPartyBlockContents b = this.serialize(); | ||
| ByteArrayOutputStream stream = new ByteArrayOutputStream(); | ||
| b.writeTo(stream); | ||
| return stream.toByteArray(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
|
|
||
| ThirdPartyBlockContents that = (ThirdPartyBlockContents) o; | ||
|
|
||
| if (!Arrays.equals(payload, that.payload)) return false; | ||
| if (!Arrays.equals(signature, that.signature)) return false; | ||
| return Objects.equals(publicKey, that.publicKey); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| int result = Arrays.hashCode(payload); | ||
| result = 31 * result + Arrays.hashCode(signature); | ||
| result = 31 * result + (publicKey != null ? publicKey.hashCode() : 0); | ||
| return result; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "ThirdPartyBlockContents{" + | ||
| "payload=" + Arrays.toString(payload) + | ||
| ", signature=" + Arrays.toString(signature) + | ||
| ", publicKey=" + publicKey + | ||
| '}'; | ||
| } | ||
| } |
Oops, something went wrong.