Skip to content

N
net
Commit a62ee055 authored by Volker Dobler's avatar Volker Dobler Committed by Nigel Tao
Browse files
Options

go.net/publicsuffix: update table to latest list from publicsuffix.org 

Update the public suffix list to the latest (October 15. 2013)
data of publicsuffix.org's list which adds around 60 new gTLDs.

The .ar rules changed, the corresponding tests are modified to
reflect this change in the list.

R=nigeltao
CC=golang-dev
https://golang.org/cl/14930048
parent a9bbf44c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 235 additions and 35 deletions
publicsuffix/list_test.go
View file @ a62ee055
......@@ -99,19 +99,18 @@ var publicSuffixTestCases = []struct {
{"www.xxx.yyy.zzz.pb.ao", "pb.ao"},
// The .ar rules are:
// *.ar
// !congresodelalengua3.ar
// !educ.ar
// !gobiernoelectronico.ar
// !mecon.ar
// !nacion.ar
// !nic.ar
// !promocion.ar
// !retina.ar
// !uba.ar
// ar
// com.ar
// edu.ar
// gob.ar
// int.ar
// mil.ar
// net.ar
// org.ar
// tur.ar
// blogspot.com.ar
{"ar", "ar"},
{"www.ar", "www.ar"},
{"www.ar", "ar"},
{"nic.ar", "ar"},
{"www.nic.ar", "ar"},
{"com.ar", "com.ar"},
......
publicsuffix/table.go
View file @ a62ee055
This diff is collapsed.
publicsuffix/table_test.go
View file @ a62ee055
......@@ -148,16 +148,15 @@ var rules = [...]string{
"pb.ao",
"it.ao",
"aq",
"*.ar",
"!congresodelalengua3.ar",
"!educ.ar",
"!gobiernoelectronico.ar",
"!mecon.ar",
"!nacion.ar",
"!nic.ar",
"!promocion.ar",
"!retina.ar",
"!uba.ar",
"ar",
"com.ar",
"edu.ar",
"gob.ar",
"int.ar",
"mil.ar",
"net.ar",
"org.ar",
"tur.ar",
"e164.arpa",
"in-addr.arpa",
"ip6.arpa",
......@@ -179,6 +178,7 @@ var rules = [...]string{
"gov.au",
"asn.au",
"id.au",
"csiro.au",
"info.au",
"conf.au",
"oz.au",
......@@ -3770,12 +3770,16 @@ var rules = [...]string{
"info.nf",
"other.nf",
"store.nf",
"ac.ng",
"ng",
"com.ng",
"edu.ng",
"gov.ng",
"name.ng",
"net.ng",
"org.ng",
"sch.ng",
"gov.ng",
"mil.ng",
"mobi.ng",
"*.ni",
"nl",
"bv.nl",
......@@ -4544,7 +4548,16 @@ var rules = [...]string{
"com.nr",
"nu",
"*.nz",
"*.om",
"om",
"co.om",
"com.om",
"edu.om",
"gov.om",
"med.om",
"museum.om",
"net.om",
"org.om",
"pro.om",
"!mediaphone.om",
"!nawrastelecom.om",
"!nawras.om",
......@@ -5143,7 +5156,12 @@ var rules = [...]string{
"saotome.st",
"store.st",
"su",
"*.sv",
"sv",
"com.sv",
"edu.sv",
"gob.sv",
"org.sv",
"red.sv",
"sx",
"gov.sx",
"sy",
......@@ -5709,7 +5727,79 @@ var rules = [...]string{
"*.za",
"*.zm",
"*.zw",
"xn--80asehdb",
"xn--80aswg",
"xn--ngbc5azd",
"xn--unup4y",
"xn--vhquv",
"camera",
"clothing",
"lighting",
"singles",
"ventures",
"voyage",
"guru",
"holdings",
"equipment",
"bike",
"estate",
"tattoo",
"xn--3ds443g",
"xn--fiq228c5hs",
"land",
"plumbing",
"contractors",
"sexy",
"menu",
"xn--rhqv96g",
"uno",
"gallery",
"technology",
"xn--3bst00m",
"reviews",
"guide",
"xn--6qq986b3xl",
"graphics",
"construction",
"onl",
"xn--q9jyb4c",
"diamonds",
"kiwi",
"enterprises",
"today",
"futbol",
"photography",
"tips",
"directory",
"kitchen",
"xn--6frz82g",
"kim",
"xn--cg4bki",
"monash",
"wed",
"pink",
"ruhr",
"buzz",
"careers",
"shoes",
"xn--4gbrim",
"career",
"otsuka",
"xn--fiq64b",
"cloudfront.net",
"compute.amazonaws.com",
"us-east-1.amazonaws.com",
"compute-1.amazonaws.com",
"z-1.compute-1.amazonaws.com",
"z-2.compute-1.amazonaws.com",
"ap-northeast-1.compute.amazonaws.com",
"ap-southeast-1.compute.amazonaws.com",
"ap-southeast-2.compute.amazonaws.com",
"eu-west-1.compute.amazonaws.com",
"sa-east-1.compute.amazonaws.com",
"us-gov-west-1.compute.amazonaws.com",
"us-west-1.compute.amazonaws.com",
"us-west-2.compute.amazonaws.com",
"elasticbeanstalk.com",
"elb.amazonaws.com",
"s3.amazonaws.com",
......@@ -5760,6 +5850,8 @@ var rules = [...]string{
"uy.com",
"za.com",
"c.la",
"cloudcontrolled.com",
"cloudcontrolapp.com",
"co.ca",
"co.nl",
"co.no",
......@@ -6043,7 +6135,13 @@ var rules = [...]string{
"webhop.org",
"worse-than.tv",
"writesthisblog.com",
"a.ssl.fastly.net",
"b.ssl.fastly.net",
"global.ssl.fastly.net",
"a.prod.fastly.net",
"global.prod.fastly.net",
"github.io",
"ro.com",
"appspot.com",
"blogspot.be",
"blogspot.bj",
......@@ -6088,6 +6186,8 @@ var rules = [...]string{
"codespot.com",
"googleapis.com",
"googlecode.com",
"herokuapp.com",
"herokussl.com",
"iki.fi",
"biz.at",
"info.at",
......@@ -6130,6 +6230,7 @@ var nodeLabels = [...]string{
"bg",
"bh",
"bi",
"bike",
"biz",
"bj",
"bm",
......@@ -6138,10 +6239,14 @@ var nodeLabels = [...]string{
"br",
"bs",
"bt",
"buzz",
"bw",
"by",
"bz",
"ca",
"camera",
"career",
"careers",
"cat",
"cc",
"cd",
......@@ -6151,10 +6256,13 @@ var nodeLabels = [...]string{
"ci",
"ck",
"cl",
"clothing",
"cm",
"cn",
"co",
"com",
"construction",
"contractors",
"coop",
"cr",
"cu",
......@@ -6164,6 +6272,8 @@ var nodeLabels = [...]string{
"cy",
"cz",
"de",
"diamonds",
"directory",
"dj",
"dk",
"dm",
......@@ -6173,8 +6283,11 @@ var nodeLabels = [...]string{
"edu",
"ee",
"eg",
"enterprises",
"equipment",
"er",
"es",
"estate",
"et",
"eu",
"fi",
......@@ -6183,7 +6296,9 @@ var nodeLabels = [...]string{
"fm",
"fo",
"fr",
"futbol",
"ga",
"gallery",
"gd",
"ge",
"gf",
......@@ -6197,14 +6312,18 @@ var nodeLabels = [...]string{
"gp",
"gq",
"gr",
"graphics",
"gs",
"gt",
"gu",
"guide",
"guru",
"gw",
"gy",
"hk",
"hm",
"hn",
"holdings",
"hr",
"ht",
"hu",
......@@ -6229,6 +6348,9 @@ var nodeLabels = [...]string{
"kg",
"kh",
"ki",
"kim",
"kitchen",
"kiwi",
"km",
"kn",
"kp",
......@@ -6237,9 +6359,11 @@ var nodeLabels = [...]string{
"ky",
"kz",
"la",
"land",
"lb",
"lc",
"li",
"lighting",
"lk",
"lr",
"ls",
......@@ -6251,6 +6375,7 @@ var nodeLabels = [...]string{
"mc",
"md",
"me",
"menu",
"mg",
"mh",
"mil",
......@@ -6260,6 +6385,7 @@ var nodeLabels = [...]string{
"mn",
"mo",
"mobi",
"monash",
"mp",
"mq",
"mr",
......@@ -6287,14 +6413,19 @@ var nodeLabels = [...]string{
"nu",
"nz",
"om",
"onl",
"org",
"otsuka",
"pa",
"pe",
"pf",
"pg",
"ph",
"photography",
"pink",
"pk",
"pl",
"plumbing",
"pm",
"pn",
"post",
......@@ -6306,18 +6437,23 @@ var nodeLabels = [...]string{
"py",
"qa",
"re",
"reviews",
"ro",
"rs",
"ru",
"ruhr",
"rw",
"sa",
"sb",
"sc",
"sd",
"se",
"sexy",
"sg",
"sh",
"shoes",
"si",
"singles",
"sk",
"sl",
"sm",
......@@ -6330,18 +6466,22 @@ var nodeLabels = [...]string{
"sx",
"sy",
"sz",
"tattoo",
"tc",
"td",
"technology",
"tel",
"tf",
"tg",
"th",
"tips",
"tj",
"tk",
"tl",
"tm",
"tn",
"to",
"today",
"tr",
"travel",
"tt",
......@@ -6351,23 +6491,37 @@ var nodeLabels = [...]string{
"ua",
"ug",
"uk",
"uno",
"us",
"uy",
"uz",
"va",
"vc",
"ve",
"ventures",
"vg",
"vi",
"vn",
"voyage",
"vu",
"wed",
"wf",
"ws",
"xn--3bst00m",
"xn--3ds443g",
"xn--3e0b707e",
"xn--45brj9c",
"xn--4gbrim",
"xn--54b7fta0cc",
"xn--6frz82g",
"xn--6qq986b3xl",
"xn--80asehdb",
"xn--80aswg",
"xn--90a3ac",
"xn--cg4bki",
"xn--clchc0ea0b2g2a9gcd",
"xn--fiq228c5hs",
"xn--fiq64b",
"xn--fiqs8s",
"xn--fiqz9s",
"xn--fpcrj9c3d",
......@@ -6392,13 +6546,18 @@ var nodeLabels = [...]string{
"xn--mgbqly7c0a67fbc",
"xn--mgbqly7cvafr",
"xn--mgbtf8fl",
"xn--ngbc5azd",
"xn--nnx388a",
"xn--node",
"xn--o3cw4h",
"xn--ogbpf8fl",
"xn--p1ai",
"xn--pgbs0dh",
"xn--q9jyb4c",
"xn--rhqv96g",
"xn--s9brj9c",
"xn--unup4y",
"xn--vhquv",
"xn--wgbh1c",
"xn--wgbl6a",
"xn--xkc2al3hye2a",
......@@ -6545,15 +6704,13 @@ var nodeLabels = [...]string{
"og",
"pb",
"com",
"congresodelalengua3",
"educ",
"gobiernoelectronico",
"mecon",
"nacion",
"nic",
"promocion",
"retina",
"uba",
"edu",
"gob",
"int",
"mil",
"net",
"org",
"tur",
"blogspot",
"e164",
"in-addr",
......@@ -6574,6 +6731,7 @@ var nodeLabels = [...]string{
"asn",
"com",
"conf",
"csiro",
"edu",
"gov",
"id",
......@@ -6910,6 +7068,8 @@ var nodeLabels = [...]string{
"blogspot",
"br",
"cechire",
"cloudcontrolapp",
"cloudcontrolled",
"cn",
"codespot",
"de",
......@@ -6994,6 +7154,8 @@ var nodeLabels = [...]string{
"googlecode",
"gotdns",
"gr",
"herokuapp",
"herokussl",
"hobby-site",
"homelinux",
"homeunix",
......@@ -7066,6 +7228,7 @@ var nodeLabels = [...]string{
"operaunite",
"qc",
"rhcloud",
"ro",
"ru",
"sa",
"saves-the-whales",
......@@ -7082,6 +7245,8 @@ var nodeLabels = [...]string{
"uy",
"writesthisblog",
"za",
"compute",
"compute-1",
"elb",
"s3",
"s3-ap-northeast-1",
......@@ -7102,6 +7267,17 @@ var nodeLabels = [...]string{
"s3-website-us-gov-west-1",
"s3-website-us-west-1",
"s3-website-us-west-2",
"us-east-1",
"ap-northeast-1",
"ap-southeast-1",
"ap-southeast-2",
"eu-west-1",
"sa-east-1",
"us-gov-west-1",
"us-west-1",
"us-west-2",
"z-1",
"z-2",
"ac",
"co",
"ed",
......@@ -10279,6 +10455,7 @@ var nodeLabels = [...]string{
"dynalias",
"dynathome",
"endofinternet",
"fastly",
"from-az",
"from-co",
"from-la",
......@@ -10309,6 +10486,13 @@ var nodeLabels = [...]string{
"uk",
"webhop",
"za",
"prod",
"ssl",
"a",
"global",
"a",
"b",
"global",
"arts",
"com",
"firm",
......@@ -10319,12 +10503,15 @@ var nodeLabels = [...]string{
"rec",
"store",
"web",
"ac",
"com",
"edu",
"gov",
"mil",
"mobi",
"name",
"net",
"org",
"sch",
"blogspot",
"bv",
"co",
......@@ -11106,12 +11293,21 @@ var nodeLabels = [...]string{
"shacknet",
"co",
"blogspot",
"co",
"com",
"edu",
"gov",
"med",
"mediaphone",
"museum",
"nawras",
"nawrastelecom",
"net",
"omanmobile",
"omanpost",
"omantel",
"org",
"pro",
"rakpetroleum",
"siemens",
"songfest",
......@@ -11727,6 +11923,11 @@ var nodeLabels = [...]string{
"principe",
"saotome",
"store",
"com",
"edu",
"gob",
"org",
"red",
"gov",
"com",
"edu",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment