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

[WIP] Make PADD compatible with FTLv6 #247

Draft

yubiuser wants to merge 55 commits into development from PADD_FTLv6

Member

yubiuser commented Jul 18, 2022 •

edited

What does this PR aim to accomplish?:

Makes PADD compatible with FTLv6's new API.
There is a second goal: if all necessary information are available via the API one can run PADD remotely.

Important: PADD now needs jq to parse the JSON data.

This is work in progress
As long the FTL's API is changing things can break within PADD anytime. However, I try to keep development in sync. Currently, everything should be working.

By submitting this pull request, I confirm the following:

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.
I have commented my proposed changes within the code and I have tested my changes.
I am willing to help maintain this change if there are issues with it later.
It is compatible with the EUPL 1.2 license
I have squashed any insignificant commits. (git rebase)

I have read the above and my PR is ready for review. Check this box to confirm

yubiuser added 12 commits

July 19, 2022 15:10


          Add FTL communication

dbe726d

Signed-off-by: Christian König <ckoenig@posteo.de>


          Improve exit routines

8916cb2

Signed-off-by: Christian König <ckoenig@posteo.de>


          Add TestAPIAvailability()

55ade42

Signed-off-by: Christian König <ckoenig@posteo.de>


          Use API for GetSummaryInformation

cea974e

Signed-off-by: Christian König <ckoenig@posteo.de>


          Use API for GetSystemInformation

0df566a

Signed-off-by: Christian König <ckoenig@posteo.de>


          Use API for GetNetworkInformation

67184b7

Signed-off-by: Christian König <ckoenig@posteo.de>


          Use API for GetVersionInformation

f92afc7

Signed-off-by: Christian König <ckoenig@posteo.de>


          Remove CheckConnectivity

7531a1a

Signed-off-by: Christian König <ckoenig@posteo.de>


          Set DHCP_ROUTER via API, turn cursor back on when exiting

cc9a9f8

Signed-off-by: Christian König <ckoenig@posteo.de>


          Make OutputJSON compatible with FTLv6

0e00879

Signed-off-by: Christian König <ckoenig@posteo.de>


          Remove commas between component's version

bb6f8b3

Signed-off-by: Christian König <ckoenig@posteo.de>


          Rebase on development including new VersionConverter()

afd573e

Signed-off-by: Christian König <ckoenig@posteo.de>

yubiuser force-pushed the PADD_FTLv6 branch from 11468f9 to afd573e Compare

July 19, 2022 13:20

yubiuser mentioned this pull request

Add jq as dependency and remove json_extract pi-hole/pi-hole#4878

Merged

1 task

yubiuser added a commit to pi-hole/pi-hole that referenced this pull request


          Add jq as dependency and remove json_extract (#4878)

d6cfa57

 **What does this PR aim to accomplish?:**

Adds `jq` as dependency and removes the now obsolete `json_extract` function.
`jq` is a small dependency and adds powerfull json abilities. With `FTL v6` we will have a whole new json-based API where `jq` might be needed anyway. Also for `PADD` to interact with `FTL v6`, `jq` will be a requirement: pi-hole/PADD#247

---
**By submitting this pull request, I confirm the following:** 

1. I have read and understood the [contributors guide](https://docs.pi-hole.net/guides/github/contributing/), 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 and I have tested my changes.
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](https://opensource.org/licenses/EUPL-1.1)
5. I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html))

---
- [x] I have read the above and my PR is ready for review. _Check this box to confirm_

github-actions bot added the Merge Conflict label

github-actions bot commented Dec 19, 2022

This pull request has conflicts, please resolve those before we can evaluate the pull request.

yubiuser added the Never Stale label

yubiuser added 2 commits

January 6, 2023 21:36


          Don't allow $validSession to be empty

2096d3b

Signed-off-by: Christian König <ckoenig@posteo.de>


          Merge branch 'development' into PADD_FTLv6

699e0bd

Signed-off-by: Christian König <ckoenig@posteo.de>

github-actions bot removed the Merge Conflict label

github-actions bot commented Jan 14, 2023

Conflicts have been resolved.


          Mix merge mess

a726df6

Signed-off-by: Christian König <ckoenig@posteo.de>

yubiuser force-pushed the PADD_FTLv6 branch from b8dc14d to a726df6 Compare

January 14, 2023 13:47

yubiuser added 5 commits

January 16, 2023 21:06


          Adjust to current FTL endpoints

70e33c1

Signed-off-by: Christian König <ckoenig@posteo.de>


          Mask user password during input

1a23a9c

Signed-off-by: Christian König <ckoenig@posteo.de>


          Format memory_percentage

d3a209e

Signed-off-by: Christian König <ckoenig@posteo.de>


          Merge branch 'development' into PADD_FTLv6

b1a2fb3


          Adjust for changed API endpoint

e0f78cf

Signed-off-by: Christian König <ckoenig@posteo.de>

github-actions bot added the Merge Conflict label

rdwebdesign and others added 7 commits

July 31, 2023 18:46


          Add on the help text the missing dash for xoff and yoff options

36257d1

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>


          Fix spellcheck and a few spaces

794d7b0

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>


          Fix the missing dash for some options on the help text (#361)

9b8dc56


          When running locally derive port from FTL itself

4a69af0

Signed-off-by: Christian König <ckoenig@posteo.de>


          Remove space

b67b0fb

Signed-off-by: Christian König <ckoenig@posteo.de>


          When running locally derive port from FTL itself (#362)

c6e8f07


          Merge branch 'development' into PADD_FTLv6

d221947

github-actions bot added the Merge Conflict label

github-actions bot commented Sep 24, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.


          Merge branch 'development' into PADD_FTLv6

2bed00c

Signed-off-by: Christian König <ckoenig@posteo.de>

github-actions bot commented Sep 24, 2023

Conflicts have been resolved.

github-actions bot added Merge Conflict and removed Merge Conflict labels

github-actions bot commented Sep 24, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

yubiuser added 3 commits

December 2, 2023 21:53


          Use CHAOS TXT to connect to FTL's API

9aee138

Signed-off-by: Christian König <ckoenig@posteo.de>


          Adjust endpoints

1b243f4

Signed-off-by: Christian König <ckoenig@posteo.de>


          Merge branch 'development' into PADD_FTLv6

b1dc435

Signed-off-by: Christian König <ckoenig@posteo.de>

github-actions bot removed the Merge Conflict label

github-actions bot commented Dec 2, 2023

Conflicts have been resolved.

yubiuser and others added 11 commits

December 5, 2023 22:19


          Cover --server localhost case

a41dcd0

Signed-off-by: Christian König <ckoenig@posteo.de>


          Improve error handling

266a711

Signed-off-by: Christian König <ckoenig@posteo.de>


          The correct key is config.dns.revServer.active

353c003

Signed-off-by: DL6ER <dl6er@dl6er.de>


          The correct key is config.dns.revServer.active (#378)

c835824


          moveXOffset

2455fff

Signed-off-by: Christian König <ckoenig@posteo.de>


          Return N/A in case FTL can't figure out the device model

ec305e6

Signed-off-by: Christian König <ckoenig@posteo.de>


          Deleting a session successfully returns 204

ec5a26a

Signed-off-by: Christian König <ckoenig@posteo.de>


          Use CHAOS TXT record to construct FTL's API URL (#376)

b625aca


          Status 200 is gone

79ca42e

Signed-off-by: Christian König <ckoenig@posteo.de>


          Nicer output if no session needed to be deleted

d58149d

Signed-off-by: Christian König <ckoenig@posteo.de>


          Deleting a session successfully returns 204 (#379)

50f359d

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment