Skip to content
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.

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

Verify remote FTL checksum #5603

Merged
merged 2 commits into from
Mar 11, 2024
Merged

Verify remote FTL checksum #5603

merged 2 commits into from
Mar 11, 2024

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Mar 10, 2024

What does this implement/fix?

Verify that we actually downloaded a valid checksum before comparing it to the local one. This covers situations where downloading the checksum from remote might have failed.

Before, we simply always believed that curl "will surely have worked" and might falsely compare an empty remote checksum to the local one always resulting in a checksum mismatch + FTL re-downloading. In case of an unreadable upstream checksum, we still re-download (seems the best compromise) but print a clear message telling the user what is going on.

This PR does not introduce any functional changes.


Related issue or feature (if applicable): See Discourse thread linked below

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

…it to the local one. This covers situations where downloading the checksum from remote might have failed

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added Bug: fixed Contains a bug resolution Pi-hole v6.0 labels Mar 10, 2024
@DL6ER DL6ER requested a review from a team March 10, 2024 07:49
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/ftl-update-checksum-mismatch-beta-v6/68777/15

automated install/basic-install.sh Outdated Show resolved Hide resolved
automated install/basic-install.sh Outdated Show resolved Hide resolved
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER merged commit 71b1729 into development-v6 Mar 11, 2024
14 checks passed
@DL6ER DL6ER deleted the fix/checking_the_checksum branch March 11, 2024 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug: fixed Contains a bug resolution Pi-hole v6.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants