mirrored from git://git.moodle.org/moodle.git
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDL-30005 fix general URI support in URL module
The recent change completely removed support for general URIs and enforced strict URL validation which was breaking backwards compatibility and was not user friendly at all. This patch finally adds full URI support with basic validation and fixes some older xhtml strict issues. Please note we do not try to explain the difference between URL and URI to our users. Also keep in mind that mod/url has XSS risk and does not do any security validation of the data.
- Loading branch information
Showing
7 changed files
with
215 additions
and
41 deletions.
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
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
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
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
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
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 |
---|---|---|
@@ -0,0 +1,61 @@ | ||
<?php | ||
// This file is part of Moodle - http://moodle.org/ | ||
// | ||
// Moodle is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
// | ||
// Moodle is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
/** | ||
* Unit tests for some mod URL lib stuff. | ||
* | ||
* @package mod | ||
* @subpackage url | ||
* @copyright 2011 petr Skoda | ||
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License | ||
*/ | ||
|
||
|
||
defined('MOODLE_INTERNAL') || die(); | ||
|
||
require_once($CFG->dirroot . '/mod/url/locallib.php'); | ||
|
||
|
||
/** | ||
* @copyright 2011 petr Skoda | ||
*/ | ||
class url_lib_test extends UnitTestCase { | ||
|
||
public function test_url_appears_valid_url() { | ||
|
||
$this->assertTrue(url_appears_valid_url('http://example')); | ||
$this->assertTrue(url_appears_valid_url('http://www.example.com')); | ||
$this->assertTrue(url_appears_valid_url('http://www.exa-mple2.com')); | ||
$this->assertTrue(url_appears_valid_url('http://www.example.com/~nobody/index.html')); | ||
$this->assertTrue(url_appears_valid_url('http://www.example.com#hmm')); | ||
$this->assertTrue(url_appears_valid_url('http://www.example.com/#hmm')); | ||
$this->assertTrue(url_appears_valid_url('http://www.example.com/žlutý koníček/lala.txt')); | ||
$this->assertTrue(url_appears_valid_url('http://www.example.com/žlutý koníček/lala.txt#hmmmm')); | ||
$this->assertTrue(url_appears_valid_url('http://www.example.com/index.php?xx=yy&zz=aa')); | ||
$this->assertTrue(url_appears_valid_url('https://user:password@www.example.com/žlutý koníček/lala.txt')); | ||
$this->assertTrue(url_appears_valid_url('ftp://user:password@www.example.com/žlutý koníček/lala.txt')); | ||
|
||
$this->assertFalse(url_appears_valid_url('http:example.com')); | ||
$this->assertFalse(url_appears_valid_url('http:/example.com')); | ||
$this->assertFalse(url_appears_valid_url('http://')); | ||
$this->assertFalse(url_appears_valid_url('http://www.exa mple.com')); | ||
$this->assertFalse(url_appears_valid_url('http://www.examplé.com')); | ||
$this->assertFalse(url_appears_valid_url('http://@www.example.com')); | ||
$this->assertFalse(url_appears_valid_url('http://user:@www.example.com')); | ||
|
||
$this->assertTrue(url_appears_valid_url('lalala://@:@/')); | ||
} | ||
} |
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