Fix handling of proxy classes in hidden_api.h
Inspecting proxy classes with reflection/JNI could result in an ART
crash because hiddenapi::detail::GetDexFlags() assumed that all classes
have a class def index and can be iterated over. This actually revealed
a more general issue with proxy classes.
This patch replaces a proxy method with the interface method at the
beginning of ShouldDenyAccessToMember. This takes care of all proxy
methods and will instead look at hidden API flags of the interface
methods. What's left is proxy fields - both synthetic implementation
details. Special case those and assign to greylist for now.
Bug: 124218696
Test: art/test.py -r -t 691-hiddenapi-proxy
Change-Id: I36c961cd4ffb196641db162818a0f9659aed8a32
diff --git a/test/691-hiddenapi-proxy/src/Main.java b/test/691-hiddenapi-proxy/src/Main.java
new file mode 100644
index 0000000..3c7c568
--- /dev/null
+++ b/test/691-hiddenapi-proxy/src/Main.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed 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.
+ */
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+public class Main {
+ public static void main(String[] args) throws Exception {
+ System.loadLibrary(args[0]);
+ init();
+ appendToBootClassLoader(DEX_EXTRA, /* isCorePlatform */ false);
+
+ Class<?> klass = Object.class.getClassLoader().loadClass("MyInterface");
+ Object obj = Proxy.newProxyInstance(
+ klass.getClassLoader(),
+ new Class[] { klass, Cloneable.class },
+ new InvocationHandler() {
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) {
+ return null;
+ }
+ });
+
+ // Print names of declared methods - this should not include "hidden()".
+ for (Method m : obj.getClass().getDeclaredMethods()) {
+ System.out.println(m.getName());
+ }
+
+ // Do not print names of fields. They do not have a set Java name.
+ if (obj.getClass().getDeclaredFields().length != 2) {
+ throw new Exception("Expected two fields in a proxy class: 'interfaces' and 'throws'");
+ }
+ }
+
+ private static final String DEX_EXTRA = new File(System.getenv("DEX_LOCATION"),
+ "691-hiddenapi-proxy-ex.jar").getAbsolutePath();
+
+ private static native void init();
+ private static native void appendToBootClassLoader(String dexPath, boolean isCorePlatform);
+}