diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17_0_10OrLater.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17_0_10OrLater.java new file mode 100644 index 0000000000000..b5f2b998cfc20 --- /dev/null +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17_0_10OrLater.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.svm.core.jdk; + +import org.graalvm.compiler.serviceprovider.GraalServices; +import org.graalvm.compiler.serviceprovider.JavaVersionUtil; + +import java.util.function.BooleanSupplier; + +public class JDK17_0_10OrLater implements BooleanSupplier { + + @Override + public boolean getAsBoolean() { + return JavaVersionUtil.JAVA_SPEC > 17 || + (JavaVersionUtil.JAVA_SPEC == 17 && GraalServices.getJavaUpdateVersion() >= 10); + } + +} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17_0_9OrEarlier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17_0_9OrEarlier.java new file mode 100644 index 0000000000000..74df4361f0b5b --- /dev/null +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17_0_9OrEarlier.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.svm.core.jdk; + +import org.graalvm.compiler.serviceprovider.GraalServices; +import org.graalvm.compiler.serviceprovider.JavaVersionUtil; + +import java.util.function.BooleanSupplier; + +public class JDK17_0_9OrEarlier implements BooleanSupplier { + + @Override + public boolean getAsBoolean() { + return JavaVersionUtil.JAVA_SPEC < 17 || + (JavaVersionUtil.JAVA_SPEC == 17 && GraalServices.getJavaUpdateVersion() <= 9); + } + +} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java index f4fead83b3e73..eccf113574c32 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ import static com.oracle.svm.core.snippets.KnownIntrinsics.readCallerStackPointer; +import java.lang.ref.ReferenceQueue; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.net.URL; @@ -45,6 +46,7 @@ import java.util.Map; import java.util.function.Predicate; +import org.graalvm.compiler.serviceprovider.GraalServices; import org.graalvm.compiler.serviceprovider.JavaVersionUtil; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; @@ -321,6 +323,9 @@ static boolean isTrustedCryptoProvider(Provider provider) { @SuppressWarnings({"unused"}) final class Target_javax_crypto_JceSecurity { + @Alias @TargetElement(onlyWith = JDK17_0_10OrLater.class)// + public static ReferenceQueue queue; + /* * Lazily recompute the RANDOM field at runtime. We cannot push the entire static initialization * of JceSecurity to run time because we want the JceSecurity.verificationResults initialized at @@ -393,8 +398,7 @@ public Object transform(Object receiver, Object originalValue) { } } -@TargetClass(className = "javax.crypto.JceSecurity", innerClass = "IdentityWrapper", onlyWith = JDK17OrLater.class) -@SuppressWarnings({"unused"}) +@TargetClass(className = "javax.crypto.JceSecurity", innerClass = "IdentityWrapper", onlyWith = {JDK17OrLater.class, JDK17_0_9OrEarlier.class}) final class Target_javax_crypto_JceSecurity_IdentityWrapper { @Alias // Provider obj; @@ -405,6 +409,14 @@ final class Target_javax_crypto_JceSecurity_IdentityWrapper { } } +@TargetClass(className = "javax.crypto.JceSecurity", innerClass = "WeakIdentityWrapper", onlyWith = JDK17_0_10OrLater.class) +final class Target_javax_crypto_JceSecurity_WeakIdentityWrapper { + @Alias // + Target_javax_crypto_JceSecurity_WeakIdentityWrapper(Provider obj, ReferenceQueue queue) { + // Do nothing this is just an alias + } +} + class JceSecurityAccessor { private static volatile SecureRandom RANDOM; @@ -436,7 +448,12 @@ static Object providerKey(Provider p) { if (JavaVersionUtil.JAVA_SPEC <= 11) { return p; } + /* Starting with JDK 17 the verification results map key is an identity wrapper object. */ + if (JavaVersionUtil.JAVA_SPEC == 17 && GraalServices.getJavaUpdateVersion() >= 10) { + return new Target_javax_crypto_JceSecurity_WeakIdentityWrapper(p, Target_javax_crypto_JceSecurity.queue); + } + return new Target_javax_crypto_JceSecurity_IdentityWrapper(p); } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java index d5c4e9ea3dba1..bda1f2ba5d477 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java @@ -31,6 +31,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; +import java.lang.ref.Reference; import java.lang.reflect.Executable; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -88,6 +89,7 @@ import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory; import org.graalvm.compiler.options.Option; +import org.graalvm.compiler.serviceprovider.GraalServices; import org.graalvm.compiler.serviceprovider.JavaVersionUtil; import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.hosted.RuntimeJNIAccess; @@ -885,9 +887,31 @@ private Function constructVerificationCacheCleaner(Class jceS }; } /* - * For JDK 17 and later, the verification cache is an IdentityWrapper -> Verification result - * ConcurrentHashMap. The IdentityWrapper contains the actual provider in the 'obj' field. + * For JDK 17.0.10 and later, the verification cache is a WeakIdentityWrapper -> + * Verification result ConcurrentHashMap. The WeakIdentityWrapper contains the actual + * provider in the 'obj' field. */ + if (JavaVersionUtil.JAVA_SPEC == 17 && GraalServices.getJavaUpdateVersion() >= 10) { + Method getReferent = ReflectionUtil.lookupMethod(Reference.class, "get"); + Predicate listRemovalPredicate = wrapper -> { + try { + return shouldRemoveProvider((Provider) getReferent.invoke(wrapper)); + } catch (IllegalAccessException | InvocationTargetException e) { + throw VMError.shouldNotReachHere(e); + } + }; + + return obj -> { + Map original = (Map) obj; + Map verificationResults = new ConcurrentHashMap<>(original); + + verificationResults.keySet().removeIf(listRemovalPredicate); + + return verificationResults; + }; + + } + Class identityWrapper = loader.findClassOrFail("javax.crypto.JceSecurity$IdentityWrapper"); Field providerField = ReflectionUtil.lookupField(identityWrapper, "obj");