Skip to content

Validate hexadecimal byte input #1273

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

Open
cragkhit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Validate hexadecimal byte input #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion jraft-core/src/main/java/com/alipay/sofa/jraft/util/BytesUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,17 @@ public static byte[] hexStringToByteArray(final String s) {
return null;
}
final int len = s.length();
if ((len & 1) != 0) {
throw new IllegalArgumentException("Hex string must contain an even number of characters");

@fengjiachun fengjiachun Aug 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: the project convention for argument checks is Requires.requireTrue(cond, msg) from com.alipay.sofa.jraft.util.Requires (this class already uses Requires.requireNonNull in nextBytes). So this could be:

Requires.requireTrue((len & 1) == 0, "Hex string must contain an even number of characters");

}
final byte[] bytes = new byte[len / 2];
for (int i = 0; i < len; i += 2) {
bytes[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character.digit(s.charAt(i + 1), 16));
final int high = Character.digit(s.charAt(i), 16);
final int low = Character.digit(s.charAt(i + 1), 16);
if (high < 0 || low < 0) {
throw new IllegalArgumentException("Hex string contains a non-hexadecimal character");

@fengjiachun fengjiachun Aug 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here — Requires.requireTrue(high >= 0 && low >= 0, ...). Also consider including the offending position in the message, e.g. "Hex string contains a non-hexadecimal character at index " + i. Index only, please — better not to echo the character or the input string itself, since this util may handle key material and the message could end up in logs.

}
bytes[i / 2] = (byte) ((high << 4) + low);
}
return bytes;
}
Expand Down
5 changes: 4 additions & 1 deletion jraft-core/src/test/java/com/alipay/sofa/jraft/util/BytesUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;

public class BytesUtilTest {

Expand Down Expand Up @@ -97,7 +98,9 @@ public void testToHex() {
public void testHexStringToByteArray() {
Assert.assertNull(BytesUtil.hexStringToByteArray(null));

Assert.assertArrayEquals(new byte[] { -17, -5 }, BytesUtil.hexStringToByteArray("foob"));
Assert.assertArrayEquals(new byte[] { -17, -5 }, BytesUtil.hexStringToByteArray("effb"));
assertThrows(IllegalArgumentException.class, () -> BytesUtil.hexStringToByteArray("abc"));
assertThrows(IllegalArgumentException.class, () -> BytesUtil.hexStringToByteArray("foob"));
}

@Test
Expand Down
Loading