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

Implement special domains whitelisting #1808

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Implement special domains whitelisting #1808

merged 1 commit into from
Dec 13, 2023

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 7, 2023 •
edited by dschaper
Loading

What does this implement/fix?

See #1807 - this is a backport of the feature for FTL v5.

Allows for fine grained application of the "special" domains that manage Apple Private Relay and Firefox Canary domains. When you apply them only to one group this effectively disables the special handling for this group while it stays intact for the rest or your network.

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
Change priorities such that special domains (Firefox and Apple at thi…
05b6894 
…s time) can be explicitly allowed for some clients (per group assignments) while they stay blocked for all others in the network

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team December 7, 2023 17:20
@DL6ER DL6ER marked this pull request as ready for review December 7, 2023 17:21
@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/icloud-private-relay-problems/66764/13

@dschaper
Copy link
Member

dschaper commented Dec 7, 2023

This is the impetus for the PR's code.

Is it possible to create a special group (in PiHole) that will not block iCloud Private Relay (while default settings for default group will perform blocking)?

@dschaper
Copy link
Member

dschaper commented Dec 7, 2023

This will need documentation to instruct how to use the changes.

yubiuser
yubiuser reviewed Dec 8, 2023
View reviewed changes
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you also adding the CI test commit here?

@dschaper
Copy link
Member

dschaper commented Dec 8, 2023

Testing:

pihole checkout ftl tweak/special_domains_prio_v5

and check if adding

mask.icloud.com
mask-h2.icloud.com

and then assigning them to the group you want the feature being disabled.

@DL6ER DL6ER merged commit dfbdaaa into development Dec 13, 2023
20 checks passed
@DL6ER DL6ER deleted the tweak/special_domains_prio_v5 branch December 13, 2023 18:45
@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/pi-hole-ftl-v5-24-and-core-v5-17-3-released/67486/1

PrivatePuffin referenced this pull request in truecharts/public Jan 9, 2024
@truecharts-admin
chore(deps): update container image pihole/pihole to v2024.01.0@d095e…
9a33cb3 
…c4 by renovate (#17027)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [pihole/pihole](https://github.com/pi-hole/docker-pi-hole) | major |
`2023.11.0` -> `2024.01.0` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>pi-hole/docker-pi-hole (pihole/pihole)</summary>

###
[`v2024.01.0`](https://github.com/pi-hole/docker-pi-hole/releases/tag/2024.01.0)

[Compare
Source](https://github.com/pi-hole/docker-pi-hole/compare/2023.11.0...2024.01.0)

Nothing docker specific this time around.

<!-- Release notes generated using configuration in .github/release.yml
at development -->

#### What's Changed (FTL v5.24)

- Update dependabot.yml by
[@&#8203;PromoFaux](https://github.com/PromoFaux) in
[https://github.com/pi-hole/FTL/pull/1587](https://github.com/pi-hole/FTL/pull/1587)
- Add pihole-FTL sqlite3 -ni by
[@&#8203;DL6ER](https://github.com/DL6ER) in
[https://github.com/pi-hole/FTL/pull/1820](https://github.com/pi-hole/FTL/pull/1820)
- Fix possible crash with high client activity by
[@&#8203;DL6ER](https://github.com/DL6ER) in
[https://github.com/pi-hole/FTL/pull/1777](https://github.com/pi-hole/FTL/pull/1777)
- Implement special domains whitelisting by
[@&#8203;DL6ER](https://github.com/DL6ER) in
[https://github.com/pi-hole/FTL/pull/1808](https://github.com/pi-hole/FTL/pull/1808)

**Full Changelog**: pi-hole/FTL@v5.23...v5.24

<!-- Release notes generated using configuration in .github/release.yml
at development -->

#### What's Changed (Core v5.17.3)

- Add "-ni" to all sqlite3 invocations (v5) by
[@&#8203;DL6ER](https://github.com/DL6ER) in
[https://github.com/pi-hole/pi-hole/pull/5519](https://github.com/pi-hole/pi-hole/pull/5519)

**Full Changelog**:
pi-hole/pi-hole@v5.17.2...v5.17.3

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 10pm on monday" in timezone
Europe/Amsterdam, Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://github.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMjYuMiIsInVwZGF0ZWRJblZlciI6IjM3LjEyNi4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->

Signed-off-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Co-authored-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
@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/why-would-you-want-to-block-icloud-private-relay-by-default/67788/4

GabrielBarzen referenced this pull request in GabrielBarzen/charts Feb 2, 2024
@truecharts-admin
chore(deps): update container image pihole/pihole to v2024.01.0@d095e…
87005a6 
…c4 by renovate (truecharts#17027)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [pihole/pihole](https://github.com/pi-hole/docker-pi-hole) | major |
`2023.11.0` -> `2024.01.0` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>pi-hole/docker-pi-hole (pihole/pihole)</summary>

###
[`v2024.01.0`](https://github.com/pi-hole/docker-pi-hole/releases/tag/2024.01.0)

[Compare
Source](https://github.com/pi-hole/docker-pi-hole/compare/2023.11.0...2024.01.0)

Nothing docker specific this time around.

<!-- Release notes generated using configuration in .github/release.yml
at development -->

#### What's Changed (FTL v5.24)

- Update dependabot.yml by
[@&truecharts#8203;PromoFaux](https://github.com/PromoFaux) in
[https://github.com/pi-hole/FTL/pull/1587](https://github.com/pi-hole/FTL/pull/1587)
- Add pihole-FTL sqlite3 -ni by
[@&truecharts#8203;DL6ER](https://github.com/DL6ER) in
[https://github.com/pi-hole/FTL/pull/1820](https://github.com/pi-hole/FTL/pull/1820)
- Fix possible crash with high client activity by
[@&truecharts#8203;DL6ER](https://github.com/DL6ER) in
[https://github.com/pi-hole/FTL/pull/1777](https://github.com/pi-hole/FTL/pull/1777)
- Implement special domains whitelisting by
[@&truecharts#8203;DL6ER](https://github.com/DL6ER) in
[https://github.com/pi-hole/FTL/pull/1808](https://github.com/pi-hole/FTL/pull/1808)

**Full Changelog**: pi-hole/FTL@v5.23...v5.24

<!-- Release notes generated using configuration in .github/release.yml
at development -->

#### What's Changed (Core v5.17.3)

- Add "-ni" to all sqlite3 invocations (v5) by
[@&truecharts#8203;DL6ER](https://github.com/DL6ER) in
[https://github.com/pi-hole/pi-hole/pull/5519](https://github.com/pi-hole/pi-hole/pull/5519)

**Full Changelog**:
pi-hole/pi-hole@v5.17.2...v5.17.3

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 10pm on monday" in timezone
Europe/Amsterdam, Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://github.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMjYuMiIsInVwZGF0ZWRJblZlciI6IjM3LjEyNi4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->

Signed-off-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Co-authored-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
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

Assignees
No one assigned
Labels
Discourse Feature Request Documentation needed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DL6ER @pralor-bot @dschaper @yubiuser