Use idn_to_ascii function instead of idna_convert library
#785
Conversation
jtojnar
force-pushed
the
idn
branch
2 times, most recently
from
57c0130
to
a9f41f1
Compare
| $parsed = \SimplePie\Misc::parse_url($link); | ||
| $this->link = \SimplePie\Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']); | ||
| if ($parsed['authority'] !== '' && !ctype_print($parsed['authority'])) { | ||
| $authority = \idn_to_ascii($parsed['authority'], \IDNA_NONTRANSITIONAL_TO_ASCII, \INTL_IDNA_VARIANT_UTS46); |
There was a problem hiding this comment.
It looks like the original code was already broken on authority strings containing non-ASCII characters in userinfo part of the URI, e.g. čížek@háčkyčárky.cz:
- This is what
idna_convertgives:xn--ek-mja1kox@xn--hkyrky-ptac70bc.cz - This is what Firefox converts:
%C4%8D%C3%AD%C5%BEek@xn--hkyrky-ptac70bc.cz
It probably does not make sense to attempt to fix it when it will likely be corrected with switch to PSR-18.
Edit: Looks like they are deprecated anyway https://www.rfc-editor.org/rfc/rfc7540#section-8.1.2.3
| @@ -1,969 +0,0 @@ | |||
| <?php | |||
| // {{{ license | |||
There was a problem hiding this comment.
Removing this file might be a breaking change. What do you think about keeping this file and simply triggering a deprecation error?
<?php
declare(strict_types=1);
trigger_error('Using class `idna_convert` from `idn/idna_convert.class.php` is deprecated since SimplePie 1.9.0, the native `idn_to_ascii()` function is used instead.', \E_USER_DEPRECATED);There was a problem hiding this comment.
I would argue that this is not a part of API – it is not part of SimplePie, it is not listed in the API docs nor was it documented anywhere else.
I have listed it in the Removed section of changelog so that if someone uses it for themselves, they can just copy it from older version.
|
I like this approach. This PR fixes #538. |
The `idna_convert` library is outdated and there is now a native PHP function to convert IDNs to Punycode. It requires `intl` extension or a [polyfill](https://github.com/symfony/polyfill-intl-idn). `compress_parse_url` will append `?` and `#` to the URI even if there is no query string or hash fragment, and insert `//` even when there is no authority part. To avoid this and the breakage of tests this would cause, let’s call the function only for files having a non-empty authority part of the URI (i.e. non-local files) that contains characters that are not considered printable ASCII (such as bytes of UTF-8 encoded Unicode characters). In the future, we might leave the IDN support to HTTP library to deal with.
|
@mblaney This is ready for merge. |
The
idna_convertlibrary is outdated and there is now a native PHP function to convert IDNs to Punycode.It requires
intlextension or a polyfill.compress_parse_urlwill append?and#to the URI even if there is no query string or hash fragment, and insert//even when there is no authority part. To avoid this and the breakage of tests this would cause, let’s call the function only for files having a non-empty authority part of the URI (i.e. non-local files) that contains characters that are not considered printable ASCII (such as bytes of UTF-8 encoded Unicode characters).In the future, we might leave the IDN support to HTTP library to deal with.
Fixes: #538
Supersedes: #776