Merge pull request #11246 from cviebrock/fix-active-url-validation · JavaDevl/framework@8a65b70 · GitHub

JavaDevl / framework Public

forked from laravel/framework

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 8a65b70

Browse filesBrowse the repository at this point in the historyBrowse files

taylorotwell

committed

Merge pull request laravel#11246 from cviebrock/fix-active-url-validation

[5.1] Fix active url validation

2 parents 4f15d8c + 7a2f7c7 commit 8a65b70
Copy full SHA for 8a65b70

2 files changed

+7-2Lines changed: 7 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/Illuminate/Validation
  • Validator.php
• tests/Validation
  • ValidationValidatorTest.php

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/Illuminate/Validation/Validator.php‎

Copy file name to clipboardExpand all lines: src/Illuminate/Validation/Validator.php

+4-2Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -1235,9 +1235,11 @@ protected function validateUrl($attribute, $value)
1235	1235	*/
1236	1236	protected function validateActiveUrl($attribute, $value)
1237	1237	{
1238		- $url = str_replace(['http://', 'https://', 'ftp://'], '', strtolower($value));
	1238	+ if ($url = parse_url($value, PHP_URL_HOST)) {
	1239	+ return count(dns_get_record($url, DNS_A | DNS_AAAA)) > 0;
	1240	+ }
1239	1241
1240		- return checkdnsrr($url, 'A');
	1242	+ return false;
1241	1243	}
1242	1244
1243	1245	/**

Collapse file

‎tests/Validation/ValidationValidatorTest.php‎

Copy file name to clipboardExpand all lines: tests/Validation/ValidationValidatorTest.php

+3Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -1098,6 +1098,9 @@ public function testValidateActiveUrl()
1098	1098
1099	1099	$v = new Validator($trans, ['x' => 'http://www.google.com'], ['x' => 'active_url']);
1100	1100	$this->assertTrue($v->passes());
	1101	+
	1102	+ $v = new Validator($trans, ['x' => 'http://www.google.com/about'], ['x' => 'active_url']);
	1103	+ $this->assertTrue($v->passes());
1101	1104	}
1102	1105
1103	1106	public function testValidateImage()

0 commit comments

Comments

0 (0)