tweet_live: comparison web/lib/Zend/Validate/Hostname.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * obtain it through the world-wide-web, please send an email
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Validate
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Hostname.php 22830 2010-08-12 16:05:09Z thomas $
+* @version    $Id: Hostname.php 25061 2012-11-02 21:24:09Z rob $
 */
 /**
 * @see Zend_Validate_Abstract
 */
 * The second is tests/Zend/Validate/HostnameTestForm.php which is designed to be run via HTML
 * to allow users to test entering UTF-8 characters in a form.
 *
 * @category   Zend
 * @package    Zend_Validate
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Validate_Hostname extends Zend_Validate_Abstract
 {
 const CANNOT_DECODE_PUNYCODE  = 'hostnameCannotDecodePunycode';
 const ALLOW_LOCAL = 4;
 /**
 * Allows all types of hostnames
 */
-const ALLOW_ALL   = 7;
+const ALLOW_URI = 8;
 /**
 * Allows all types of hostnames
 */
-const ALLOW_URI = 8;
+const ALLOW_ALL = 15;
 /**
 * Array of valid top-level-domains
 *
 * @see ftp://data.iana.org/TLD/tlds-alpha-by-domain.txt  List of all TLDs by domain
 'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'pro', 'ps', 'pt', 'pw', 'py', 'qa', 're',
 'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl',
 'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th',
 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua',
 'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws',
-'ye', 'yt', 'yu', 'za', 'zm', 'zw'
+'xxx', 'ye', 'yt', 'yu', 'za', 'zm', 'zw'
 );
 /**
 * @var string
 */
 'CH'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿœ]{1,63}$/iu'),
 'CL'  => array(1 => '/^[\x{002d}0-9a-záéíñóúü]{1,63}$/iu'),
 'CN'  => 'Hostname/Cn.php',
 'COM' => 'Zend/Validate/Hostname/Com.php',
 'DE'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
-'DK'  => array(1 => '/^[\x{002d}0-9a-zäéöü]{1,63}$/iu'),
+'DK'  => array(1 => '/^[\x{002d}0-9a-zäéöüæøå]{1,63}$/iu'),
 'ES'  => array(1 => '/^[\x{002d}0-9a-zàáçèéíïñòóúü·]{1,63}$/iu'),
 'EU'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿ]{1,63}$/iu',
 2 => '/^[\x{002d}0-9a-zāăąćĉċčďđēĕėęěĝğġģĥħĩīĭįıĵķĺļľŀłńņňŉŋōŏőœŕŗřśŝšťŧũūŭůűųŵŷźżž]{1,63}$/iu',
 3 => '/^[\x{002d}0-9a-zșț]{1,63}$/iu',
 4 => '/^[\x{002d}0-9a-zΐάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ]{1,63}$/iu',
 'PT'  => array(1 => '/^[\x{002d}0-9a-záàâãçéêíóôõú]{1,63}$/iu'),
 'RU'  => array(1 => '/^[\x{002d}0-9а-яё]{1,63}$/iu'),
 'SA'  => array(1 => '/^[\x{002d}.0-9\x{0621}-\x{063A}\x{0641}-\x{064A}\x{0660}-\x{0669}]{1,63}$/iu'),
 'SE'  => array(1 => '/^[\x{002d}0-9a-zäåéöü]{1,63}$/iu'),
 'SH'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
+'SI'  => array(
+1 => '/^[\x{002d}0-9a-zà-öø-ÿ]{1,63}$/iu',
+2 => '/^[\x{002d}0-9a-zāăąćĉċčďđēĕėęěĝğġģĥħĩīĭįıĵķĺļľŀłńņňŉŋōŏőœŕŗřśŝšťŧũūŭůűųŵŷźżž]{1,63}$/iu',
+3 => '/^[\x{002d}0-9a-zșț]{1,63}$/iu'),
 'SJ'  => array(1 => '/^[\x{002d}0-9a-zàáä-éêñ-ôöøüčđńŋšŧž]{1,63}$/iu'),
 'TH'  => array(1 => '/^[\x{002d}0-9a-z\x{0E01}-\x{0E3A}\x{0E40}-\x{0E4D}\x{0E50}-\x{0E59}]{1,63}$/iu'),
 'TM'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿāăąćĉċčďđēėęěĝġģĥħīįĵķĺļľŀłńņňŋőœŕŗřśŝşšţťŧūŭůűųŵŷźżž]{1,63}$/iu'),
 'TW'  => 'Zend/Validate/Hostname/Cn.php',
 'TR'  => array(1 => '/^[\x{002d}0-9a-zğıüşöç]{1,63}$/iu'),
 return false;
 }
 $this->_setValue($value);
 // Check input against IP address schema
-if (preg_match('/^[0-9.a-e:.]*$/i', $value) &&
+if (preg_match('/^[0-9a-f:.]*$/i', $value) &&
 $this->_options['ip']->setTranslator($this->getTranslator())->isValid($value)) {
 if (!($this->_options['allow'] & self::ALLOW_IP)) {
 $this->_error(self::IP_ADDRESS_NOT_ALLOWED);
 return false;
 } else {
 return true;
 }
 }
+// RFC3986 3.2.2 states:
+//
+//     The rightmost domain label of a fully qualified domain name
+//     in DNS may be followed by a single "." and should be if it is
+//     necessary to distinguish between the complete domain name and
+//     some local domain.
+//
+// (see ZF-6363)
+// Local hostnames are allowed to be partitial (ending '.')
+if ($this->_options['allow'] & self::ALLOW_LOCAL) {
+if (substr($value, -1) === '.') {
+$value = substr($value, 0, -1);
+if (substr($value, -1) === '.') {
+// Empty hostnames (ending '..') are not allowed
+$this->_error(self::INVALID_LOCAL_NAME);
+return false;
+}
+}
+}
+$domainParts = explode('.', $value);
+// Prevent partitial IP V4 adresses (ending '.')
+if ((count($domainParts) == 4) && preg_match('/^[0-9.a-e:.]*$/i', $value) &&
+$this->_options['ip']->setTranslator($this->getTranslator())->isValid($value)) {
+$this->_error(self::INVALID_LOCAL_NAME);
+}
 // Check input against DNS hostname schema
-$domainParts = explode('.', $value);
 if ((count($domainParts) > 1) && (strlen($value) >= 4) && (strlen($value) <= 254)) {
 $status = false;
 $origenc = iconv_get_encoding('internal_encoding');
 iconv_set_encoding('internal_encoding', 'UTF-8');
 $this->_error(self::INVALID_URI);
 }
 }
 // Check input against local network name schema; last chance to pass validation
-$regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}){1,254}$/';
+$regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}[\x2e]{0,1}){1,254}$/';
 $status = @preg_match($regexLocal, $value);
 // If the input passes as a local network name, and local network names are allowed, then the
 // hostname passes validation
 $allowLocal = $this->_options['allow'] & self::ALLOW_LOCAL;

changeset 807	877f952ae2bd
parent 207	621fa6caec0c
child 1230	68c69c656a2c