Skip to content

Commit 43f29a3

Browse files
committed
Suppress warnings related to missing CA cert files.
Per #887
1 parent 752eac7 commit 43f29a3

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

src/qz/installer/Installer.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,15 @@ public CertificateManager certGen(boolean forceNew, String... hostNames) throws
208208
FirefoxCertificateInstaller.install(caCert, hostNames);
209209
} else {
210210
// Make sure the certificate is recognized by the system
211-
File tempCert = File.createTempFile(KeyPairWrapper.getAlias(KeyPairWrapper.Type.CA) + "-", CertificateManager.DEFAULT_CERTIFICATE_EXTENSION);
212-
CertificateManager.writeCert(caCert, tempCert); // temp cert
213-
if(!installer.verify(tempCert)) {
214-
installer.install(caCert);
215-
FirefoxCertificateInstaller.install(caCert, hostNames);
211+
if(caCert == null) {
212+
log.info("CA cert is empty, skipping installation checks. This is normal for trusted/3rd-party SSL certificates.");
213+
} else {
214+
File tempCert = File.createTempFile(KeyPairWrapper.getAlias(KeyPairWrapper.Type.CA) + "-", CertificateManager.DEFAULT_CERTIFICATE_EXTENSION);
215+
CertificateManager.writeCert(caCert, tempCert); // temp cert
216+
if (!installer.verify(tempCert)) {
217+
installer.install(caCert);
218+
FirefoxCertificateInstaller.install(caCert, hostNames);
219+
}
216220
}
217221
}
218222
}

src/qz/ws/PrintSocketServer.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import javax.swing.*;
3737
import java.io.File;
3838
import java.io.IOException;
39+
import java.security.cert.X509Certificate;
3940
import java.util.Arrays;
4041
import java.util.Collections;
4142
import java.util.List;
@@ -97,7 +98,11 @@ public static void main(String[] args) {
9798

9899
// Linux needs the cert installed in user-space on every launch for Chrome SSL to work
99100
if (!SystemUtilities.isWindows() && !SystemUtilities.isMac()) {
100-
NativeCertificateInstaller.getInstance().install(certificateManager.getKeyPair(KeyPairWrapper.Type.CA).getCert());
101+
X509Certificate caCert = certificateManager.getKeyPair(KeyPairWrapper.Type.CA).getCert();
102+
// Only install if a CA cert exists (e.g. one we generated)
103+
if(caCert != null) {
104+
NativeCertificateInstaller.getInstance().install(certificateManager.getKeyPair(KeyPairWrapper.Type.CA).getCert());
105+
}
101106
}
102107

103108
try {

0 commit comments

Comments
 (0)