-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Proper getStackAccessControlContext implementation
Implemented PrivilegedStack using FastThreadLocal. Added missing getProtectionDomain method. Check for DISALLOWED_CONTEXT_MARKER in executePrivileged. Added allowlist for known-good JDK contexts. Suppress deprecation warnings.
- Loading branch information
1 parent
179dc4f
commit 2766ffe
Showing
8 changed files
with
511 additions
and
110 deletions.
There are no files selected for viewing
121 changes: 121 additions & 0 deletions
121
substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/AccessControllerUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /* | ||
| * Copyright (c) 2021, 2021, 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 java.security.AccessControlContext; | ||
| import java.security.ProtectionDomain; | ||
| import java.util.ArrayDeque; | ||
| import java.util.Objects; | ||
|
|
||
| import com.oracle.svm.core.threadlocal.FastThreadLocalFactory; | ||
| import com.oracle.svm.core.threadlocal.FastThreadLocalObject; | ||
| import com.oracle.svm.core.util.VMError; | ||
| import com.oracle.svm.util.ReflectionUtil; | ||
|
|
||
| /** | ||
| * Stack for storing AccessControlContexts. Used in conjunction with | ||
| * {@code StackAccessControlContextVisitor}. | ||
| */ | ||
| class PrivilegedStack { | ||
|
|
||
| public static class StackElement { | ||
| protected AccessControlContext context; | ||
| protected Class<?> caller; | ||
|
|
||
| StackElement(AccessControlContext context, Class<?> caller) { | ||
| this.context = context; | ||
| this.caller = caller; | ||
| } | ||
|
|
||
| public AccessControlContext getContext() { | ||
| return context; | ||
| } | ||
|
|
||
| public Class<?> getCaller() { | ||
| return caller; | ||
| } | ||
| } | ||
|
|
||
| /* Local AccessControlContext stack */ | ||
| private static final FastThreadLocalObject<ArrayDeque<StackElement>> stack; | ||
|
|
||
| static { | ||
| @SuppressWarnings("unchecked") | ||
| Class<ArrayDeque<StackElement>> cls = (Class<ArrayDeque<StackElement>>) (Object) ArrayDeque.class; | ||
| stack = FastThreadLocalFactory.createObject(cls, "AccessControlContextStack"); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private static ArrayDeque<StackElement> getStack() { | ||
| if (stack.get() == null) { | ||
| initializeStack(); | ||
| } | ||
| return stack.get(); | ||
| } | ||
|
|
||
| private static void initializeStack() { | ||
| ArrayDeque<StackElement> tmp = new ArrayDeque<>(); | ||
| stack.set(tmp); | ||
| } | ||
|
|
||
| public static void push(AccessControlContext context, Class<?> caller) { | ||
| getStack().push(new StackElement(context, caller)); | ||
| } | ||
|
|
||
| public static void pop() { | ||
| getStack().pop(); | ||
| } | ||
|
|
||
| public static AccessControlContext peekContext() { | ||
| return Objects.requireNonNull(getStack().peek()).getContext(); | ||
| } | ||
|
|
||
| public static Class<?> peekCaller() { | ||
| return Objects.requireNonNull(getStack().peek()).getCaller(); | ||
| } | ||
|
|
||
| public static int length() { | ||
| return getStack().size(); | ||
| } | ||
| } | ||
|
|
||
| @SuppressWarnings({"unused"}) | ||
| public class AccessControllerUtil { | ||
|
|
||
| /** | ||
| * Instance that is used to mark contexts that were disallowed in | ||
| * {@code AccessControlContextReplacerFeature.replaceAccessControlContext()} If this marker is | ||
| * passed to {@code AccessController.doPrivileged()} a runtime error will be thrown. | ||
| */ | ||
| public static final AccessControlContext DISALLOWED_CONTEXT_MARKER; | ||
|
|
||
| static { | ||
| try { | ||
| DISALLOWED_CONTEXT_MARKER = ReflectionUtil.lookupConstructor(AccessControlContext.class, ProtectionDomain[].class, boolean.class).newInstance(new ProtectionDomain[0], true); | ||
| } catch (ReflectiveOperationException ex) { | ||
| throw VMError.shouldNotReachHere(ex); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.