sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-04 13:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perform gpg verification in separate thread

Browse source
This commit is contained in:
Craig Raw 2024-03-05 12:52:37 +02:00
parent 81c7bc7ecb
commit 914afe9a8d
1 changed files with 69 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
src/main/java/com/sparrowwallet/sparrow/control/DownloadVerifierDialog.java
View file

@ -261,9 +261,32 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
}); });
} }
public void verify() { private void verify() {
boolean signatureVerified = verifySignature(); publicKeyDisabled.set(false);
if(signatureVerified) {
if(signature.get() == null || manifest.get() == null) {
clearReleaseFields();
return;
}
PGPVerifyService pgpVerifyService = new PGPVerifyService(signature.get(), manifest.get(), publicKey.get());
pgpVerifyService.setOnRunning(event -> {
signedBy.setText("Verifying...");
signedBy.setGraphic(GlyphUtils.getBusyGlyph());
signedBy.setTooltip(null);
clearReleaseFields();
});
pgpVerifyService.setOnSucceeded(event -> {
PGPVerificationResult result = pgpVerifyService.getValue();
String message = result.userId() + " on " + signatureDateFormat.format(result.signatureTimestamp()) + (result.expired() ? " (key expired)" : "");
signedBy.setText(message);
signedBy.setGraphic(result.expired() ? GlyphUtils.getWarningGlyph() : GlyphUtils.getSuccessGlyph());
if(!result.expired()) {
publicKeyDisabled.set(true);
}
if(manifest.get().equals(release.get())) { if(manifest.get().equals(release.get())) {
releaseHash.setText("No hash required, signature signs release file directly"); releaseHash.setText("No hash required, signature signs release file directly");
releaseHash.setGraphic(GlyphUtils.getSuccessGlyph()); releaseHash.setGraphic(GlyphUtils.getSuccessGlyph());
@ -274,7 +297,18 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
} else { } else {
verifyManifest(); verifyManifest();
} }
} else { });
pgpVerifyService.setOnFailed(event -> {
Throwable e = event.getSource().getException();
signedBy.setText(getDisplayMessage(e));
signedBy.setGraphic(GlyphUtils.getFailureGlyph());
clearReleaseFields();
});
pgpVerifyService.start();
}
private void clearReleaseFields() {
releaseHash.setText(""); releaseHash.setText("");
releaseHash.setGraphic(null); releaseHash.setGraphic(null);
releaseHash.setTooltip(null); releaseHash.setTooltip(null);
@ -282,38 +316,6 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
releaseVerified.setGraphic(null); releaseVerified.setGraphic(null);
releaseLink.setText(""); releaseLink.setText("");
} }
}
private boolean verifySignature() {
publicKeyDisabled.set(false);
if(signature.get() == null || manifest.get() == null) {
return false;
}
boolean detachedSignature = !manifest.get().equals(signature.get());
try(InputStream publicKeyStream = publicKey.get() == null ? null : new FileInputStream(publicKey.get());
InputStream contentStream = new BufferedInputStream(new FileInputStream(manifest.get()));
InputStream detachedSignatureStream = detachedSignature ? new FileInputStream(signature.get()) : null) {
PGPVerificationResult result = PGPUtils.verify(publicKeyStream, contentStream, detachedSignatureStream);
String message = result.userId() + " on " + signatureDateFormat.format(result.signatureTimestamp()) + (result.expired() ? " (key expired)" : "");
signedBy.setText(message);
signedBy.setGraphic(result.expired() ? GlyphUtils.getWarningGlyph() : GlyphUtils.getSuccessGlyph());
if(!result.expired()) {
publicKeyDisabled.set(true);
}
return true;
} catch(IOException | PGPVerificationException e) {
signedBy.setText(getDisplayMessage(e));
signedBy.setGraphic(GlyphUtils.getFailureGlyph());
}
return false;
}
private void verifyManifest() { private void verifyManifest() {
File releaseFile = release.get(); File releaseFile = release.get();
@ -521,7 +523,7 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
} }
} }
private String getDisplayMessage(Exception e) { private String getDisplayMessage(Throwable e) {
String message = e.getMessage(); String message = e.getMessage();
message = message.substring(0, 1).toUpperCase(Locale.ROOT) + message.substring(1); message = message.substring(0, 1).toUpperCase(Locale.ROOT) + message.substring(1);
@ -674,6 +676,33 @@ public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
} }
} }
private static class PGPVerifyService extends Service<PGPVerificationResult> {
private final File signature;
private final File manifest;
private final File publicKey;
public PGPVerifyService(File signature, File manifest, File publicKey) {
this.signature = signature;
this.manifest = manifest;
this.publicKey = publicKey;
}
@Override
protected Task<PGPVerificationResult> createTask() {
return new Task<>() {
protected PGPVerificationResult call() throws IOException, PGPVerificationException {
boolean detachedSignature = !manifest.equals(signature);
try(InputStream publicKeyStream = publicKey == null ? null : new FileInputStream(publicKey);
InputStream contentStream = new BufferedInputStream(new FileInputStream(manifest));
InputStream detachedSignatureStream = detachedSignature ? new FileInputStream(signature) : null) {
return PGPUtils.verify(publicKeyStream, contentStream, detachedSignatureStream);
}
}
};
}
}
private static class FileSha256Service extends Service<String> { private static class FileSha256Service extends Service<String> {
private final File file; private final File file;