-
-
Notifications
You must be signed in to change notification settings - Fork 55
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
Failing tests for IDN TLD that contains uppercase #64
Open
rugabarbo
wants to merge
2
commits into
laminas:2.14.x
Choose a base branch
from
rugabarbo:failing-tests-for-tld-that-contains-uppercase
base: 2.14.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1995,8 +1995,8 @@ public function isValid($value) | |
$this->setValue($value); | ||
// Check input against IP address schema | ||
if ( | ||
((preg_match('/^[0-9.]*$/', $value) && strpos($value, '.') !== false) | ||
|| (preg_match('/^[0-9a-f:.]*$/i', $value) && strpos($value, ':') !== false)) | ||
((preg_match('/^[0-9.]*$/', $value) && mb_strpos($value, '.') !== false) | ||
|| (preg_match('/^[0-9a-f:.]*$/i', $value) && mb_strpos($value, ':') !== false)) | ||
&& $this->getIpValidator()->setTranslator($this->getTranslator())->isValid($value) | ||
) { | ||
if (! ($this->getAllow() & self::ALLOW_IP)) { | ||
|
@@ -2010,16 +2010,16 @@ public function isValid($value) | |
// Handle Regex compilation failure that may happen on .biz domain with has @ character, eg: [email protected] | ||
// Technically, hostname with '@' character is invalid, so mark as invalid immediately | ||
// @see https://github.com/laminas/laminas-validator/issues/8 | ||
if (strpos($value, '@') !== false) { | ||
if (mb_strpos($value, '@') !== false) { | ||
$this->error(self::INVALID_HOSTNAME); | ||
return false; | ||
} | ||
|
||
// Local hostnames are allowed to be partial (ending '.') | ||
if ($this->getAllow() & self::ALLOW_LOCAL) { | ||
if (substr($value, -1) === '.') { | ||
$value = substr($value, 0, -1); | ||
if (substr($value, -1) === '.') { | ||
if (mb_substr($value, -1) === '.') { | ||
$value = mb_substr($value, 0, -1); | ||
if (mb_substr($value, -1) === '.') { | ||
// Empty hostnames (ending '..') are not allowed | ||
$this->error(self::INVALID_LOCAL_NAME); | ||
return false; | ||
|
@@ -2063,20 +2063,20 @@ public function isValid($value) | |
|
||
$this->tld = $matches[1]; | ||
// Decode Punycode TLD to IDN | ||
if (strpos($this->tld, 'xn--') === 0) { | ||
$this->tld = $this->decodePunycode(substr($this->tld, 4)); | ||
if (mb_strpos($this->tld, 'xn--') === 0) { | ||
$this->tld = $this->decodePunycode(mb_substr($this->tld, 4)); | ||
if ($this->tld === false) { | ||
return false; | ||
} | ||
} else { | ||
$this->tld = strtoupper($this->tld); | ||
$this->tld = mb_strtoupper($this->tld); | ||
} | ||
|
||
// Match TLD against known list | ||
$removedTld = false; | ||
if ($this->getTldCheck()) { | ||
if ( | ||
! in_array(strtolower($this->tld), $this->validTlds) | ||
! in_array(mb_strtolower($this->tld), $this->validTlds) | ||
&& ! in_array($this->tld, $this->validTlds) | ||
) { | ||
$this->error(self::UNKNOWN_TLD); | ||
|
@@ -2112,8 +2112,8 @@ public function isValid($value) | |
} | ||
foreach ($domainParts as $domainPart) { | ||
// Decode Punycode domain names to IDN | ||
if (strpos($domainPart, 'xn--') === 0) { | ||
$domainPart = $this->decodePunycode(substr($domainPart, 4)); | ||
if (mb_strpos($domainPart, 'xn--') === 0) { | ||
$domainPart = $this->decodePunycode(mb_substr($domainPart, 4)); | ||
if ($domainPart === false) { | ||
return false; | ||
} | ||
|
@@ -2240,7 +2240,7 @@ protected function decodePunycode($encoded) | |
} | ||
|
||
$decoded = []; | ||
$separator = strrpos($encoded, '-'); | ||
$separator = mb_strrpos($encoded, '-'); | ||
if ($separator > 0) { | ||
for ($x = 0; $x < $separator; ++$x) { | ||
// prepare decoding matrix | ||
|
@@ -2249,7 +2249,7 @@ protected function decodePunycode($encoded) | |
} | ||
|
||
$lengthd = count($decoded); | ||
$lengthe = strlen($encoded); | ||
$lengthe = mb_strlen($encoded); | ||
|
||
// decoding | ||
$init = true; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMO to be declared should be
ext-mbstring
, while we can decide to usesymfony/polyfill-mbstring
inrequire-dev