Merge pull request #1487 from BolajiOlajide/ft-allow-square-brackets-…

…param-url-validator Allow square braces in URL validation
hapijs · Jun 29, 2018 · 7aa0df0 · 7aa0df0
2 parents 37d3588 + e6c09c9
commit 7aa0df0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/types/string/rfc3986.js b/lib/types/string/rfc3986.js
@@ -78,6 +78,11 @@ internals.generate = function () {
     const pchar = unreserved + pctEncoded + subDelims + ':@';
     const pcharOnly = '[' + pchar + ']';
 
+    /**
+     * squareBraces example: []
+     */
+    const squareBraces = '\\[\\]';
+
     /**
      * dec-octet   = DIGIT                 ; 0-9
      *            / %x31-39 DIGIT         ; 10-99
@@ -195,7 +200,7 @@ internals.generate = function () {
     /**
      * query = *( pchar / "/" / "?" )
      */
-    internals.rfc3986.query = '[' + pchar + '\\/\\?]*(?=#|$)'; //Finish matching either at the fragment part or end of the line.
+    internals.rfc3986.query = '[' + pchar + squareBraces + '\\/\\?]*(?=#|$)'; //Finish matching either at the fragment part or end of the line.
 
     /**
      * fragment = *( pchar / "/" / "?" )

diff --git a/test/types/string.js b/test/types/string.js
@@ -2523,6 +2523,7 @@ describe('string', () => {
 
             Helper.validate(schema, [
                 ['foo://example.com:8042/over/there?name=ferret#nose', true],
+                ['https://example.com?abc[]=123&abc[]=456', true],
                 ['urn:example:animal:ferret:nose', true],
                 ['ftp://ftp.is.co.za/rfc/rfc1808.txt', true],
                 ['http://www.ietf.org/rfc/rfc2396.txt', true],