Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 18:53:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
5819 commits 8 branches 109 tags 27 MiB
Commit graph

5819 commits

This branch
This branch
All branches
Author SHA1 Message Date
RD WebDesign
66ed7c9ea3
Declaring all local variables under the function declaration line 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-03-21 16:34:50 -03:00
Adam Warner
ac2f13adef
Allow pihole -q to match subdomains using ABP style domains (#5210) 2023-03-21 15:39:11 +00:00
RD WebDesign
6b919f3a2e
Removing unnecessary commas 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-03-21 12:27:20 -03:00
Adam Warner
4d21bae669
Fix addKey to handle substrings of existing keys (#5211) 2023-03-21 12:31:01 +00:00
yubiuser
7ea0bbb85c
Bump tox from 4.4.6 to 4.4.7 in /test (#5215) 2023-03-18 13:58:43 +01:00
yubiuser
3ddec99f4a
Bump pytest-xdist from 3.2.0 to 3.2.1 in /test (#5214) 2023-03-18 13:57:49 +01:00
yubiuser
e1f12668fa
Bump actions/checkout from 3.3.0 to 3.4.0 (#5213) 2023-03-18 13:53:15 +01:00
dependabot[bot]
686da5a948
Bump tox from 4.4.6 to 4.4.7 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.6 to 4.4.7.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.4.6...4.4.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-18 10:58:57 +00:00
dependabot[bot]
8a2829de87
Bump pytest-xdist from 3.2.0 to 3.2.1 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.2.0...v3.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-18 10:58:49 +00:00
dependabot[bot]
3a592e56ba
Bump actions/checkout from 3.3.0 to 3.4.0 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.3.0...v3.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-18 10:56:52 +00:00
William Blew
3c91b6558d
restore the addKey comment, reworded for anchors 
Per @dschaper, restore the addKey clarifying comment. It has
been reworded to describe the use of anchors where before it
referenced using grep's  'match only an entire line' argument.

Signed-off-by: William Blew <william@kulian.org>
 2023-03-17 11:50:53 -07:00
William Blew
b9a6970bfd
Fix addKey to handle substrings of existing keys 
Fix addKey to handle the case where a key is being added, and that key
is the leading substring of an already existing key within that file.

For example: add "server=192.168.1.1", when "server=192.168.1.178"
already exists within the /etc/dnsmasq.d/01-pihole.conf file.

Check pihole docker with PIHOLE_DNS="192.168.1.178;192.168.1.1". Its
/etc/dnsmasq/01-pihole.conf will be missing its second server= entry.

Add the test_key_addition_substr, to test addKey when
its adding a substring key of an existing key in the file.

Signed-off-by: William Blew <william@kulian.org>
 2023-03-17 11:50:52 -07:00
RD WebDesign
20f8c6af3c
Search for ABP entries only if they exist in gravity.db 
and use `abp_domains` property.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-03-17 14:17:53 -03:00
RD WebDesign
c35ed68051
Allow pihole -q matching ABP subdomains 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-03-14 17:31:39 -03:00
Dan Schaper
75a32d22a3
Allow limited parsing of ABP style adlists (#5179) 2023-03-14 13:23:03 -07:00
Christian König
71e262c37f
Revert "Allow final dot (root zone)" 
This reverts commit 0b5da9f0da.

Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-03-14 19:50:53 +01:00
Dan Schaper
04b909c837
Convert domain to lowercase in pihole -q (#5200) 2023-03-07 17:49:51 -08:00
Christian König
309ee78903
Use distinct variabled 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-03-07 20:40:16 +01:00
Christian König
d6f5552ccf
Convert domain to lowercase in pihole -q 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-03-06 21:52:54 +01:00
yubiuser
67a973a17d
Bump pytest from 7.2.1 to 7.2.2 in /test (#5194) 2023-03-04 13:44:43 +01:00
dependabot[bot]
0b60601f86
Bump pytest from 7.2.1 to 7.2.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.1 to 7.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.2.1...7.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>
 2023-03-04 10:57:42 +00:00
Christian König
0b5da9f0da
Allow final dot (root zone) 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-03-04 10:36:07 +01:00
Dan Schaper
0589641bf0
GitHub Workflows security hardening (#5053) 2023-03-02 14:36:00 -08:00
Alex
ddf972cede
build: harden workflow permissions 
Signed-off-by: Alex <aleksandrosansan@gmail.com>
 2023-03-02 22:18:00 +01:00
MichaIng
73de49323c
Remove systemd service and optionally override configs on uninstall 
This has been forgotten when adding the new native systemd service.

Signed-off-by: MichaIng <micha@dietpi.com>
 2023-02-27 16:51:32 +01:00
Christian König
16385af3ef
Use dedicated pattern variable to make RegEx reusable 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-26 21:16:45 +01:00
Christian König
6cb0be82ca
Add flag abp_domains into info table to signal if abp domains have been found 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-26 10:34:17 +01:00
yubiuser
2dd31ce6ee
Bump tox from 4.4.5 to 4.4.6 in /test (#5187) 2023-02-25 14:25:05 +01:00
dependabot[bot]
31a9e18997
Bump tox from 4.4.5 to 4.4.6 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.5 to 4.4.6.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.4.5...4.4.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-25 10:57:18 +00:00
Christian König
821c7dc190
Add info when list cotains ABP style domains 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-24 22:18:41 +01:00
Christian König
eedd93d782
Remove temporary files 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-24 21:55:22 +01:00
Adam Warner
c5faf3d174
Use ',' as the separator char in query rather than the default '|' as we now expect some valid results to contain '|' 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-22 21:21:38 +01:00
Adam Warner
1f3f849106
Remove lines starting with ! or [ to account for ABP style comments and header 
Also splits the piped "one-liner" in ParseFileIntoDomains into individually commented commands (makes for easier reading and debugging)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-22 21:21:38 +01:00
Christian König
ca74152d1d
Allow adding ABP style blocklists 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-22 21:21:13 +01:00
Christian König
4fd0f15d90
Ignore commented lines when reding PRIVACYLEVEL from config file 
Create dedicated getVal function in utils.sh as it might be useful somewhere else
Account for tailing comments and $key not being on the first line

Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-21 21:03:55 +01:00
Adam Warner
b9f19fc357
Sync master back into development (#5166) 2023-02-21 20:03:27 +00:00
Dan Schaper
2380359270
Bump pytest-xdist from 3.1.0 to 3.2.0 in /test (#5170) 2023-02-21 11:40:13 -08:00
Dan Schaper
d75adb49f4
Use buildx to create docker test images (#5178) 2023-02-16 13:55:00 -08:00
Christian König
90da155053
Use buildx to create docker test images 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-16 21:43:30 +01:00
yubiuser
2a61a03bdf
Don't use intermediate strings to filter false positives in gravity (#5176) 2023-02-16 19:02:43 +01:00
Christian König
a4bdf2454b
Don't use intermediate strings to filter false positives in gravity 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-16 10:39:21 +01:00
Christian König
4b503a080b
Revert "Use new worksteal distribution algorithm" 
This reverts commit 46fe37b4da.

Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-14 22:14:29 +01:00
Christian König
46fe37b4da
Use new worksteal distribution algorithm 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-14 21:12:12 +01:00
dependabot[bot]
d6275cdd7c
Bump pytest-xdist from 3.1.0 to 3.2.0 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.1.0...v3.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-13 09:04:19 +00:00
yubiuser
45cab12392
Bump tox from 4.4.4 to 4.4.5 in /test (#5169) 2023-02-13 10:01:34 +01:00
dependabot[bot]
5ecdfb53c2
Bump tox from 4.4.4 to 4.4.5 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.4 to 4.4.5.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.4.4...4.4.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-11 10:57:20 +00:00
Adam Warner
d86b325dfe
Only search for "OVERWRITTEN BY PI-HOLE" when checking inside lighttpd.conf (#5167) 2023-02-10 20:57:03 +00:00
Adam Warner
c65ea9c47c
Adam does not always think things through completly. He will go and sit on the naughty step now. 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 20:49:58 +00:00
Adam Warner
741717aa38
Pi-hole core v5.15.4 (#5165) 2023-02-10 18:59:18 +00:00
Adam Warner
2d13cd2f1d
Bump tox from 4.3.5 to 4.4.4 in /test (#5159) 2023-02-09 18:35:28 +00:00