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

Enforce use of Outer$Inner syntax in whitelists #383

Merged
merged 2 commits into from
Jan 7, 2022
Merged

Enforce use of Outer$Inner syntax in whitelists #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6384e1
Enforce use of `Outer$Inner` syntax in whitelists
jglick Jan 7, 2022
6bfedfa
Stray comma
jglick Jan 7, 2022
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
34 changes: 30 additions & 4 deletions ...in/java/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/EnumeratingWhitelist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

package org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists;

import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
Expand All @@ -32,7 +33,6 @@
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;

import org.apache.commons.lang.ClassUtils;
import org.jenkinsci.plugins.scriptsecurity.sandbox.Whitelist;

import edu.umd.cs.findbugs.annotations.CheckForNull;
Expand Down Expand Up @@ -217,9 +217,35 @@ public static abstract class Signature implements Comparable<Signature> {
return toString().hashCode();
}
abstract boolean exists() throws Exception;
final Class<?> type(String name) throws Exception {
// TODO this should be more strict: binary name is required for nested classes
return ClassUtils.getClass(name);
/** opposite of {@link #getName(Class)} */
static final Class<?> type(String name) throws Exception {
// ClassUtils.getClass is too lax: permits Outer.Inner where we require Outer$Inner.
if (name.endsWith("[]")) {
// https://stackoverflow.com/q/1679421/12916; TODO Java 12+ use Class.arrayType
return Array.newInstance(type(name.substring(0, name.length() - 2)), 0).getClass();
}
switch (name) {
case "boolean":
return boolean.class;
case "char":
return char.class;
case "byte":
return byte.class;
case "short":
return short.class;
case "int":
return int.class;
case "long":
return long.class;
case "float":
return float.class;
case "double":
return double.class;
case "void":
return void.class;
default:
return Class.forName(name);
}
}
final Class<?>[] types(String[] names) throws Exception {
Class<?>[] r = new Class<?>[names.length];
Expand Down
8 changes: 7 additions & 1 deletion ...ava/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/EnumeratingWhitelistTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,14 @@ public void m(Object[] args) {}
assertFalse(new EnumeratingWhitelist.FieldSignature(C.class, "other").matches(f));
}

@Test public void getName() {
@Test public void getName() throws Exception {
assertEquals("java.lang.Object", EnumeratingWhitelist.getName(Object.class));
assertEquals("java.lang.Object[]", EnumeratingWhitelist.getName(Object[].class));
assertEquals("java.lang.Object[][]", EnumeratingWhitelist.getName(Object[][].class));
assertEquals(EnumeratingWhitelistTest.class.getName() + "$C", EnumeratingWhitelist.getName(C.class));
for (Class<?> c : new Class<?>[] {String.class, Map.Entry.class, int.class, String[].class, Map.Entry[].class, int[].class, String[][].class, Map.Entry[][].class, int[][].class}) {
assertEquals(c, EnumeratingWhitelist.Signature.type(EnumeratingWhitelist.getName(c)));
}
}

@Test public void methodExists() throws Exception {
Expand All @@ -74,6 +77,9 @@ public void m(Object[] args) {}
assertFalse(new EnumeratingWhitelist.MethodSignature(LinkedHashMap.class, "size").exists());
assertFalse(new EnumeratingWhitelist.MethodSignature(HashMap.class, "size").exists());
assertTrue(new EnumeratingWhitelist.MethodSignature(Map.class, "size").exists());
assertTrue(new EnumeratingWhitelist.MethodSignature(Map.Entry.class, "getKey").exists());
assertTrue(new EnumeratingWhitelist.MethodSignature("java.util.Map$Entry", "getKey", new String[0]).exists());
assertThrows(ClassNotFoundException.class, new EnumeratingWhitelist.MethodSignature("java.util.Map.Entry", "getKey", new String[0])::exists);
}

@Test
Expand Down