Discussion:
[22830] standard/trunk: [ZF-10267] Zend_Validate_Hostname:
thomas
2010-08-12 16:05:15 UTC
Permalink
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22830] standard/trunk: [ZF-10267] Zend_Validate_Hostname:</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22830</dd>
<dt>Author</dt> <dd>thomas</dd>
<dt>Date</dt> <dd>2010-08-12 09:05:09 -0700 (Thu, 12 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ZF-10267] Zend_Validate_Hostname:

- added regname support (RFC3986)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardtrunkdocumentationmanualenmodule_specsZend_ValidateHostnamexml">standard/trunk/documentation/manual/en/module_specs/Zend_Validate-Hostname.xml</a></li>
<li><a href="#standardtrunklibraryZendValidateHostnamephp">standard/trunk/library/Zend/Validate/Hostname.php</a></li>
<li><a href="#standardtrunktestsZendValidateHostnameTestphp">standard/trunk/tests/Zend/Validate/HostnameTest.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardtrunkdocumentationmanualenmodule_specsZend_ValidateHostnamexml"></a>
<div class="modfile"><h4>Modified: standard/trunk/documentation/manual/en/module_specs/Zend_Validate-Hostname.xml (22829 => 22830)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/documentation/manual/en/module_specs/Zend_Validate-Hostname.xml 2010-08-11 19:56:28 UTC (rev 22829)
+++ standard/trunk/documentation/manual/en/module_specs/Zend_Validate-Hostname.xml 2010-08-12 16:05:09 UTC (rev 22830) </span><span class="lines">@@ -95,10 +95,22 @@ </span><span class="cx"> &lt;constant&gt;ALLOW_DNS&lt;/constant&gt; to allow only </span><span class="cx"> &lt;acronym&gt;DNS&lt;/acronym&gt; hostnames, &lt;constant&gt;ALLOW_IP&lt;/constant&gt; to allow IP addresses, </span><span class="cx"> &lt;constant&gt;ALLOW_LOCAL&lt;/constant&gt; to allow local network names, and </span><del>- &lt;constant&gt;ALLOW_ALL&lt;/constant&gt; to allow all three types. To just check for IP addresses
- you can use the example below: </del><ins>+ &lt;constant&gt;ALLOW_ALL&lt;/constant&gt; to allow all three above types. </ins><span class="cx"> &lt;/para&gt; </span><span class="cx"> </span><ins>+ &lt;para&gt;
+ Additionally there is &lt;constant&gt;ALLOW_URI&lt;/constant&gt; which allows to check hostnames
+ according to &lt;link linkend=&quot;http://tools.ietf.org/html/rfc3986&quot;&gt;RFC3986&lt;/link&gt;. These
+ are registered names which are used by &lt;acronym&gt;WINS&lt;/acronym&gt;, NetInfo and also local
+ hostnames like those defined within your &lt;filename&gt;.hosts&lt;/filename&gt; file. For security
+ reasons &lt;constant&gt;ALLOW_URI&lt;/constant&gt; is not contained within
+ &lt;constant&gt;ALLOW_ALL&lt;/constant&gt;.
+ &lt;/para&gt;
+
+ &lt;para&gt;
+ To just check for IP addresses you can use the example below:
+ &lt;/para&gt;
+ </ins><span class="cx"> &lt;programlisting language=&quot;php&quot;&gt;&lt;![CDATA[ </span><span class="cx"> $validator = new Zend_Validate_Hostname(Zend_Validate_Hostname::ALLOW_IP); </span><span class="cx"> if ($validator-&gt;isValid($hostname)) { </span><span class="lines">@@ -112,8 +124,8 @@ </span><span class="cx"> ]]&gt;&lt;/programlisting&gt; </span><span class="cx"> </span><span class="cx"> &lt;para&gt; </span><del>- As well as using &lt;constant&gt;ALLOW_ALL&lt;/constant&gt; to accept all hostnames types you can
- combine these types to allow for combinations. For example, to accept </del><ins>+ As well as using &lt;constant&gt;ALLOW_ALL&lt;/constant&gt; to accept all common hostnames types
+ you can combine these types to allow for combinations. For example, to accept </ins><span class="cx"> &lt;acronym&gt;DNS&lt;/acronym&gt; and Local hostnames instantiate your </span><span class="cx"> &lt;classname&gt;Zend_Validate_Hostname&lt;/classname&gt; object as so: </span><span class="cx"> &lt;/para&gt;
</span></span></pre></div>
<a id="standardtrunklibraryZendValidateHostnamephp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Validate/Hostname.php (22829 => 22830)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Validate/Hostname.php 2010-08-11 19:56:28 UTC (rev 22829)
+++ standard/trunk/library/Zend/Validate/Hostname.php 2010-08-12 16:05:09 UTC (rev 22830)
</span><span class="lines">@@ -46,31 +46,33 @@
</span><span class="cx"> */
</span><span class="cx"> class Zend_Validate_Hostname extends Zend_Validate_Abstract
</span><span class="cx"> {
</span><ins>+ const CANNOT_DECODE_PUNYCODE = 'hostnameCannotDecodePunycode';
</ins><span class="cx"> const INVALID = 'hostnameInvalid';
</span><del>- const IP_ADDRESS_NOT_ALLOWED = 'hostnameIpAddressNotAllowed';
- const UNKNOWN_TLD = 'hostnameUnknownTld';
</del><span class="cx"> const INVALID_DASH = 'hostnameDashCharacter';
</span><ins>+ const INVALID_HOSTNAME = 'hostnameInvalidHostname';
</ins><span class="cx"> const INVALID_HOSTNAME_SCHEMA = 'hostnameInvalidHostnameSchema';
</span><del>- const UNDECIPHERABLE_TLD = 'hostnameUndecipherableTld';
- const INVALID_HOSTNAME = 'hostnameInvalidHostname';
</del><span class="cx"> const INVALID_LOCAL_NAME = 'hostnameInvalidLocalName';
</span><ins>+ const INVALID_URI = 'hostnameInvalidUri';
+ const IP_ADDRESS_NOT_ALLOWED = 'hostnameIpAddressNotAllowed';
</ins><span class="cx"> const LOCAL_NAME_NOT_ALLOWED = 'hostnameLocalNameNotAllowed';
</span><del>- const CANNOT_DECODE_PUNYCODE = 'hostnameCannotDecodePunycode';
</del><ins>+ const UNDECIPHERABLE_TLD = 'hostnameUndecipherableTld';
+ const UNKNOWN_TLD = 'hostnameUnknownTld'; </ins><span class="cx"> </span><span class="cx"> /** </span><span class="cx"> * @var array </span><span class="cx"> */ </span><span class="cx"> protected $_messageTemplates = array( </span><ins>+ self::CANNOT_DECODE_PUNYCODE =&gt; &quot;'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded&quot;, </ins><span class="cx"> self::INVALID =&gt; &quot;Invalid type given. String expected&quot;, </span><del>- self::IP_ADDRESS_NOT_ALLOWED =&gt; &quot;'%value%' appears to be an IP address, but IP addresses are not allowed&quot;,
- self::UNKNOWN_TLD =&gt; &quot;'%value%' appears to be a DNS hostname but cannot match TLD against known list&quot;, </del><span class="cx"> self::INVALID_DASH =&gt; &quot;'%value%' appears to be a DNS hostname but contains a dash in an invalid position&quot;, </span><ins>+ self::INVALID_HOSTNAME =&gt; &quot;'%value%' does not match the expected structure for a DNS hostname&quot;, </ins><span class="cx"> self::INVALID_HOSTNAME_SCHEMA =&gt; &quot;'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'&quot;,
</span><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...