Skip to content

Sync master back into development - #48

Open
github-actions[bot] wants to merge 382 commits into
developmentfrom
master
Open

Sync master back into development#48
github-actions[bot] wants to merge 382 commits into
developmentfrom
master

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 4, 2024

Copy link
Copy Markdown

Created by Github action

PromoFaux and others added 30 commits March 21, 2023 15:39
@PromoFaux
Allow pihole -q to match subdomains using ABP style domains (pi-hol…
ac2f13a 
…e#5210)
@rdwebdesign
Declaring all local variables under the function declaration line
66ed7c9 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@kot0dama
Add configurable GRAVITY_TMPDIR variable into setupVars
76b7453 
Signed-off-by: Loïc Gomez <89980752+kot0dama@users.noreply.github.com>
@dschaper
Declaring all local variables under the function declaration line (pi…
c255082 
…-hole#5219)
@dschaper
Add configurable GRAVITY_TMPDIR variable into setupVars (pi-hole#5216)
8f09a1d
@dschaper
Remove ftl systemd service and optionally service override files in u…
536b349 
…ninstall script (pi-hole#5183)
@dschaper
Ignore commented lines when reading PRIVACYLEVEL from config file (pi…
fb032ea 
…-hole#5177)
@PromoFaux
Release v5.16 (pi-hole#5220)
c6d1137
@PromoFaux
Revert "Ignore commented lines when reading PRIVACYLEVEL from config …
58275ec 
…file"
@dschaper
Revert "Ignore commented lines when reading PRIVACYLEVEL from config …
edbaf6d 
…file" (pi-hole#5223)
@yubiuser
Fix getting 'privacylevel'
c96463b 
Signed-off-by: Christian König <ckoenig@posteo.de>
@PromoFaux
Fix getting 'privacylevel' (pi-hole#5224)
1dc3312
@PromoFaux
Release v5.16.1 (pi-hole#5226)
8ca5788
@ipitio
remove old comments
fa11638 
Signed-off-by: ipitio <21136719+ipitio@users.noreply.github.com>
@dependabot
Bump actions/stale from 7.0.0 to 8.0.0
95b12ba 
Bumps [actions/stale](https://github.com/actions/stale) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](actions/stale@v7.0.0...v8.0.0)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@PromoFaux @dschaper @DL6ER
Speed things up a bit with some humble greps. Consolodate regexes and…
0656ceb 
… remove the need for so many mapfile/arrays

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Use temp files for parsing and remove when done.

Always rm the non-domains temp file.

exit 1 if gravity database creation fails.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Co-authored-by: DL6ER <dl6er@dl6er.de>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
@dschaper
Fix for gravity's unchecked resource consumption. (pi-hole#5234)
9d4a69c
@dschaper
Hotfix Core v5.16.2 (pi-hole#5235)
d885e92
@rdwebdesign
Allow TLD blocking using ABP style
c71460e 
This validates patterns without dots (only for abp style), allowing TLDs to be blocked

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign
Spliting the regex into TLD_pattern and subdomain_pattern
32fb2e6 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign
Using a better text for the comment
66bfa60 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@PromoFaux
Allow TLD blocking using ABP style (pi-hole#5240)
56eae4a
@yubiuser @rdwebdesign
Unifiy sed commands
61ff5b2 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser @PromoFaux
Remove lines with ABP extended CSS selector
cc17fe1 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Don't delete lines containing / as they should count as invalid
2a0f720 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Remove special handling of pgl.yoyo.org
9c4e74f 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Remove unecessary $cmd_ext
aaf8281 
Signed-off-by: Christian König <ckoenig@posteo.de>
@PromoFaux
Remove special handling of pgl.yoyo.org (pi-hole#5249)
b9cf2d9
@yubiuser
There is no ! but an $ rule
d10d593 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Only delete lines containing separator when preceded by a letter to r…
dd3a7a4 
…educe false positiv (deleting valid comments)

Signed-off-by: Christian König <ckoenig@posteo.de>
dependabot Bot and others added 28 commits May 4, 2024 10:15
@dependabot
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test
29d4ed1 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.5.0 to 3.6.1.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](pytest-dev/pytest-xdist@v3.5.0...v3.6.1)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test (pi-hole#5647)
976dc1c
@dependabot
Bump pytest from 8.1.2 to 8.2.0 in /test
9f7cd05 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.2 to 8.2.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.1.2...8.2.0)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump pytest from 8.1.2 to 8.2.0 in /test (pi-hole#5648)
2371f43
@yubiuser @PromoFaux
Add Ubuntu 24.04 and Fedora 40, remove Fedora 38
c0cc9ba 
Signed-off-by: Christian König <ckoenig@posteo.de>
@dependabot
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1
7426076 
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases)
- [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md)
- [Commits](eps1lon/actions-label-merge-conflict@v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1 (pi-hol…
1812d9c 
…e#5655)
@dependabot
Bump actions/checkout from 4.1.4 to 4.1.5
f478913 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4.1.4...v4.1.5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump actions/checkout from 4.1.4 to 4.1.5 (pi-hole#5656)
99e72f6
@dependabot
Bump actions/checkout from 4.1.5 to 4.1.6
443c5e8 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.5 to 4.1.6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4.1.5...v4.1.6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump actions/checkout from 4.1.5 to 4.1.6 (pi-hole#5661)
dd64cf7
@dependabot
Bump pytest from 8.2.0 to 8.2.1 in /test
01e0c60 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.0 to 8.2.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.2.0...8.2.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Fix codespell
d15beff 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Bump pytest from 8.2.0 to 8.2.1 in /test (pi-hole#5665)
741b9e1
@dependabot
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2
70376c2 
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases)
- [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md)
- [Commits](eps1lon/actions-label-merge-conflict@v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 (pi-hol…
78bd872 
…e#5669)
@dependabot
Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test
36f05cb 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 10.1.0 to 10.1.1.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest-testinfra@10.1.0...10.1.1)

---
updated-dependencies:
- dependency-name: pytest-testinfra
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test (pi-hole#5672)
3cf538e
@dependabot
Bump actions/checkout from 4.1.6 to 4.1.7
fdd5b5c 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.6 to 4.1.7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4.1.6...v4.1.7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump actions/checkout from 4.1.6 to 4.1.7 (pi-hole#5686)
1e6fe9c
@PromoFaux
remove centos8 tests from development to prevent build fails (yes, I …
97324ae 
…know it's likely that we will merge development-v6 -> development" soon" but.. just in case)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@dependabot @PromoFaux
Bump tox from 4.15.0 to 4.15.1 in /test
bfc2cf6 
Bumps [tox](https://github.com/tox-dev/tox) from 4.15.0 to 4.15.1.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@4.15.0...4.15.1)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @PromoFaux
Bump pytest from 8.2.1 to 8.2.2 in /test
548e142 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.1 to 8.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.2.1...8.2.2)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@DL6ER @PromoFaux
Add protocol validation when downloading blocklist from URL
2c497a9 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@PromoFaux
tabs->spaces for editorconfig (Not sure how this has nto been caught …
4148f2c 
…before...)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux
Pi-hole core v5.18.3 (pi-hole#5694)
be5a8dc
@PromoFaux
remove development-v6 references from dependabot yml
76d7863 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux
remove development-v6 references from dependabot yml (pi-hole#5749)
3df0a6a
github-advanced-security[bot]
github-advanced-security AI found potential problems Sep 4, 2024
View reviewed changes
Comment thread test/test_any_automated_install.py
"""
)

assert "pi-hole.net" in check1.stdout

Check failure

Code scanning / CodeQL

Incomplete URL substring sanitization

The string [pi-hole.net](1) may be at an arbitrary position in the sanitized URL.
Comment thread test/test_any_automated_install.py
)

assert "pi-hole.net" in check1.stdout
assert "ab.pi-hole.net" in check2.stdout

Check failure

Code scanning / CodeQL

Incomplete URL substring sanitization

The string [ab.pi-hole.net](1) may be at an arbitrary position in the sanitized URL.
Comment thread test/test_any_automated_install.py

assert "pi-hole.net" in check1.stdout
assert "ab.pi-hole.net" in check2.stdout
assert "abc.pi-hole.net" in check3.stdout

Check failure

Code scanning / CodeQL

Incomplete URL substring sanitization

The string [abc.pi-hole.net](1) may be at an arbitrary position in the sanitized URL.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

internal

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.