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.

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

When setting a blank password, use webserver.api.password instead of webserver.api.pwhash #5465

Merged
merged 2 commits into from
Nov 4, 2023

Conversation

PromoFaux
Copy link
Member

What does this PR aim to accomplish?:

Per title, uses the correct config item to set an empty password (rather than forcible clearing out the hash)

This also prevents the password from being set to empty when someone has already set it to a value with FTLCONF_webserver_api_password

Without environment variable set:

image

With environment variable set:
image


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 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
  5. 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

…f `webserver.api.pwhash` (fixed in pi-hole/FTL#1702)

This prevents the password from being blanked out on the command line when it has been set by an environment variable
adjust output of setFTLConfigValue to test for the exit code of `pihole-FTL --config`
@PromoFaux PromoFaux requested a review from a team October 28, 2023 18:52
@DL6ER DL6ER merged commit 395110f into development-v6 Nov 4, 2023
14 checks passed
@DL6ER DL6ER deleted the fix/empty_password branch November 4, 2023 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants