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

/api/search/{domain}: Add IDN compatibility #1715

Merged
merged 4 commits into from
Oct 31, 2023
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Oct 30, 2023

What does this implement/fix?

Lowercase domains passed to GET /api/search/{domain} and convert them to punycode (if applicable), e.g., GET /api/search/äBC.cOm (mind the Umlaut ä) will now actually trigger a search for xn--bc-uia.com

Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


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

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

@DL6ER DL6ER requested a review from a team October 30, 2023 09:05
@DL6ER DL6ER changed the title /api/search/{domain}: IDN compatibility /api/search/{domain}: Add IDN compatibility Oct 30, 2023
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works locally, but not remotely

nanopi@nanopi:~$ curl -s 127.0.0.1/api/search/äBC.com?debug=true | jq .search.debug.punycode
"xn--bc-uia.com"


chrko@ThinkPad-X230:~$ curl -s 10.0.1.24/api/search/äBC.com?debug=true
Error 400: Bad Request


chrko@ThinkPad-X230:~$ curl 10.0.1.24/api/search/abc.com?debug=true
{
	"search":	{
		"domains":	[],
		"gravity":	[],
		"results":	{


Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Copy link
Member Author

DL6ER commented Oct 31, 2023

@yubiuser Should now be fixed. From my point of view, this is a bug in the CivetWeb server. I opened a PR with our proposed fix upstream: civetweb/civetweb#1209

Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as expected

chrko@ThinkPad-X230:~$ curl -s 10.0.1.24/api/search/äBC.com?debug=true
{
	"search":	{
		"domains":	[],
		"gravity":	[],
		"results":	{
			"domains":	{
				"exact":	0,
				"regex":	0
			},

@DL6ER DL6ER merged commit c8391fd into development-v6 Oct 31, 2023
16 checks passed
@DL6ER DL6ER deleted the new/search_punycode branch October 31, 2023 20:00
@DL6ER
Copy link
Member Author

DL6ER commented Nov 2, 2023

civetweb/civetweb#1209 has been merged upstream without changes.

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