Skip to content

OWS-679: use null password to load truststore #997

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.

Sign up for GitHub

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

Draft
janakmulani wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

OWS-679: use null password to load truststore #997

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions core/src/main/java/net/sourceforge/jnlp/security/KeystorePasswordAttempter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import javax.net.ssl.KeyManagerFactory;
import javax.swing.JOptionPane;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.security.Key;
import java.security.KeyStore;
Expand Down Expand Up @@ -106,6 +107,10 @@
this.f = f;
}

public KeyStore getKeyStore() {
return ks;
}

abstract Key operateKeystore(char[] pass) throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException, IOException, CertificateException;

abstract String getId();
Expand All @@ -124,7 +129,6 @@
Key unlockKeystore(KeystoreOperation operation) throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException, IOException, CertificateException {
final String keyStorePath = operation.f != null ? operation.f.getCanonicalPath() : "Unknown";
final SavedPassword successfulKey = successfulPerKeystore.get(keyStorePath);
LOG.debug("unlockKeyStore: For file {}, found successful pass = {} ", keyStorePath, successfulKey != null);

Exception firstEx = null;
String messages = "";
Expand All @@ -140,12 +144,28 @@
//we expect, that any keystore is loaded before read.
//so we are writing by correct password
//if no successful password was provided during reading, then finish(firstEx); will save us from overwrite
final Key result = operation.operateKeystore(pass.pass);
//ok we were successful
//save the loading password for storing purposes (and another reading too)
if (operation.f != null) {
successfulPerKeystore.put(keyStorePath, pass);
final Key result;
if (operation.getId().contains("load keystore")) {
result = operation.operateKeystore(null);
} else {
if (successfulKey == null || successfulKey.pass == null) {
// Verify the candidate password against the on-disk file before storing.
// ks.store() accepts any password silently; load() is the only check.
if (operation.f != null && operation.f.exists()) {

Check warning on line 154 in core/src/main/java/net/sourceforge/jnlp/security/KeystorePasswordAttempter.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Merge this if statement with the enclosing one. 


See more on https://sonarcloud.io/project/issues?id=AdoptOpenJDK_IcedTea-Web&issues=AZ8AHN3bUWBMZKLSOgaD&open=AZ8AHN3bUWBMZKLSOgaD&pullRequest=997
KeyStore verification = KeyStore.getInstance(operation.getKeyStore().getType());
try (FileInputStream fis = new FileInputStream(operation.f)) {
verification.load(fis, pass.pass); // throws IOException if password is wrong
}
}
}
result = operation.operateKeystore(pass.pass);
//ok we were successful
//save the loading password for storing purposes (and another reading too)
if (operation.f != null) {
successfulPerKeystore.put(keyStorePath, pass);
}
}

return result;
} catch (KeyStoreException | NoSuchAlgorithmException | UnrecoverableKeyException | IOException | CertificateException ex) {
if (firstEx == null) {
Expand Down
Loading