-
Notifications
You must be signed in to change notification settings - Fork 10
Add AuthzClientCryptoProvider for authorization client cryptographic operations #3
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.
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
Open
everettbu
wants to merge
1
commit into
feature-authz-crypto-baseline
Choose a base branch
from
feature-authz-crypto-implementation
base: feature-authz-crypto-baseline
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
203 changes: 203 additions & 0 deletions
203
authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/ASN1Decoder.java
This file contains hidden or 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,203 @@ | ||
| /* | ||
| * Copyright 2024 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package org.keycloak.authorization.client.util.crypto; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
| import java.io.EOFException; | ||
| import java.io.IOException; | ||
| import java.math.BigInteger; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * | ||
| * @author rmartinc | ||
| */ | ||
| class ASN1Decoder { | ||
|
|
||
| private final ByteArrayInputStream is; | ||
| private final int limit; | ||
| private int count; | ||
|
|
||
| ASN1Decoder(byte[] bytes) { | ||
| is = new ByteArrayInputStream(bytes); | ||
| count = 0; | ||
| limit = bytes.length; | ||
| } | ||
|
|
||
| public static ASN1Decoder create(byte[] bytes) { | ||
| return new ASN1Decoder(bytes); | ||
| } | ||
|
|
||
| public List<byte[]> readSequence() throws IOException { | ||
| int tag = readTag(); | ||
| int tagNo = readTagNumber(tag); | ||
| if (tagNo != ASN1Encoder.SEQUENCE) { | ||
| throw new IOException("Invalid Sequence tag " + tagNo); | ||
| } | ||
| int length = readLength(); | ||
| List<byte[]> result = new ArrayList<>(); | ||
| while (length > 0) { | ||
| byte[] bytes = readNext(); | ||
| result.add(bytes); | ||
| length = length - bytes.length; | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| public BigInteger readInteger() throws IOException { | ||
| int tag = readTag(); | ||
| int tagNo = readTagNumber(tag); | ||
| if (tagNo != ASN1Encoder.INTEGER) { | ||
| throw new IOException("Invalid Integer tag " + tagNo); | ||
| } | ||
| int length = readLength(); | ||
| byte[] bytes = read(length); | ||
| return new BigInteger(bytes); | ||
| } | ||
|
|
||
| byte[] readNext() throws IOException { | ||
| mark(); | ||
| int tag = readTag(); | ||
| readTagNumber(tag); | ||
| int length = readLength(); | ||
| length += reset(); | ||
| return read(length); | ||
| } | ||
|
|
||
| int readTag() throws IOException { | ||
| int tag = read(); | ||
| if (tag < 0) { | ||
| throw new EOFException("EOF found inside tag value."); | ||
| } | ||
| return tag; | ||
| } | ||
|
|
||
| int readTagNumber(int tag) throws IOException { | ||
| int tagNo = tag & 0x1f; | ||
|
|
||
| // | ||
| // with tagged object tag number is bottom 5 bits, or stored at the start of the content | ||
| // | ||
| if (tagNo == 0x1f) { | ||
| tagNo = 0; | ||
|
|
||
| int b = read(); | ||
|
|
||
| // X.690-0207 8.1.2.4.2 | ||
| // "c) bits 7 to 1 of the first subsequent octet shall not all be zero." | ||
| if ((b & 0x7f) == 0) // Note: -1 will pass | ||
| { | ||
| throw new IOException("corrupted stream - invalid high tag number found"); | ||
| } | ||
|
|
||
| while ((b >= 0) && ((b & 0x80) != 0)) { | ||
| tagNo |= (b & 0x7f); | ||
| tagNo <<= 7; | ||
| b = read(); | ||
| } | ||
|
|
||
| if (b < 0) { | ||
| throw new EOFException("EOF found inside tag value."); | ||
| } | ||
|
|
||
| tagNo |= (b & 0x7f); | ||
| } | ||
|
|
||
| return tagNo; | ||
| } | ||
|
|
||
| int readLength() throws IOException { | ||
| int length = read(); | ||
| if (length < 0) { | ||
| throw new EOFException("EOF found when length expected"); | ||
| } | ||
|
|
||
| if (length == 0x80) { | ||
| return -1; // indefinite-length encoding | ||
| } | ||
|
|
||
| if (length > 127) { | ||
| int size = length & 0x7f; | ||
|
|
||
| // Note: The invalid long form "0xff" (see X.690 8.1.3.5c) will be caught here | ||
| if (size > 4) { | ||
| throw new IOException("DER length more than 4 bytes: " + size); | ||
| } | ||
|
|
||
| length = 0; | ||
| for (int i = 0; i < size; i++) { | ||
| int next = read(); | ||
|
|
||
| if (next < 0) { | ||
| throw new EOFException("EOF found reading length"); | ||
| } | ||
|
|
||
| length = (length << 8) + next; | ||
| } | ||
|
|
||
| if (length < 0) { | ||
| throw new IOException("corrupted stream - negative length found"); | ||
| } | ||
|
|
||
| if (length >= limit) // after all we must have read at least 1 byte | ||
| { | ||
| throw new IOException("corrupted stream - out of bounds length found"); | ||
| } | ||
| } | ||
|
|
||
| return length; | ||
| } | ||
|
|
||
| byte[] read(int length) throws IOException { | ||
| byte[] bytes = new byte[length]; | ||
| int totalBytesRead = 0; | ||
|
|
||
| while (totalBytesRead < length) { | ||
| int bytesRead = is.read(bytes, totalBytesRead, length - totalBytesRead); | ||
| if (bytesRead == -1) { | ||
| throw new IOException(String.format("EOF found reading %d bytes", length)); | ||
| } | ||
| totalBytesRead += bytesRead; | ||
| } | ||
| count += length; | ||
| return bytes; | ||
| } | ||
|
|
||
| void mark() { | ||
| count = 0; | ||
| is.mark(is.available()); | ||
| } | ||
|
|
||
| int reset() { | ||
| int tmp = count; | ||
| is.reset(); | ||
| return tmp; | ||
| } | ||
|
|
||
| int read() { | ||
| int tmp = is.read(); | ||
| if (tmp >= 0) { | ||
| count++; | ||
| } | ||
| return tmp; | ||
| } | ||
| } | ||
|
|
||
101 changes: 101 additions & 0 deletions
101
authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/ASN1Encoder.java
This file contains hidden or 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,101 @@ | ||
| /* | ||
| * Copyright 2024 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package org.keycloak.authorization.client.util.crypto; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.math.BigInteger; | ||
|
|
||
| /** | ||
| * | ||
| * @author rmartinc | ||
| */ | ||
| class ASN1Encoder { | ||
|
|
||
| static final int INTEGER = 0x02; | ||
| static final int SEQUENCE = 0x10; | ||
| static final int CONSTRUCTED = 0x20; | ||
|
|
||
| private final ByteArrayOutputStream os; | ||
|
|
||
| private ASN1Encoder() { | ||
| this.os = new ByteArrayOutputStream(); | ||
| } | ||
|
|
||
| static public ASN1Encoder create() { | ||
| return new ASN1Encoder(); | ||
| } | ||
|
|
||
| public ASN1Encoder write(BigInteger value) throws IOException { | ||
| writeEncoded(INTEGER, value.toByteArray()); | ||
| return this; | ||
| } | ||
|
|
||
| public ASN1Encoder writeDerSeq(ASN1Encoder... objects) throws IOException { | ||
| writeEncoded(CONSTRUCTED | SEQUENCE, concatenate(objects)); | ||
| return this; | ||
| } | ||
|
|
||
| public byte[] toByteArray() { | ||
| return os.toByteArray(); | ||
| } | ||
|
|
||
| void writeEncoded(int tag, byte[] bytes) throws IOException { | ||
| write(tag); | ||
| writeLength(bytes.length); | ||
| write(bytes); | ||
| } | ||
|
|
||
| void writeLength(int length) throws IOException { | ||
| if (length > 127) { | ||
| int size = 1; | ||
| int val = length; | ||
|
|
||
| while ((val >>>= 8) != 0) { | ||
| size++; | ||
| } | ||
|
|
||
| write((byte) (size | 0x80)); | ||
|
|
||
| for (int i = (size - 1) * 8; i >= 0; i -= 8) { | ||
| write((byte) (length >> i)); | ||
| } | ||
| } else { | ||
| write((byte) length); | ||
| } | ||
| } | ||
|
|
||
| void write(byte[] bytes) throws IOException { | ||
| os.write(bytes); | ||
| } | ||
|
|
||
| void write(int b) throws IOException { | ||
| os.write(b); | ||
| } | ||
|
|
||
| byte[] concatenate(ASN1Encoder... objects) throws IOException { | ||
| ByteArrayOutputStream tmp = new ByteArrayOutputStream(); | ||
| for (ASN1Encoder object : objects) { | ||
| tmp.write(object.toByteArray()); | ||
| } | ||
| return tmp.toByteArray(); | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
logic: bit shifting could cause integer overflow for large length values, consider using Math.addExact() or similar overflow checking