mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-01 01:32:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7342 from alvasw/Updater_Remove_JAR_HASH_download

Browse source 
Updater: Remove JAR_HASH download
This commit is contained in:
Alejandro García 2025-01-15 20:23:32 +00:00 • committed by GitHub
commit 155ff3885f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java
View file

@ -74,16 +74,12 @@ public class BisqInstaller {
// tells us which key was used for signing // tells us which key was used for signing
FileDescriptor signingKeyDescriptor = getSigningKeyDescriptor(partialUrl); FileDescriptor signingKeyDescriptor = getSigningKeyDescriptor(partialUrl);
// Hash of jar file inside of the binary
FileDescriptor jarHashDescriptor = getJarHashDescriptor(version, partialUrl);
List<FileDescriptor> keyFileDescriptors = getKeyFileDescriptors(); List<FileDescriptor> keyFileDescriptors = getKeyFileDescriptors();
List<FileDescriptor> sigFileDescriptors = getSigFileDescriptors(installerFileDescriptor, keyFileDescriptors); List<FileDescriptor> sigFileDescriptors = getSigFileDescriptors(installerFileDescriptor, keyFileDescriptors);
List<FileDescriptor> allFiles = Lists.newArrayList(); List<FileDescriptor> allFiles = Lists.newArrayList();
allFiles.add(installerFileDescriptor); allFiles.add(installerFileDescriptor);
allFiles.add(signingKeyDescriptor); allFiles.add(signingKeyDescriptor);
allFiles.add(jarHashDescriptor);
allFiles.addAll(keyFileDescriptors); allFiles.addAll(keyFileDescriptors);
allFiles.addAll(sigFileDescriptors); allFiles.addAll(sigFileDescriptors);
@ -234,17 +230,6 @@ public class BisqInstaller {
.build(); .build();
} }
@NotNull
private FileDescriptor getJarHashDescriptor(String version, String partialUrl) {
String fileName = "Bisq-" + version + ".jar.txt";
return FileDescriptor.builder()
.type(DownloadType.JAR_HASH)
.fileName(fileName)
.id(fileName)
.loadUrl(partialUrl.concat(fileName))
.build();
}
/** /**
* The files containing the gpg keys of the bisq signers. * The files containing the gpg keys of the bisq signers.
* Currently these are 2 hard-coded keys, one included with bisq and the same key online for maximum security. * Currently these are 2 hard-coded keys, one included with bisq and the same key online for maximum security.
@ -342,8 +327,7 @@ public class BisqInstaller {
KEY, KEY,
SIG, SIG,
SIGNING_KEY, SIGNING_KEY,
MISC, MISC
JAR_HASH
} }
} }

37
desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java
View file

@ -51,18 +51,12 @@ import javafx.geometry.Pos;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.io.File; import java.io.File;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Scanner;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -232,11 +226,6 @@ public class DisplayUpdateDownloadWindow extends Overlay<DisplayUpdateDownloadWi
log.debug("Download completed successfully."); log.debug("Download completed successfully.");
downloadedFilesLabel.getStyleClass().add("success-text"); downloadedFilesLabel.getStyleClass().add("success-text");
downloadTask.getFileDescriptors().stream()
.filter(fileDescriptor -> fileDescriptor.getType() == BisqInstaller.DownloadType.JAR_HASH)
.findFirst()
.ifPresent(this::copyJarHashToDataDir);
verifyTask = installer.verify(downloadResults); verifyTask = installer.verify(downloadResults);
verifiedSigLabel.setOpacity(1); verifiedSigLabel.setOpacity(1);
@ -286,32 +275,6 @@ public class DisplayUpdateDownloadWindow extends Overlay<DisplayUpdateDownloadWi
}); });
} }
private void copyJarHashToDataDir(BisqInstaller.FileDescriptor fileDescriptor) {
StringBuilder sb = new StringBuilder();
final File sourceFile = fileDescriptor.getSaveFile();
try (Scanner scanner = new Scanner(new FileReader(sourceFile))) {
while (scanner.hasNext()) {
sb.append(scanner.next());
}
scanner.close();
final String hashOfJar = sb.toString();
Path path = Paths.get(config.appDataDir.getPath(), fileDescriptor.getFileName());
final String target = path.toString();
try (PrintWriter writer = new PrintWriter(target, "UTF-8")) {
writer.println(hashOfJar);
writer.close();
log.info("Copied hash of jar from {} to {}", sourceFile.getAbsolutePath(), target);
} catch (Exception e) {
log.error(e.toString());
e.printStackTrace();
}
} catch (Exception e) {
log.error(e.toString());
e.printStackTrace();
}
}
@Override @Override
protected void addButtons() { protected void addButtons() {
closeButton = new AutoTooltipButton(Res.get("displayUpdateDownloadWindow.button.ignoreDownload")); closeButton = new AutoTooltipButton(Res.get("displayUpdateDownloadWindow.button.ignoreDownload"));