-
Notifications
You must be signed in to change notification settings - Fork 139
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The pki CLI has been modified to add the p11-kit-trust module into the NSS database such that it trusts the CA certificates provided by the system.
- Loading branch information
Showing
6 changed files
with
243 additions
and
59 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,219 @@ | ||
| // --- BEGIN COPYRIGHT BLOCK --- | ||
| // This program is free software; you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation; version 2 of the License. | ||
| // | ||
| // This program 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 for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License along | ||
| // with this program; if not, write to the Free Software Foundation, Inc., | ||
| // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| // | ||
| // (C) 2019 Red Hat, Inc. | ||
| // All rights reserved. | ||
| // --- END COPYRIGHT BLOCK --- | ||
|
|
||
| package org.dogtagpki.nss; | ||
|
|
||
| import java.io.BufferedReader; | ||
| import java.io.File; | ||
| import java.io.FileWriter; | ||
| import java.io.InputStreamReader; | ||
| import java.io.OutputStreamWriter; | ||
| import java.io.PrintWriter; | ||
| import java.io.Reader; | ||
| import java.io.Writer; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.commons.io.FileUtils; | ||
|
|
||
| /** | ||
| * @author Endi S. Dewata | ||
| */ | ||
| public class NSSDatabase { | ||
|
|
||
| public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(NSSDatabase.class); | ||
|
|
||
| File directory; | ||
|
|
||
| public NSSDatabase(File directory) { | ||
| this.directory = directory; | ||
| } | ||
|
|
||
| public File getDirectory() { | ||
| return directory; | ||
| } | ||
|
|
||
| public void setDirectory(File directory) { | ||
| this.directory = directory; | ||
| } | ||
|
|
||
| public boolean exists() { | ||
| return directory.exists(); | ||
| } | ||
|
|
||
| public void create() throws Exception { | ||
| create(null); | ||
| } | ||
|
|
||
| public void create(String password) throws Exception { | ||
|
|
||
| logger.info("Creating NSS database in " + directory); | ||
|
|
||
| directory.mkdirs(); | ||
|
|
||
| File passwordFile = new File(directory, "password.txt"); | ||
|
|
||
| try { | ||
| List<String> command = new ArrayList<>(); | ||
| command.add("certutil"); | ||
| command.add("-N"); | ||
| command.add("-d"); | ||
| command.add(directory.getAbsolutePath()); | ||
|
|
||
| if (password == null) { | ||
| command.add("--empty-password"); | ||
|
|
||
| } else { | ||
| try (PrintWriter out = new PrintWriter(new FileWriter(passwordFile))) { | ||
| out.println(password); | ||
| } | ||
|
|
||
| command.add("-f"); | ||
| command.add(passwordFile.getAbsolutePath()); | ||
| } | ||
|
|
||
| debug(command); | ||
|
|
||
| ProcessBuilder pb = new ProcessBuilder(command); | ||
| pb.inheritIO(); | ||
|
|
||
| Process p = pb.start(); | ||
| int rc = p.waitFor(); | ||
|
|
||
| if (rc != 0) { | ||
| throw new Exception("Command failed: rc=" + rc); | ||
| } | ||
|
|
||
| } finally { | ||
| if (passwordFile.exists()) passwordFile.delete(); | ||
| } | ||
|
|
||
| // Install p11-kit-trust module if it doesn't exist | ||
| if (!isModuleInstalled("p11-kit-trust")) { | ||
| addModule("p11-kit-trust", "/usr/share/pki/lib/p11-kit-trust.so"); | ||
| } | ||
| } | ||
|
|
||
| public boolean isModuleInstalled(String name) throws Exception { | ||
|
|
||
| logger.info("Checking module " + name); | ||
|
|
||
| List<String> command = new ArrayList<>(); | ||
| command.add("modutil"); | ||
| command.add("-dbdir"); | ||
| command.add(directory.getAbsolutePath()); | ||
| command.add("-rawlist"); | ||
|
|
||
| debug(command); | ||
|
|
||
| ProcessBuilder pb = new ProcessBuilder(command); | ||
| pb.redirectError(ProcessBuilder.Redirect.INHERIT); | ||
| pb.redirectError(ProcessBuilder.Redirect.INHERIT); | ||
|
|
||
| Process p = pb.start(); | ||
|
|
||
| // searching for name="<module>" | ||
| String pattern = " name=\"" + name + "\" "; | ||
|
|
||
| try (Reader reader = new InputStreamReader(p.getInputStream()); | ||
| BufferedReader in = new BufferedReader(reader)) { | ||
|
|
||
| String line; | ||
| while ((line = in.readLine()) != null) { | ||
| if (line.contains(pattern)) return true; | ||
| } | ||
| } | ||
|
|
||
| int rc = p.waitFor(); | ||
|
|
||
| if (rc != 0) { | ||
| throw new Exception("Command failed: rc=" + rc); | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| public void addModule(String name, String library) throws Exception { | ||
|
|
||
| logger.info("Installing " + name + " module with " + library); | ||
|
|
||
| List<String> command = new ArrayList<>(); | ||
| command.add("modutil"); | ||
| command.add("-dbdir"); | ||
| command.add(directory.getAbsolutePath()); | ||
| command.add("-add"); | ||
| command.add(name); | ||
| command.add("-libfile"); | ||
| command.add(library); | ||
| command.add("-force"); | ||
|
|
||
| debug(command); | ||
|
|
||
| ProcessBuilder pb = new ProcessBuilder(command); | ||
| pb.redirectError(ProcessBuilder.Redirect.INHERIT); | ||
|
|
||
| Process p = pb.start(); | ||
|
|
||
| try (Writer writer = new OutputStreamWriter(p.getOutputStream()); | ||
| PrintWriter out = new PrintWriter(writer)) { | ||
|
|
||
| // modutil will generate the following question: | ||
|
|
||
| // WARNING: Manually adding a module while p11-kit is enabled could cause | ||
| // duplicate module registration in your security database. It is suggested | ||
| // to configure the module through p11-kit configuration file instead. | ||
| // | ||
| // Type 'q <enter>' to abort, or <enter> to continue: | ||
|
|
||
| // respond with <enter> | ||
| out.println(); | ||
| } | ||
|
|
||
| int rc = p.waitFor(); | ||
|
|
||
| if (rc != 0) { | ||
| throw new Exception("Command failed: rc=" + rc); | ||
| } | ||
| } | ||
|
|
||
| public void delete() throws Exception { | ||
| FileUtils.deleteDirectory(directory); | ||
| } | ||
|
|
||
| public void debug(Collection<String> command) { | ||
|
|
||
| if (logger.isDebugEnabled()) { | ||
|
|
||
| StringBuilder sb = new StringBuilder("Command:"); | ||
|
|
||
| for (String c : command) { | ||
|
|
||
| boolean quote = c.contains(" "); | ||
|
|
||
| sb.append(' '); | ||
|
|
||
| if (quote) sb.append('"'); | ||
| sb.append(c); | ||
| if (quote) sb.append('"'); | ||
| } | ||
|
|
||
| logger.debug(sb.toString()); | ||
| } | ||
| } | ||
| } |
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