From dab6a7be205d9983b57a721adc6bba3d7232b845 Mon Sep 17 00:00:00 2001 From: Harrison Date: Mon, 3 Nov 2025 14:09:52 +0000 Subject: [PATCH] Fixed hash logic on macOS --- .../binary/download/DownloadedCloudflared.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/de/rafael/modflared/binary/download/DownloadedCloudflared.java b/common/src/main/java/de/rafael/modflared/binary/download/DownloadedCloudflared.java index ca609a4..31ed19f 100644 --- a/common/src/main/java/de/rafael/modflared/binary/download/DownloadedCloudflared.java +++ b/common/src/main/java/de/rafael/modflared/binary/download/DownloadedCloudflared.java @@ -125,22 +125,21 @@ public CompletableFuture> isUptoDate() { for (int i = 0; i < 4; i++) { Modflared.LOGGER.info("Downloading cloudflared version {} from github. Attempt: {}", version, i + 1); var downloadedFile = syncDownloadFile(); - Modflared.LOGGER.info("Downloaded file preparing cloudflared binary..."); var file = new File(TunnelManager.DATA_FOLDER, download.fileName()); - prepareFile(downloadedFile, file); - // Check if file is corrupt Modflared.LOGGER.info("Checking file integrity"); - var provided = GithubAPI.FileHash.computeHash(file); + var provided = GithubAPI.FileHash.computeHash(downloadedFile); if(expected.compareTo(provided)) { Modflared.LOGGER.info("Download finished of cloudflared version {}!", version); + Modflared.LOGGER.info("Downloaded file preparing cloudflared binary..."); + prepareFile(downloadedFile, file); return; } else { Modflared.LOGGER.warn("This downloaded file does not match with the file hash provided on GitHub."); Modflared.LOGGER.warn("Expected {}, Provided: {}", expected.hash(), provided.hash()); - - file.delete(); + downloadedFile.delete(); } + } } catch (InterruptedException exception) { throw new IllegalStateException("Error while unpacking MacOS cloudflared download", exception);