hatter/yubikey-ca
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: reorg card cli util

Browse Source
This commit is contained in:
Hatter Jiang
2023-05-20 23:48:52 +08:00
parent 4c97436470
commit 2314062147
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
yubikey-ca-java/src/main/java/me/hatter/tools/yubikeyca/cardcli/CardCliUtil.java
View File

@@ -84,13 +84,7 @@ public class CardCliUtil {
final String outputs; final String outputs;
final String errorOutputs; final String errorOutputs;
try { try {
final List<String> commandList = new ArrayList<>(pb.command()); final List<String> commandList = getDesensitizedCommands(pb);
for (int i = 0; i < commandList.size(); i++) {
final String c = commandList.get(i);
if (StringUtil.equals("--pin", c) && ((i + 1) < commandList.size())) {
commandList.set(i + 1, "******");
}
}
log.info("Run command: " + StringUtil.join(commandList, " ")); log.info("Run command: " + StringUtil.join(commandList, " "));
final Process p = pb.start(); final Process p = pb.start();
final byte[] outputsBytes = IOUtil.readToBytes(p.getInputStream()); final byte[] outputsBytes = IOUtil.readToBytes(p.getInputStream());
@@ -104,8 +98,19 @@ public class CardCliUtil {
if (StringUtil.isNotEmpty(StringUtil.trim(errorOutputs))) { if (StringUtil.isNotEmpty(StringUtil.trim(errorOutputs))) {
log.error("Error outputs: " + errorOutputs); log.error("Error outputs: " + errorOutputs);
} }
throw new RuntimeException("Outputs is empty!"); throw new RuntimeException("Outputs is empty! Please insert or reinsert your card.");
} }
return outputs; return outputs;
} }
private static List<String> getDesensitizedCommands(ProcessBuilder pb) {
final List<String> commandList = new ArrayList<>(pb.command());
for (int i = 0; i < commandList.size(); i++) {
final String c = commandList.get(i);
if (StringUtil.equals("--pin", c) && ((i + 1) < commandList.size())) {
commandList.set(i + 1, "******");
}
}
return commandList;
}
} }