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

Treat FTL return data as strings #5509

Merged
merged 2 commits into from
Dec 9, 2023
Merged

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Dec 6, 2023

What does this PR aim to accomplish?:

Fixes a bug reported on Discourse: when FTL return a RegEx which fits a domain searched by with pihole -q it can error due to invalid escape. This only occurs because we use sh as shebang for the query script.

How does this PR accomplish the above?:

Replace echo calls with printf %s.

Fix confirmed working by OP on discourse.


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)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

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

Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser requested a review from a team December 6, 2023 12:48
@yubiuser
Copy link
Member Author

yubiuser commented Dec 6, 2023

Mhh....

Setected x86_64 architecture\n  [i] Checking for existing FTL binary...\n  [i] Branch "development" is not available.

Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser merged commit 2529fbe into development-v6 Dec 9, 2023
15 checks passed
@yubiuser yubiuser deleted the fix/escape_FTL_return branch December 9, 2023 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants