tough-cookie 0.12.1 → 1.2.0

package/.editorconfig

@@ -0,0 +1,12 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2

package/.npmignore

@@ -1,3 +1,4 @@
+.idea
 node_modules/
 .*.sw[nmop]
 npm-debug.log

package/.travis.yml

@@ -1,7 +1,8 @@
 language: node_js
 node_js:
 - "0.10"
-- "0.11"
+- "0.12"
+- iojs
 matrix:
   fast_finish: true
   allow_failures:

package/LICENSE

@@ -1,21 +1,17 @@
-Copyright GoInstant, Inc. and other contributors. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Copyright (c) 2015, Salesforce.com, Inc.
+All rights reserved.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===
 
 The following exceptions apply:
 
@@ -37,24 +33,24 @@ under the terms of the MPL 1.1:
 
     // ***** BEGIN LICENSE BLOCK *****
     // Version: MPL 1.1/GPL 2.0/LGPL 2.1
-    // 
-    // The contents of this file are subject to the Mozilla Public License Version 
-    // 1.1 (the "License"); you may not use this file except in compliance with 
-    // the License. You may obtain a copy of the License at 
+    //
+    // The contents of this file are subject to the Mozilla Public License Version
+    // 1.1 (the "License"); you may not use this file except in compliance with
+    // the License. You may obtain a copy of the License at
     // http://www.mozilla.org/MPL/
-    // 
+    //
     // Software distributed under the License is distributed on an "AS IS" basis,
     // WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
     // for the specific language governing rights and limitations under the
     // License.
-    // 
+    //
     // The Original Code is the Public Suffix List.
-    // 
+    //
     // The Initial Developer of the Original Code is
     // Jo Hermans <jo.hermans@gmail.com>.
     // Portions created by the Initial Developer are Copyright (C) 2007
     // the Initial Developer. All Rights Reserved.
-    // 
+    //
     // Contributor(s):
     //   Ruben Arakelyan <ruben@rubenarakelyan.com>
     //   Gervase Markham <gerv@gerv.net>
@@ -62,7 +58,7 @@ under the terms of the MPL 1.1:
     //   David Triendl <david@triendl.name>
     //   Jothan Frakes <jothan@gmail.com>
     //   The kind representatives of many TLD registries
-    // 
+    //
     // Alternatively, the contents of this file may be used under the terms of
     // either the GNU General Public License Version 2 or later (the "GPL"), or
     // the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
@@ -74,5 +70,5 @@ under the terms of the MPL 1.1:
     // and other provisions required by the GPL or the LGPL. If you do not delete
     // the provisions above, a recipient may use your version of this file under
     // the terms of any one of the MPL, the GPL or the LGPL.
-    // 
+    //
     // ***** END LICENSE BLOCK *****

package/README.md

@@ -1,8 +1,6 @@
-[RFC6265](http://tools.ietf.org/html/rfc6265) Cookies and CookieJar for Node.js
+[RFC6265](https://tools.ietf.org/html/rfc6265) Cookies and CookieJar for Node.js
 
-![Tough Cookie](http://www.goinstant.com.s3.amazonaws.com/tough-cookie.jpg)
-
-[![Build Status](https://travis-ci.org/goinstant/node-cookie.png?branch=master)](https://travis-ci.org/goinstant/node-cookie)
+[![Build Status](https://travis-ci.org/SalesforceEng/tough-cookie.png?branch=master)](https://travis-ci.org/SalesforceEng/tough-cookie)
 
 [![NPM Stats](https://nodei.co/npm/tough-cookie.png?downloads=true&stars=true)](https://npmjs.org/package/tough-cookie)
 ![NPM Downloads](https://nodei.co/npm-dl/tough-cookie.png?months=9)
@@ -30,8 +28,6 @@ It's _so_ easy!
 
 `npm install tough-cookie`
 
-Requires `punycode`, which should get installed automatically for you.  Note that node.js v0.6.2+ bundles punycode by default.
-
 Why the name?  NPM modules `cookie`, `cookies` and `cookiejar` were already taken.
 
 # API
@@ -41,10 +37,12 @@ tough
 
 Functions on the module you get from `require('tough-cookie')`.  All can be used as pure functions and don't need to be "bound".
 
-parseDate(string[,strict])
+**Note**: prior to 1.0.x, several of these functions took a `strict` parameter. This has since been removed from the API as it was no longer necessary.
+
+parseDate(string)
 -----------------
 
-Parse a cookie date string into a `Date`.  Parses according to RFC6265 Section 5.1.1, not `Date.parse()`.  If strict is set to true then leading/trailing non-seperator characters around the time part will cause the parsing to fail (e.g. "Thu, 01 Jan 1970 00:00:010 GMT" has an extra trailing zero but Chrome, an assumedly RFC-compliant browser, treats this as valid).
+Parse a cookie date string into a `Date`.  Parses according to RFC6265 Section 5.1.1, not `Date.parse()`.
 
 formatDate(date)
 ----------------
@@ -77,10 +75,10 @@ Answers "does the request-path path-match a given cookie-path?" as per RFC6265 S
 
 This is essentially a prefix-match where `cookiePath` is a prefix of `reqPath`.
 
-parse(header[,strict=false])
+parse(header)
 ----------------------------
 
-alias for `Cookie.parse(header[,strict])`
+alias for `Cookie.parse(header)`
 
 fromJSON(string)
 ----------------
@@ -120,10 +118,10 @@ Generates a list of all possible paths that `pathMatch()` the parameter.  May be
 Cookie
 ======
 
-Cookie.parse(header[,strict=false])
+Cookie.parse(header)
 -----------------------------------
 
-Parses a single Cookie or Set-Cookie HTTP header into a `Cookie` object.  Returns `undefined` if the string can't be parsed.  If in strict mode, returns `undefined` if the cookie doesn't follow the guidelines in section 4 of RFC6265.  Generally speaking, strict mode can be used to validate your own generated Set-Cookie headers, but acting as a client you want to be lenient and leave strict mode off.
+Parses a single Cookie or Set-Cookie HTTP header into a `Cookie` object.  Returns `undefined` if the string can't be parsed.
 
 Here's how to process the Set-Cookie header(s) on a node HTTP/HTTPS response:
 
@@ -254,7 +252,6 @@ The `options` object can be omitted and can have the following properties:
   * _http_ - boolean - default `true` - indicates if this is an HTTP or non-HTTP API.  Affects HttpOnly cookies.
   * _secure_ - boolean - autodetect from url - indicates if this is a "Secure" API.  If the currentUrl starts with `https:` or `wss:` then this is defaulted to `true`, otherwise `false`.
   * _now_ - Date - default `new Date()` - what to use for the creation/access time of cookies
-  * _strict_ - boolean - default `false` - perform extra checks
   * _ignoreError_ - boolean - default `false` - silently ignore things like parse errors and invalid domains.  CookieStore errors aren't ignored by this option.
 
 As per the RFC, the `.hostOnly` property is set if there was no "Domain=" parameter in the cookie string (or `.domain` was null on the Cookie object).  The `.domain` property is set to the fully-qualified hostname of `currentUrl` in this case.  Matching this cookie requires an exact hostname match (not a `domainMatch` as per usual).
@@ -376,37 +373,50 @@ The implementation MUST NOT pass an error if the cookie doesn't exist; only pass
 store.removeCookies(domain, path, cb(err))
 ------------------------------------------
 
-Removes matching cookies from the store.  The `path` paramter is optional, and if missing means all paths in a domain should be removed.
+Removes matching cookies from the store.  The `path` parameter is optional, and if missing means all paths in a domain should be removed.
 
 Pass an error ONLY if removing any existing cookies failed.
 
-# TODO
+MemoryCookieStore
+=================
 
-  * _full_ RFC5890/RFC5891 canonicalization for domains in `cdomain()`
-    * the optional `punycode` requirement implements RFC3492, but RFC6265 requires RFC5891
-  * better tests for `validate()`?
+Inherits from Store.
+
+Just-in-memory CookieJar synchronous store implementation, used by default.
 
 # Copyright and License
 
-(tl;dr: MIT with some MPL/1.1)
-
-Copyright 2012- GoInstant, Inc. and other contributors. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+(tl;dr: BSD-3-Clause with some MPL/1.1)
+
+```text
+ Copyright (c) 2015, Salesforce.com, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ 3. Neither the name of Salesforce.com nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+```
 
 Portions may be licensed under different licenses (in particular public-suffix.txt is MPL/1.1); please read the LICENSE file for full details.

package/generate-pubsuffix.js

@@ -1,22 +1,32 @@
-/*
- * Copyright GoInstant, Inc. and other contributors. All rights reserved.
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+/*!
+ * Copyright (c) 2015, Salesforce.com, Inc.
+ * All rights reserved.
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of Salesforce.com nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 'use strict';
 var fs = require('fs');
@@ -59,6 +69,9 @@ function processList(lines) {
   w.write(" *                  DO NOT EDIT!                    *\n");
   w.write(" ****************************************************/\n\n");
 
+  w.write('"use strict";\n\n');
+  w.write("var punycode = require('punycode');\n\n");
+
   w.write("module.exports.getPublicSuffix = ");
   w.write(getPublicSuffix.toString());
   w.write(";\n\n");
@@ -90,25 +103,35 @@ function addToIndex(index,line) {
 
 // include the licence in the function since it gets written to pubsuffix.js
 function getPublicSuffix(domain) {
-  /*
-   * Copyright GoInstant, Inc. and other contributors. All rights reserved.
-   * Permission is hereby granted, free of charge, to any person obtaining a copy
-   * of this software and associated documentation files (the "Software"), to
-   * deal in the Software without restriction, including without limitation the
-   * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-   * sell copies of the Software, and to permit persons to whom the Software is
-   * furnished to do so, subject to the following conditions:
+  /*!
+   * Copyright (c) 2015, Salesforce.com, Inc.
+   * All rights reserved.
+   *
+   * Redistribution and use in source and binary forms, with or without
+   * modification, are permitted provided that the following conditions are met:
+   *
+   * 1. Redistributions of source code must retain the above copyright notice,
+   * this list of conditions and the following disclaimer.
    *
-   * The above copyright notice and this permission notice shall be included in
-   * all copies or substantial portions of the Software.
+   * 2. Redistributions in binary form must reproduce the above copyright notice,
+   * this list of conditions and the following disclaimer in the documentation
+   * and/or other materials provided with the distribution.
    *
-   * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-   * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-   * IN THE SOFTWARE.
+   * 3. Neither the name of Salesforce.com nor the names of its contributors may
+   * be used to endorse or promote products derived from this software without
+   * specific prior written permission.
+   *
+   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+   * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   * POSSIBILITY OF SUCH DAMAGE.
    */
   if (!domain) {
     return null;
@@ -116,6 +139,15 @@ function getPublicSuffix(domain) {
   if (domain.match(/^\./)) {
     return null;
   }
+  var asciiDomain = punycode.toASCII(domain);
+  var converted = false;
+  if (asciiDomain !== domain) {
+    domain = asciiDomain;
+    converted = true;
+  }
+  if (index[domain]) {
+    return null;
+  }
 
   domain = domain.toLowerCase();
   var parts = domain.split('.').reverse();
@@ -136,15 +168,17 @@ function getPublicSuffix(domain) {
       suffixLen = i+1;
     }
 
-    suffix = '.'+part+suffix;
+    suffix = '.'+partstr;
   }
 
   if (index['*'+suffix]) { // *.domain exists (e.g. *.kyoto.jp for domain='kyoto.jp');
     return null;
   }
 
-  if (suffixLen && parts.length > suffixLen) {
-    return parts.slice(0,suffixLen+1).reverse().join('.');
+  suffixLen = suffixLen || 1;
+  if (parts.length > suffixLen) {
+    var publicSuffix = parts.slice(0,suffixLen+1).reverse().join('.');
+    return converted ? punycode.toUnicode(publicSuffix) : publicSuffix;
   }
 
   return null;
@@ -155,7 +189,7 @@ function checkPublicSuffix(give,get) {
   assert.equal(got, get, give+' should be '+(get==null?'NULL':get)+' but got '+got);
 }
 
-// pubSufTest() was converted to JavaScript from http://publicsuffix.org/list/test.txt
+// pubSufTest() was converted to JavaScript from http://mxr.mozilla.org/mozilla-central/source/netwerk/test/unit/data/test_psl.txt?raw=1
 function pubSufTest() {
   // For this function-scope and this function-scope ONLY:
   // Any copyright is dedicated to the Public Domain.
@@ -174,14 +208,14 @@ function pubSufTest() {
   checkPublicSuffix('.example.example', null);
   // Unlisted TLD.
   checkPublicSuffix('example', null);
-  checkPublicSuffix('example.example', null);
-  checkPublicSuffix('b.example.example', null);
-  checkPublicSuffix('a.b.example.example', null);
+  checkPublicSuffix('example.example', 'example.example');
+  checkPublicSuffix('b.example.example', 'example.example');
+  checkPublicSuffix('a.b.example.example', 'example.example');
   // Listed, but non-Internet, TLD.
-  checkPublicSuffix('local', null);
-  checkPublicSuffix('example.local', null);
-  checkPublicSuffix('b.example.local', null);
-  checkPublicSuffix('a.b.example.local', null);
+  //checkPublicSuffix('local', null);
+  //checkPublicSuffix('example.local', null);
+  //checkPublicSuffix('b.example.local', null);
+  //checkPublicSuffix('a.b.example.local', null);
   // TLD with only 1 rule.
   checkPublicSuffix('biz', null);
   checkPublicSuffix('domain.biz', 'domain.biz');
@@ -210,20 +244,22 @@ function pubSufTest() {
   checkPublicSuffix('test.ac.jp', 'test.ac.jp');
   checkPublicSuffix('www.test.ac.jp', 'test.ac.jp');
   checkPublicSuffix('kyoto.jp', null);
-  checkPublicSuffix('c.kyoto.jp', null);
-  checkPublicSuffix('b.c.kyoto.jp', 'b.c.kyoto.jp');
-  checkPublicSuffix('a.b.c.kyoto.jp', 'b.c.kyoto.jp');
-  checkPublicSuffix('pref.kyoto.jp', 'pref.kyoto.jp');  // Exception rule.
-  checkPublicSuffix('www.pref.kyoto.jp', 'pref.kyoto.jp');  // Exception rule.
-  checkPublicSuffix('city.kyoto.jp', 'city.kyoto.jp');  // Exception rule.
-  checkPublicSuffix('www.city.kyoto.jp', 'city.kyoto.jp');  // Exception rule.
+  checkPublicSuffix('test.kyoto.jp', 'test.kyoto.jp');
+  checkPublicSuffix('ide.kyoto.jp', null);
+  checkPublicSuffix('b.ide.kyoto.jp', 'b.ide.kyoto.jp');
+  checkPublicSuffix('a.b.ide.kyoto.jp', 'b.ide.kyoto.jp');
+  checkPublicSuffix('c.kobe.jp', null);
+  checkPublicSuffix('b.c.kobe.jp', 'b.c.kobe.jp');
+  checkPublicSuffix('a.b.c.kobe.jp', 'b.c.kobe.jp');
+  checkPublicSuffix('city.kobe.jp', 'city.kobe.jp');
+  checkPublicSuffix('www.city.kobe.jp', 'city.kobe.jp');
   // TLD with a wildcard rule and exceptions.
-  checkPublicSuffix('om', null);
-  checkPublicSuffix('test.om', null);
-  checkPublicSuffix('b.test.om', 'b.test.om');
-  checkPublicSuffix('a.b.test.om', 'b.test.om');
-  checkPublicSuffix('songfest.om', 'songfest.om');
-  checkPublicSuffix('www.songfest.om', 'songfest.om');
+  checkPublicSuffix('ck', null);
+  checkPublicSuffix('test.ck', null);
+  checkPublicSuffix('b.test.ck', 'b.test.ck');
+  checkPublicSuffix('a.b.test.ck', 'b.test.ck');
+  checkPublicSuffix('www.ck', 'www.ck');
+  checkPublicSuffix('www.www.ck', 'www.ck');
   // US K12.
   checkPublicSuffix('us', null);
   checkPublicSuffix('test.us', 'test.us');
@@ -234,6 +270,24 @@ function pubSufTest() {
   checkPublicSuffix('k12.ak.us', null);
   checkPublicSuffix('test.k12.ak.us', 'test.k12.ak.us');
   checkPublicSuffix('www.test.k12.ak.us', 'test.k12.ak.us');
-
-
+  // IDN labels.
+  checkPublicSuffix('食狮.com.cn', '食狮.com.cn');
+  checkPublicSuffix('食狮.公司.cn', '食狮.公司.cn');
+  checkPublicSuffix('www.食狮.公司.cn', '食狮.公司.cn');
+  checkPublicSuffix('shishi.公司.cn', 'shishi.公司.cn');
+  checkPublicSuffix('公司.cn', null);
+  checkPublicSuffix('食狮.中国', '食狮.中国');
+  checkPublicSuffix('www.食狮.中国', '食狮.中国');
+  checkPublicSuffix('shishi.中国', 'shishi.中国');
+  checkPublicSuffix('中国', null);
+  // Same as above, but punycoded.
+  checkPublicSuffix('xn--85x722f.com.cn', 'xn--85x722f.com.cn');
+  checkPublicSuffix('xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn');
+  checkPublicSuffix('www.xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn');
+  checkPublicSuffix('shishi.xn--55qx5d.cn', 'shishi.xn--55qx5d.cn');
+  checkPublicSuffix('xn--55qx5d.cn', null);
+  checkPublicSuffix('xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s');
+  checkPublicSuffix('www.xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s');
+  checkPublicSuffix('shishi.xn--fiqs8s', 'shishi.xn--fiqs8s');
+  checkPublicSuffix('xn--fiqs8s', null);
 }