Add test for unicode

getodk · Dec 12, 2023 · 92d923c · 92d923c
1 parent 26a2cb3
commit 92d923c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/org/javarosa/core/util/Ed25519.java b/src/main/java/org/javarosa/core/util/Ed25519.java
@@ -5,6 +5,8 @@
 import org.bouncycastle.crypto.signers.Ed25519Signer;
 import org.jetbrains.annotations.Nullable;
 
+import java.nio.charset.StandardCharsets;
+
 public class Ed25519 {
 
  private static final int SIGNATURE_LENGTH = 64;
@@ -23,7 +25,7 @@ public static String extractSigned(byte[] contents, byte[] publicKey) {
  System.arraycopy(contents, SIGNATURE_LENGTH, message, 0, messageLength);
 
  if (verify(publicKey, signature, message)) {
- return new String(message);
+ return new String(message, StandardCharsets.UTF_8);
  } else {
  return null;
  }

diff --git a/src/test/java/org/javarosa/xpath/expr/ExtractSignedTest.java b/src/test/java/org/javarosa/xpath/expr/ExtractSignedTest.java
@@ -137,6 +137,19 @@ public void whenPublicKeyIsInvalid_returnsEmptyString() throws Exception {
  assertThat(scenario.answerOf("/data/extracted"), is(nullValue()));
  }
 
+ @Test
+ public void whenNonSignaturePartIncludesUnicode_successfullyDecodes() throws Exception{
+ String message = "🎃";
+ AsymmetricCipherKeyPair keyPair = createKeyPair();
+
+ byte[] signedMessage = signMessage(message, keyPair.getPrivate());
+ String encodedPublicKey = Encoding.BASE64.encode(((Ed25519PublicKeyParameters) keyPair.getPublic()).getEncoded());
+ String encodedContents = Encoding.BASE64.encode(signedMessage);
+
+ Scenario scenario = createScenario(encodedContents, encodedPublicKey);
+ assertThat(scenario.answerOf("/data/extracted"), is(stringAnswer(message)));
+ }
+
  private static AsymmetricCipherKeyPair createKeyPair() {
  Ed25519KeyPairGenerator ed25519KeyPairGenerator = new Ed25519KeyPairGenerator();
  ed25519KeyPairGenerator.init(new Ed25519KeyGenerationParameters(new SecureRandom()));