-
Notifications
You must be signed in to change notification settings - Fork 6.2k
JDK-6782021: It is not possible to read local computer certificates with the SunMSCAPI provider #8211
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.
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
Closed
+186
−32
Closed
JDK-6782021: It is not possible to read local computer certificates with the SunMSCAPI provider #8211
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
86b5ced
6782021: add support for localmachine keystores on windows
macarte 881bc60
replace string parameter with int and supporting constants
macarte 5b3d411
Removed whitespace and simply passing ints between java and C++
macarte c56ce0f
Minor formatting and spelling issues addressed
macarte 985378f
Add test from wangweij
macarte 6c1f181
Change admin privilege test to reliable method
macarte File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,87 @@ | ||
| /* | ||
| * Copyright (c) 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 jdk.test.lib.Asserts; | ||
| import jdk.test.lib.SecurityTools; | ||
|
|
||
| import java.io.IOException; | ||
| import java.security.KeyStore; | ||
| import java.security.KeyStoreException; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Locale; | ||
|
|
||
| /* | ||
| * @test | ||
| * @bug 6782021 | ||
| * @requires os.family == "windows" | ||
| * @library /test/lib | ||
| * @summary More keystore types | ||
| */ | ||
| public class AllTypes { | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
| var nm = test("windows-my"); | ||
| var nr = test("windows-root"); | ||
| var nmu = test("windows-my-currentuser"); | ||
| var nru = test("windows-root-currentuser"); | ||
| var hasAdminPrivileges = detectIfRunningWithAdminPrivileges(); | ||
| var nmm = adminTest("windows-my-localmachine", hasAdminPrivileges); | ||
| var nrm = adminTest("windows-root-localmachine", hasAdminPrivileges); | ||
| Asserts.assertEQ(nm, nmu); | ||
| Asserts.assertEQ(nr, nru); | ||
| } | ||
|
|
||
| private static boolean detectIfRunningWithAdminPrivileges() { | ||
| try { | ||
| Process p = Runtime.getRuntime().exec("reg query \"HKU\\S-1-5-19\""); | ||
| p.waitFor(); | ||
| return (p.exitValue() == 0); | ||
| } | ||
| catch (Exception ex) { | ||
| System.out.println("Warning: unable to detect admin privileges, assuming none"); | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| private static List<String> adminTest(String type, boolean hasAdminPrivileges) throws Exception { | ||
| if (hasAdminPrivileges) { | ||
| return test(type); | ||
| } | ||
| System.out.println("Ignoring: " + type + " as it requires admin privileges"); | ||
| return null; | ||
| } | ||
|
|
||
| private static List<String> test(String type) throws Exception { | ||
| var stdType = "Windows-" + type.substring(8).toUpperCase(Locale.ROOT); | ||
| SecurityTools.keytool("-storetype " + type + " -list") | ||
| .shouldHaveExitValue(0) | ||
| .shouldContain("Keystore provider: SunMSCAPI") | ||
| .shouldContain("Keystore type: " + stdType); | ||
| KeyStore ks = KeyStore.getInstance(type); | ||
| ks.load(null, null); | ||
| var content = Collections.list(ks.aliases()); | ||
| Collections.sort(content); | ||
| return content; | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.