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.

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

Jump to bottom

Pi-hole FTL v6.0.4 #2308

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open

Pi-hole FTL v6.0.4 #2308

wants to merge 35 commits into from

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Mar 1, 2025 •
edited
Loading

What does this implement/fix?

A patch release containing

Those can also wait in case we do not have enough reviewing capacities available:

Changes for v6.1

Related issue or feature (if applicable): N/A

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.

DL6ER and others added 13 commits February 24, 2025 21:19
@DL6ER
Add specific validator for webserver.paths.webhome ensuring there are…
be6be2b 
… slashes both at the beginning and the end of the string

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Also validate env variables. They use whatever is in pihole.toml anyw…
efc51ed 
…ay if invalid

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Prevent crash on failure to source secure randomness
511ddae 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #2276 from pi-hole/tweak/validate_filepath_two_slash
0c9a3cd 
Add webhome validator
@DL6ER
Change default value of webserver.threads to 50, make 0 behave as if …
2aeccfb 
…the user has set 50 (for backwards-compatibility reasons) and remove the upper limit we enforced on the number of threads.

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Increase scope of mbedtls entropy gathering and random number generat…
7c0deab 
…or to application-wide scope

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Use /etc/machine-id (the unique 128-bit machine ID of the local syste…
99165db 
…m that is set during installation or boot) for random number generation initialization

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add two fallback options to secure randomness generation. If getrando…
778cc66 
…m() fails, we first try manually sourcing from /dev/urandom ourselves to exclude this being a simple library error. If this does not work either, we resort to using mbedtls' DRBG method.

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #2294 from pi-hole/tweak/validate_envs
ff1a528 
Also validate env variables
@DL6ER
Reduce code duplication in init_entropy()
b943517 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #2302 from pi-hole/master
0840849 
Sync master back into development
@DL6ER
Remove debug logging and convert a few INFO to DEBUG_API messages to …
1bd92e7 
…avoid spamming user logs on systems which are permanently broken

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #2300 from pi-hole/fix/randomness_crash
d154623 
Prevent crash on failure to source secure randomness
@DL6ER DL6ER added the Release label Mar 1, 2025
DL6ER added 7 commits March 1, 2025 09:04
@DL6ER
Only load *.conf files from /etc/dnsmasq.d when misc.etc_dnsmasq_d ==…
a90e9f6 
… true

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Exclude new IPv6 clients from skipping due to the setting of resolver…
4f614ab 
….refreshNames as we are not refreshing but resolving for the first time here

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Fix API_EXCLUDE_DOMAINS migration
894e01f 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Updatae CivetWeb to their latest master branch
96f1003 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Log if the port was bound to
6093a15 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Always provide errbuf, even it was are not going to use it outside of…
5050d8e 
… write_dnsmasq_conf(). Add nonnull attribute that ensures this cannot be forgotten again in the future.

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Make identical DHCP start and end addresses a valid configuration as …
c4aa747 
…users may be using dhcp-host lines to assign only static addresses which can be outside this range

Signed-off-by: DL6ER <[email protected]>
@DL6ER DL6ER requested a review from a team March 1, 2025 11:30
@DL6ER DL6ER marked this pull request as ready for review March 1, 2025 11:30
@DL6ER DL6ER enabled auto-merge March 1, 2025 11:30
yubiuser
yubiuser previously approved these changes Mar 3, 2025
View reviewed changes
@DL6ER
Merge pull request #2310 from pi-hole/fix/ipv6_resolution
e98cb36 
Fix first-time IPv6 client name resolution
DL6ER and others added 6 commits March 3, 2025 11:18
@DL6ER
Merge pull request #2311 from pi-hole/fix/migrate_API_EXCLUDE_DOMAINS
be0f53e 
Fix API_EXCLUDE_DOMAINS migration
@DL6ER
Add warning about the possible causes of conflicting config files in …
7606cf3 
…/etc/dnsmasq.d/ to the help text of misc.etc_dnsmasq_d

Signed-off-by: DL6ER <[email protected]>
@simonkelley @DL6ER
Revert 368ceff6e09941412ca58effb57e30ed78410a3e and fix correct problem.
0a794f4 
The next() function is broken for any TFTP packet with padding
which doesn't end with a zero.

Rewrite to handle such packets.

Thanks to Helge Deller <[email protected]> for persisting in finding the
actual problem and proposing a solution. This patch is modelled on his,
but rewritten for personal preference by Simon Kelley, who is
responsible for all bugs.

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Update dnsmasq tag to 2.91rc5+1
df05023 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #2323 from pi-hole/update/dnsmasq
a4c6cff 
Update embedded dnsmasq
@DL6ER
Merge pull request #2309 from pi-hole/tweak/conf-dir
805cc0d 
Tweak misc.etc_dnsmasq_d help text and scope - only read *.conf files
@DL6ER DL6ER requested review from yubiuser and a team March 3, 2025 12:03
@DL6ER DL6ER disabled auto-merge March 3, 2025 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yubiuser yubiuser yubiuser approved these changes

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
Release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DL6ER @yubiuser @simonkelley