Skip to content

Fixed hash logic on macOS #82

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

Merged
HttpRafa merged 1 commit into from
Nov 3, 2025
Merged

Fixed hash logic on macOS #82

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
11 changes: 5 additions & 6 deletions common/src/main/java/de/rafael/modflared/binary/download/DownloadedCloudflared.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,22 +125,21 @@ public CompletableFuture<Pair<Boolean, String>> 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);
Expand Down