7e69551be1
Merge pull request #1135 from pi-hole/dev
...
Dev
2022-07-10 14:00:27 +01:00
8a294e875f
Merge pull request #1130 from yubiuser/skip_install
...
Rename PH_TEST to SKIP_INSTALL
2022-07-10 13:53:32 +01:00
faf8e29751
Merge pull request #1133 from casperklein/dev
...
Silent capsh error output
2022-07-09 17:45:56 +01:00
39021c66f9
Merge branch 'dev' into dev
2022-07-09 17:39:25 +01:00
a957aba602
Merge pull request #1132 from pi-hole/master
...
sync: master to dev
2022-07-09 17:38:54 +01:00
50efb1f50c
Silent capsh error output
...
Signed-off-by: Casper <casperklein@users.noreply.github.com>
2022-07-09 01:59:22 +02:00
c784963b83
Build process complaining about atomicwrites version, up to 1.4.1 and regenerate lock file (Do I sound like I know what I'm talking about...?)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-08 22:08:05 +01:00
2f0fc391c4
Merge pull request #1131 from pi-hole/dev
...
Dev -> master before tagging
2022-07-08 19:19:24 +01:00
0ec6f866cd
Merge pull request #1115 from pi-hole/var-log-pihole
...
Account for renaming/moving of log files in main repos
2022-07-08 17:33:07 +01:00
33bae3207f
Also account for renaming of pihole-FTL.log -> FTL.log
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-08 17:25:29 +01:00
9fd7719638
Rename PH_TEST to SKIP_INSTALL
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-06 22:40:10 +02:00
b86db0fc3f
Merge branch 'dev' into var-log-pihole
2022-07-06 18:37:19 +01:00
795af5f87a
Merge pull request #1127 from yubiuser/fix/stale_reason
...
Fix close-issue-reason
2022-07-06 18:27:29 +01:00
d0b6c21f8f
Merge pull request #1128 from PeterDaveHelloKitchen/update-python-dependency
...
Update Python dependency - `urllib3` & `requests`
2022-07-06 18:22:12 +01:00
8153363b2d
Update Python dependency - urllib3 & requests
...
- Update urllib3 from v1.25.9 to v1.26.5
- Update requests from v2.22.0 to v2.28.1
There's a medium severity CVE in urllib3, before v1.26.5, but we can't
only just update urllib3 because there will be a dependency conflict.
requests also needs to be updated.
CVE reference:
https://www.cve.org/CVERecord?id=CVE-2021-33503
> An issue was discovered in urllib3 before 1.26.5. When provided with a
> URL containing many @ characters in the authority component, the
> authority regular expression exhibits catastrophic backtracking,
> causing a denial of service if a URL were passed as a parameter or
> redirected to via an HTTP redirect.
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
2022-07-06 01:50:48 +08:00
8fae8a1fdc
Fix close-issue-reason
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-05 10:24:37 +02:00
d038a96f5c
Merge branch 'dev' into var-log-pihole
2022-07-04 15:40:58 +01:00
855086caa7
Update s6/debian-root/etc/services.d/pihole-FTL/run
...
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-07-04 15:40:53 +01:00
c3a4a832dd
Merge pull request #1126 from yubiuser/less_stale
...
Run stale workflow only once a day at 08:00
2022-07-04 15:39:36 +01:00
aacc3efc93
Run stale workflow only once a day at 08:00
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-04 16:03:16 +02:00
543adf1f64
Merge branch 'dev' into var-log-pihole
2022-07-03 19:29:39 +01:00
b1c2555528
Merge pull request #1123 from PeterDaveHelloKitchen/update-python-dependency
...
Update Python dependency - urllib3 from v1.25.8 to v1.25.9
2022-07-03 19:28:59 +01:00
afdb7a110d
Merge pull request #1125 from pi-hole/master
...
sync: master to dev
2022-07-03 19:28:36 +01:00
4e6bc66ce5
Merge pull request #1124 from pi-hole/meta/readme_support_update
...
Update README.md
2022-07-02 10:11:51 +01:00
bb99fae517
Update README.md
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-01 13:05:11 -07:00
a6d0e49ed1
Update Python dependency - urllib3 from v1.25.8 to v1.25.9
...
https://www.cve.org/CVERecord?id=CVE-2020-26137
> urllib3 before 1.25.9 allows CRLF injection if the attacker controls
> the HTTP request method, as demonstrated by inserting CR and LF
> control characters in the first argument of putrequest(). NOTE: this
> is similar to CVE-2020-26116.
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
2022-06-30 18:44:31 +08:00
4399f41473
Merge pull request #1122 from pi-hole/master
...
sync: master to dev
2022-06-24 09:18:16 +01:00
dba2235c8d
Merge pull request #1121 from yubiuser/stale-issue-reason
...
Add stale-issue-reson: not_planned
2022-06-24 09:14:07 +01:00
b71bec2266
Add stale-issue-reson: not_planned
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-06-24 08:58:11 +02:00
05bf32abda
Update s6/debian-root/etc/services.d/lighttpd/run
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-06-12 17:56:47 +01:00
f17898bf6f
Also account for /var/log/lighttpd file name changes
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-12 13:37:39 +01:00
1900d567c9
Mop up some other references
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-12 13:10:12 +01:00
b7016668b4
Account for log files being moved to /var/log/pihole/
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-12 12:59:18 +01:00
1c369e3dea
Merge pull request #1111 from pi-hole/address-sonarr-complaints
...
Address Sonar complaints
2022-06-12 12:06:35 +01:00
96332db038
Merge pull request #1112 from mmvanheusden/patch-1
...
Remove a tab in the readme (typo)
2022-06-07 15:37:22 +01:00
60e252c414
Remove random tab in the readme
2022-06-07 16:06:15 +02:00
cb16942096
Address Sonar rules S125 ( https://rules.sonarsource.com/python/RSPEC-125 ) and S1481 ( https://rules.sonarsource.com/python/RSPEC-1481 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-06 22:04:44 +01:00
29f81fcfbc
Address Sonar rule S1192 ( https://rules.sonarsource.com/python/RSPEC-1192 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-06 21:58:09 +01:00
b3717000ae
Address Sonar rules S117 ( https://rules.sonarsource.com/python/RSPEC-117 ) and S1542( https://rules.sonarsource.com/python/RSPEC-1542 ) in all test .py files
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-06 21:26:47 +01:00
5b0ea12766
Merge pull request #1106 from pi-hole/use_env_webpassword
...
Always use WEBPASSWORD env var if set
2022-06-06 20:43:23 +01:00
64e449c133
fix [this code smell]( https://sonarcloud.io/project/issues?pullRequest=1106&issues=AYE6byrIbM3H9G6ifn9K&open=AYE6byrIbM3H9G6ifn9K&id=pi-hole_docker-pi-hole )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-06 20:26:26 +01:00
6b9a4e6216
Fix up tests to work with new logic
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-06 20:14:26 +01:00
67fc925153
Using the same format for the new message
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-05-30 17:31:57 -03:00
f9d990145a
Always use WEBPASSWORD env var if set
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-05-30 03:00:16 -03:00
9f9010edaa
Merge pull request #1104 from pi-hole/master
...
sync: master to dev
2022-05-24 22:27:41 +01:00
20e51e77da
Update sync-back-to-dev.yml
2022-05-24 22:26:29 +01:00
1570a7682e
Merge pull request #1102 from pi-hole/dev
...
Merge Dev->master for new tag
2022-05-23 17:18:02 +01:00
8cedb5b030
Merge pull request #1082 from canepan/patch-2
...
Update README.md to mention minimum required docker version
2022-05-23 17:16:54 +01:00
0e7013e890
Update README.md
2022-05-23 17:15:47 +01:00
c7d1fe5e82
Merge pull request #1088 from pi-hole/dependabot/github_actions/docker/build-push-action-3
...
Bump docker/build-push-action from 2 to 3
2022-05-23 17:11:09 +01:00
Adam Warner
Casper
Christian König
Peter Dave Hello
Dan Schaper
mmvanheusden
RD WebDesign
Adam Warner