nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-23 00:40:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #124 from WiredSpast/patch-1

Browse Source 
Fix for certificatePath which includes spaces
This commit is contained in:
sirjonasxx 2022-04-10 14:12:00 +02:00 committed by GitHub
commit 8cd429cc23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/os/windows/NitroWindows.java
View File

@ -25,7 +25,7 @@ public class NitroWindows implements NitroOsFunctions {
@Override @Override
public boolean isRootCertificateTrusted(File certificate) { public boolean isRootCertificateTrusted(File certificate) {
try { try {
final String output = RuntimeUtil.getCommandOutput(new String[] {"cmd", "/c", " certutil.exe -f -verify " + certificate.getAbsolutePath()}); final String output = RuntimeUtil.getCommandOutput(new String[] {"cmd", "/c", " certutil.exe -f -verify \"" + certificate.getAbsolutePath() + "\""});
return !output.contains("CERT_TRUST_IS_UNTRUSTED_ROOT") && return !output.contains("CERT_TRUST_IS_UNTRUSTED_ROOT") &&
output.contains("dwInfoStatus=10c dwErrorStatus=0"); output.contains("dwInfoStatus=10c dwErrorStatus=0");
@ -41,7 +41,7 @@ public class NitroWindows implements NitroOsFunctions {
final String certificatePath = certificate.getAbsolutePath(); final String certificatePath = certificate.getAbsolutePath();
// Prompt UAC elevation. // Prompt UAC elevation.
WinDef.HINSTANCE result = NitroWindowsShell32.INSTANCE.ShellExecuteA(null, "runas", "cmd.exe", "/S /C \"certutil -addstore root " + certificatePath + "\"", null, 1); WinDef.HINSTANCE result = NitroWindowsShell32.INSTANCE.ShellExecuteA(null, "runas", "cmd.exe", "/S /C 'certutil -addstore root \"" + certificatePath + "\"'", null, 1);
// Wait for exit. // Wait for exit.
Kernel32.INSTANCE.WaitForSingleObject(result, WinBase.INFINITE); Kernel32.INSTANCE.WaitForSingleObject(result, WinBase.INFINITE);