Skip to content

Url: IDN domain automatically convert to UTF-8. #190

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

Merged
dg merged 12 commits into from
Jan 5, 2021
Merged

Url: IDN domain automatically convert to UTF-8. #190

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2ca8aa2
opened 3.1-dev
dg Jun 16, 2020
7926d5f
requires PHP 7.2
dg Aug 2, 2020
748063f
Url: silently deprecated getBasePath(), getBaseUrl(), getRelativeUrl(…
dg Jul 6, 2020
f168e8c
FileUpload::getName() is silently deprecated
dg Oct 20, 2020
221b8d9
Session: deprecated getCookieParameters() triggers E_USER_DEPRECATED
dg Jul 6, 2020
5d0eb9f
HttpExtension: cookieSecure is by default 'auto' (BC break)
dg Nov 18, 2019
ecc216a
Request::getFile() accepts array of keys and returns FileUpload|null …
dg Aug 2, 2020
c36d5c6
RequestFactory: throws exception on invalid $_POST/$_COOKIE data
dg Oct 15, 2020
2a9ac3f
HttpExtension: compatibility with nette/schema 2
dg Dec 17, 2020
c3a08f5
Url: IDN domain automatically convert to UTF-8.
janbarasek Dec 25, 2020
ae967cd
idnHostToUnicode: Fix logic error
janbarasek Dec 25, 2020
2dc59bc
Merge branch 'master' into patch-3
dg Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion src/Http/Url.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function __construct($url = null)

$this->scheme = $p['scheme'] ?? '';
$this->port = $p['port'] ?? null;
$this->host = rawurldecode($p['host'] ?? '');
$this->host = self::idnHostToUnicode(rawurldecode($p['host'] ?? ''));
$this->user = rawurldecode($p['user'] ?? '');
$this->password = rawurldecode($p['pass'] ?? '');
$this->setPath($p['path'] ?? '');
Expand Down Expand Up @@ -363,6 +363,7 @@ public function isEqual($url): bool
/**
* Transforms URL to canonical form.
* @return static
* @deprecated
*/
public function canonicalize()
{
Expand Down Expand Up @@ -395,6 +396,25 @@ final public function export(): array
}


/**
* Convert IDN ASCII host to UTF-8.
* In case of an error, it returns the original input.
*
* @param int[]|null $info
*/
public static function idnHostToUnicode(string $host, int $options = 0, ?array &$info = []): string
{
if (strpos($host, '--') === false) { // host does not contain IDN
return $host;
}
if (\function_exists('idn_to_utf8') && \defined('INTL_IDNA_VARIANT_UTS46')) {
return \idn_to_utf8($host, $options, \INTL_IDNA_VARIANT_UTS46, $info) ?: $host;
}

throw new \Error('ext-idn not loaded or too old.');
}


/**
* Similar to rawurldecode, but preserves reserved chars encoded.
*/
Expand Down