forked from openjdk/jdk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
568 additions
and
156 deletions.
There are no files selected for viewing
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
296 changes: 216 additions & 80 deletions
296
src/java.base/share/classes/javax/security/auth/Subject.java
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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
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
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
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
105 changes: 105 additions & 0 deletions
105
test/jdk/javax/security/auth/Subject/CallAsWithScopedValue.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,105 @@ | ||
| /* | ||
| * Copyright (c) 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. | ||
| * | ||
| * 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. | ||
| */ | ||
|
|
||
| /* | ||
| * @test | ||
| * @bug 8296244 | ||
| * @enablePreview | ||
| * @summary Implement Subject.current and Subject.callAs using scoped values | ||
| * @run main/othervm -Djava.security.manager=allow CallAsWithScopedValue false | ||
| * @run main/othervm -Djava.security.manager=disallow CallAsWithScopedValue true | ||
| */ | ||
| import com.sun.security.auth.UserPrincipal; | ||
|
|
||
| import javax.security.auth.Subject; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.concurrent.StructuredTaskScope; | ||
|
|
||
| public class CallAsWithScopedValue { | ||
|
|
||
| private static Map results = new ConcurrentHashMap<Integer,Boolean>(); | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
|
|
||
| boolean usv = Boolean.parseBoolean(args[0]); | ||
|
|
||
| Subject subject = new Subject(); | ||
| subject.getPrincipals().add(new UserPrincipal("Duke")); | ||
|
|
||
| // Always observable in the same thread | ||
| Subject.callAs(subject, () -> check(0, Subject.current(), "Duke")); | ||
|
|
||
| // Observable in the same thread in ACC mode, but not in the SV mode | ||
| Subject.callAs(subject, () -> { | ||
| Thread.ofPlatform().start(() -> check(1, Subject.current(), usv ? null : "Duke")).join(); | ||
| return null; | ||
| }); | ||
|
|
||
| // Never observable in a new virtual thread | ||
| Subject.callAs(subject, () -> { | ||
| Thread.ofVirtual().start(() -> check(2, Subject.current(), null)).join(); | ||
| return null; | ||
| }); | ||
|
|
||
| // Observable in structured concurrency in SV mode, but not in ACC mode | ||
| Subject.callAs(subject, () -> { | ||
| try (var scope = new StructuredTaskScope<>()) { | ||
| scope.fork(() -> check(3, Subject.current(), usv ? "Duke" : null)); | ||
| scope.join(); | ||
| } | ||
| return null; | ||
| }); | ||
|
|
||
| // Suggested way to pass the current subject into arbitrary | ||
| // threads. Grab one using current() and explicitly pass it | ||
| // into the new thread. | ||
| Subject.callAs(subject, () -> { | ||
| Subject current = Subject.current(); | ||
| Thread.ofPlatform().start(() -> { | ||
| Subject.callAs(current, () -> check(4, Subject.current(), "Duke")); | ||
| }).join(); | ||
| return null; | ||
| }); | ||
|
|
||
| if (results.size() != 5 || results.containsValue(false)) { | ||
| System.out.println(results); | ||
| throw new RuntimeException("Failed"); | ||
| } | ||
| } | ||
|
|
||
| static String check(int type, Subject current, String expected) { | ||
| String actual; | ||
| if (current == null) { | ||
| actual = null; | ||
| } else { | ||
| var set = current.getPrincipals(UserPrincipal.class); | ||
| actual = set.isEmpty() | ||
| ? null | ||
| : set.iterator().next().getName(); | ||
| } | ||
| results.put(type, Objects.equals(actual, expected)); | ||
| return actual; | ||
| } | ||
| } |
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,129 @@ | ||
| /* | ||
| * Copyright (c) 2021, 2022, 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. | ||
| * | ||
| * 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. | ||
| */ | ||
| import com.sun.security.auth.UserPrincipal; | ||
|
|
||
| import javax.security.auth.Subject; | ||
| import javax.security.auth.SubjectDomainCombiner; | ||
| import java.security.AccessControlContext; | ||
| import java.security.AccessController; | ||
| import java.security.PrivilegedExceptionAction; | ||
| import java.util.Objects; | ||
|
|
||
| /* | ||
| * @test | ||
| * @run main/othervm -Djava.security.manager=allow Compat | ||
| */ | ||
| public class Compat { | ||
|
|
||
| // static PrivilegedAction<AccessControlContext> action | ||
| // = () -> AccessController.getContext(); | ||
|
|
||
| static PrivilegedExceptionAction<AccessControlContext> action | ||
| = () -> AccessController.getContext(); | ||
|
|
||
| static boolean failed = false; | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
| main0(null); | ||
| var t = new Thread(() -> { | ||
| try { | ||
| main0(null); | ||
| } catch (Exception e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| }); | ||
| t.start(); | ||
| t.join(); | ||
| } | ||
| public static void main0(String[] args) throws Exception { | ||
| System.out.println(">>> bare run"); | ||
| run(null); | ||
| System.out.println(">>> run inside"); | ||
| Subject subject = makeSubject("three"); | ||
| Subject.doAs(subject, (PrivilegedExceptionAction<? extends Object>) | ||
| () -> run("three")); | ||
| if (failed) { | ||
| throw new RuntimeException(); | ||
| } | ||
| } | ||
|
|
||
| public static Void run(String from) throws Exception { | ||
| Subject subject = makeSubject("one"); | ||
| var a1 = Subject.doAs(subject, action); | ||
| Subject subject2 = makeSubject("two"); | ||
| var a2 = Subject.doAs(subject2, action); | ||
|
|
||
| test("from ether", AccessController.getContext(), from); | ||
| test("from a1", a1, "one"); | ||
| test("from a2", a2, "two"); | ||
|
|
||
| var a3 = Subject.doAsPrivileged(subject, action, a1); | ||
| test("doAsPriv with one and a1", a3, "one"); | ||
|
|
||
| var a4 = Subject.doAsPrivileged(subject, action, a2); | ||
| test("doAsPriv with one and a2", a4, "one"); | ||
|
|
||
| var a5 = Subject.doAsPrivileged(null, action, a2); | ||
| test("doAsPriv with null and a2", a5, null); | ||
|
|
||
| var a6 = Subject.doAs(null, action); | ||
| test("doAsPriv with null and this", a6, null); | ||
|
|
||
| var ax = new AccessControlContext(a2, new SubjectDomainCombiner(subject)); | ||
| test("a2 plus subject", ax, "one"); | ||
|
|
||
| ax = AccessController.doPrivileged(action, a2); | ||
| test("doPriv on a2", ax, "two"); | ||
|
|
||
| ax = AccessController.doPrivilegedWithCombiner(action); | ||
| test("doPrivWC", ax, from == null ? null : from); | ||
|
|
||
| ax = AccessController.doPrivilegedWithCombiner(action, a2); | ||
| test("doPrivWC on a2", ax, from == null ? "two" : from); | ||
| return null; | ||
| } | ||
|
|
||
| static Subject makeSubject(String name) { | ||
| Subject subject = new Subject(); | ||
| subject.getPrincipals().add(new UserPrincipal(name)); | ||
| return subject; | ||
| } | ||
|
|
||
| static String getSubject(AccessControlContext acc) { | ||
| var subj = Subject.getSubject(acc); | ||
| if (subj == null) return null; | ||
| var princ = subj.getPrincipals(UserPrincipal.class); | ||
| return (princ == null || princ.isEmpty()) | ||
| ? null | ||
| : princ.iterator().next().getName(); | ||
| } | ||
|
|
||
| static void test(String label, AccessControlContext acc, String expected) { | ||
| var actual = getSubject(acc); | ||
| System.out.println(label + ": " + actual); | ||
| if (!Objects.equals(actual, expected)) { | ||
| System.out.println(" Expect " + expected + ", but see " + actual); | ||
| failed = true; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.