Skip to content
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

Jump to bottom

4.x: JSON unicode detection without UTF-32 workaround #8253

Merged
merged 2 commits into from
Jan 18, 2024
Merged

4.x: JSON unicode detection without UTF-32 workaround #8253

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9344117
#8195 JSON unicode detection workaround for eclipse-ee4j/parsson/issu…
danielkec Jan 17, 2024
6e56724
Checkstyle
danielkec Jan 17, 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
30 changes: 28 additions & 2 deletions security/jwt/src/main/java/io/helidon/security/jwt/jwk/JwkKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2023 Oracle and/or its affiliates.
* Copyright (c) 2018, 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -19,6 +19,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.lang.System.Logger.Level;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
Expand All @@ -27,6 +30,7 @@
import java.util.Objects;
import java.util.Optional;

import io.helidon.common.NativeImageHelper;
import io.helidon.common.configurable.Resource;

import jakarta.json.Json;
Expand Down Expand Up @@ -55,6 +59,26 @@ public final class JwkKeys {
private final Map<String, Jwk> keyMap = new HashMap<>();
private final List<Jwk> noKeyIdKeys = new LinkedList<>();

private static final boolean AUTOMATIC_CHARSET_DETECTION;

// Workaround for https://github.com/eclipse-ee4j/parsson/issues/121
static {
boolean utf32Available = false;
try {
Charset.forName("UTF-32LE");
Charset.forName("UTF-32BE");
utf32Available = true;
} catch (UnsupportedCharsetException e) {
if (NativeImageHelper.isNativeImage()) {
LOGGER.log(Level.TRACE, "Automatic JSON unicode detection not available."
+ " Add -H:+AddAllCharsets to build your native image with UTF-32 support.", e);
} else {
LOGGER.log(Level.TRACE, "Automatic JSON unicode detection not available.", e);
}
}
AUTOMATIC_CHARSET_DETECTION = utf32Available;
}

private JwkKeys(Builder builder) {
this.keyMap.putAll(builder.keyMap);
this.noKeyIdKeys.addAll(builder.noKeyIdKeys);
Expand Down Expand Up @@ -147,7 +171,9 @@ public Builder addKey(Jwk key) {
public Builder resource(Resource resource) {
Objects.requireNonNull(resource, "Json resource must not be null");
try (InputStream is = resource.stream()) {
JsonObject jsonObject = JSON.createReader(is).readObject();
JsonObject jsonObject = AUTOMATIC_CHARSET_DETECTION
? JSON.createReader(is).readObject()
: JSON.createReader(is, StandardCharsets.UTF_8).readObject();
addKeys(jsonObject);
} catch (IOException e) {
LOGGER.log(Level.WARNING, "Failed to close input stream on resource: " + resource);
Expand Down