You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2022/09/04 09:01:33 UTC
[groovy] branch GROOVY-10747 updated (ec40c09379 -> a42c0b7969)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY-10747
in repository https://gitbox.apache.org/repos/asf/groovy.git
discard ec40c09379 GROOVY-10747: Fix illegal access for object clone on JDK16+
new a42c0b7969 GROOVY-10747: Fix illegal access for object clone on JDK16+
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ec40c09379)
\
N -- N -- N refs/heads/GROOVY-10747 (a42c0b7969)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/{codehaus => apache}/groovy/runtime/ObjectUtil.java | 2 +-
src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename src/main/java/org/{codehaus => apache}/groovy/runtime/ObjectUtil.java (98%)
[groovy] 01/01: GROOVY-10747: Fix illegal access for object clone on JDK16+
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-10747
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit a42c0b79694e0705812aae77995d3ae0d432d530
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Sep 4 15:39:13 2022 +0800
GROOVY-10747: Fix illegal access for object clone on JDK16+
---
.../java/org/apache/groovy/runtime/ObjectUtil.java | 84 ++++++++++++++++++++++
.../org/codehaus/groovy/vmplugin/v8/Selector.java | 12 ++--
src/test/groovy/bugs/Groovy9103.groovy | 33 ++++++++-
3 files changed, 124 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/groovy/runtime/ObjectUtil.java b/src/main/java/org/apache/groovy/runtime/ObjectUtil.java
new file mode 100644
index 0000000000..f1009fd1fb
--- /dev/null
+++ b/src/main/java/org/apache/groovy/runtime/ObjectUtil.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.groovy.runtime;
+
+import org.codehaus.groovy.GroovyBugError;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Method;
+
+/**
+ * Util for cloning object with checks
+ * @since 4.0.5
+ */
+public class ObjectUtil {
+ /**
+ * Clone the specified object
+ *
+ * @param object the object to clone
+ * @return the cloned object
+ * @param <T> the object type
+ * @throws Throwable some exception or error
+ * @since 4.0.5
+ */
+ public static <T> T cloneObject(T object) throws Throwable {
+ if (null == object) return null;
+ if (!(object instanceof Cloneable)) throw new CloneNotSupportedException(object.getClass().getName());
+
+ final Method cloneMethod = object.getClass().getMethod("clone");
+ final MethodHandle cloneMethodHandle = LOOKUP.in(object.getClass()).unreflect(cloneMethod);
+
+ return (T) cloneMethodHandle.invokeWithArguments(object);
+ }
+
+ /**
+ * Returns the method handle of {@link ObjectUtil#cloneObject(Object)}
+ *
+ * @return the method handle
+ * @since 4.0.5
+ */
+ public static MethodHandle getCloneObjectMethodHandle() {
+ return MethodHandleHolder.CLONE_OBJECT_METHOD_HANDLE;
+ }
+
+ private static class MethodHandleHolder {
+ private static final MethodHandle CLONE_OBJECT_METHOD_HANDLE;
+ static {
+ final Class<ObjectUtil> objectUtilClass = ObjectUtil.class;
+ Method cloneObjectMethod;
+ try {
+ cloneObjectMethod = objectUtilClass.getDeclaredMethod("cloneObject", Object.class);
+ } catch (NoSuchMethodException e) {
+ throw new GroovyBugError("Failed to find `cloneObject` method in class `" + objectUtilClass.getName() + "`", e);
+ }
+
+ try {
+ CLONE_OBJECT_METHOD_HANDLE = LOOKUP.in(objectUtilClass).unreflect(cloneObjectMethod);
+ } catch (IllegalAccessException e) {
+ throw new GroovyBugError("Failed to create method handle for " + cloneObjectMethod);
+ }
+ }
+ private MethodHandleHolder() {}
+ }
+
+ private ObjectUtil() {}
+
+ private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+}
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java
index ed502974c7..ef34caf430 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java
@@ -32,6 +32,7 @@ import groovy.lang.MetaMethod;
import groovy.lang.MetaProperty;
import groovy.lang.MissingMethodException;
import groovy.transform.Internal;
+import org.apache.groovy.runtime.ObjectUtil;
import org.codehaus.groovy.GroovyBugError;
import org.codehaus.groovy.reflection.CachedField;
import org.codehaus.groovy.reflection.CachedMethod;
@@ -680,11 +681,14 @@ public abstract class Selector {
final Class<?> declaringClass = m.getDeclaringClass();
if (declaringClass == Class.class && parameterCount == 1 && methodName.equals("forName")) {
return MethodHandles.insertArguments(CLASS_FOR_NAME, 1, true, sender.getClassLoader());
- } else if (declaringClass == Object.class && parameterCount == 0 && methodName.equals("clone") && null != args && 1 == args.length && args[0].getClass().isArray()) {
- return ArrayUtil.getCloneArrayMethodHandle();
- } else {
- return LOOKUP.unreflect(m);
+ } else if (declaringClass == Object.class && parameterCount == 0 && methodName.equals("clone") && null != args && 1 == args.length) {
+ if (args[0].getClass().isArray()) {
+ return ArrayUtil.getCloneArrayMethodHandle();
+ }
+ return ObjectUtil.getCloneObjectMethodHandle();
}
+
+ return LOOKUP.unreflect(m);
}
/**
diff --git a/src/test/groovy/bugs/Groovy9103.groovy b/src/test/groovy/bugs/Groovy9103.groovy
index 721344f0c6..9e58032556 100644
--- a/src/test/groovy/bugs/Groovy9103.groovy
+++ b/src/test/groovy/bugs/Groovy9103.groovy
@@ -21,8 +21,8 @@ package groovy.bugs
import org.junit.Test
import static groovy.test.GroovyAssert.assertScript
+import static groovy.test.GroovyAssert.shouldFail
-// TODO: add JVM option `--illegal-access=deny` when all warnings fixed
final class Groovy9103 {
@Test
@@ -78,4 +78,35 @@ final class Groovy9103 {
assert nums == cloned
'''
}
+
+ @Test // GROOVY-10747
+ void testClone5() {
+ ['Object', 'Dolly'].each { typeName ->
+ assertScript """
+ class Dolly implements Cloneable {
+ String name
+
+ public ${typeName} clone() {
+ return super.clone()
+ }
+ }
+
+ def dolly = new Dolly(name: "The Sheep")
+ def cloned = dolly.clone()
+ assert cloned instanceof Dolly
+ """
+ }
+ }
+
+ @Test // GROOVY-10747
+ void testClone6() {
+ shouldFail(CloneNotSupportedException, '''
+ class Dolly {
+ String name
+ }
+
+ def dolly = new Dolly(name: "The Sheep")
+ dolly.clone()
+ ''')
+ }
}