From cf23ab9ff4bb8f9cfe99d65a32869a3fd71b7554 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Fri, 12 Aug 2016 16:41:18 +0200 Subject: [PATCH] deps: move go-is-domain to gx License: MIT Signed-off-by: Jakub Sztandera --- Godeps/Godeps.json | 4 - .../github.com/jbenet/go-is-domain/LICENSE | 21 - .../github.com/jbenet/go-is-domain/README.md | 23 - .../src/github.com/jbenet/go-is-domain/doc.go | 13 - .../jbenet/go-is-domain/domainre.go | 12 - .../jbenet/go-is-domain/is_domain.go | 44 -- .../jbenet/go-is-domain/is_domain_test.go | 29 - .../go-is-domain/tlds-alpha-by-domain.txt | 727 ----------------- .../github.com/jbenet/go-is-domain/tlds.go | 737 ------------------ core/corehttp/ipns_hostname.go | 2 +- namesys/dns.go | 2 +- package.json | 6 + 12 files changed, 8 insertions(+), 1612 deletions(-) delete mode 100644 Godeps/_workspace/src/github.com/jbenet/go-is-domain/LICENSE delete mode 100644 Godeps/_workspace/src/github.com/jbenet/go-is-domain/README.md delete mode 100644 Godeps/_workspace/src/github.com/jbenet/go-is-domain/doc.go delete mode 100644 Godeps/_workspace/src/github.com/jbenet/go-is-domain/domainre.go delete mode 100644 Godeps/_workspace/src/github.com/jbenet/go-is-domain/is_domain.go delete mode 100644 Godeps/_workspace/src/github.com/jbenet/go-is-domain/is_domain_test.go delete mode 100644 Godeps/_workspace/src/github.com/jbenet/go-is-domain/tlds-alpha-by-domain.txt delete mode 100644 Godeps/_workspace/src/github.com/jbenet/go-is-domain/tlds.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 2f28be476..399b2c034 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -33,10 +33,6 @@ "ImportPath": "github.com/jbenet/go-detect-race", "Rev": "3463798d9574bd0b7eca275dccc530804ff5216f" }, - { - "ImportPath": "github.com/jbenet/go-is-domain", - "Rev": "93b717f2ae17838a265e30277275ee99ee7198d6" - }, { "ImportPath": "github.com/jbenet/go-os-rename", "Rev": "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2" diff --git a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/LICENSE b/Godeps/_workspace/src/github.com/jbenet/go-is-domain/LICENSE deleted file mode 100644 index c7386b3c9..000000000 --- a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 Juan Batiz-Benet - -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. diff --git a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/README.md b/Godeps/_workspace/src/github.com/jbenet/go-is-domain/README.md deleted file mode 100644 index 21af7b395..000000000 --- a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# go-is-domain - -This package is dedicated to [@whyrusleeping](https://github.com/whyrusleeping). - -Docs: https://godoc.org/github.com/jbenet/go-is-domain - - -Check whether something is a domain. - - -```Go - -import ( - isd "github.com/jbenet/go-is-domain" -) - -isd.IsDomain("foo.com") // true -isd.IsDomain("foo.bar.com.") // true -isd.IsDomain("foo.bar.baz") // false - -``` - -MIT Licensed diff --git a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/doc.go b/Godeps/_workspace/src/github.com/jbenet/go-is-domain/doc.go deleted file mode 100644 index db6855c4a..000000000 --- a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/doc.go +++ /dev/null @@ -1,13 +0,0 @@ -/* -Package isdomain package allows users to check whether strings represent domain names. - - import ( - isd "github.com/jbenet/go-is-domain" - ) - - isd.IsDomain("foo.com") // true - isd.IsDomain("foo.bar.com.") // true - isd.IsDomain("foo.bar.baz") // false - -*/ -package isdomain diff --git a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/domainre.go b/Godeps/_workspace/src/github.com/jbenet/go-is-domain/domainre.go deleted file mode 100644 index 3b915f8e8..000000000 --- a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/domainre.go +++ /dev/null @@ -1,12 +0,0 @@ -package isdomain - -import "regexp" - -// DomainRegexpStr is a regular expression string to validate domains. -const DomainRegexpStr = "^([a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,}$" - -var domainRegexp *regexp.Regexp - -func init() { - domainRegexp = regexp.MustCompile(DomainRegexpStr) -} diff --git a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/is_domain.go b/Godeps/_workspace/src/github.com/jbenet/go-is-domain/is_domain.go deleted file mode 100644 index 7591c7dc4..000000000 --- a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/is_domain.go +++ /dev/null @@ -1,44 +0,0 @@ -package isdomain - -import "strings" - -// IsICANNTLD returns whether the given string is a TLD (Top Level Domain), -// according to ICANN. Well, really according to the TLDs listed in this -// package. -func IsICANNTLD(s string) bool { - s = strings.ToUpper(s) - _, found := TLDs[s] - return found -} - -// IsExtendedTLD returns whether the given string is a TLD (Top Level Domain), -// extended with a few other "TLDs": .bit, .onion -func IsExtendedTLD(s string) bool { - s = strings.ToUpper(s) - _, found := ExtendedTLDs[s] - return found -} - -// IsTLD returns whether the given string is a TLD (according to ICANN, or -// in the set of ExtendedTLDs listed in this package. -func IsTLD(s string) bool { - return IsICANNTLD(s) || IsExtendedTLD(s) -} - -// IsDomain returns whether given string is a domain. -// It first checks the TLD, and then uses a regular expression. -func IsDomain(s string) bool { - if strings.HasSuffix(s, ".") { - s = s[:len(s)-1] - } - - split := strings.Split(s, ".") - tld := split[len(split)-1] - - if !IsTLD(tld) { - return false - } - - s = strings.ToLower(s) - return domainRegexp.MatchString(s) -} diff --git a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/is_domain_test.go b/Godeps/_workspace/src/github.com/jbenet/go-is-domain/is_domain_test.go deleted file mode 100644 index 6bd224ef4..000000000 --- a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/is_domain_test.go +++ /dev/null @@ -1,29 +0,0 @@ -package isdomain - -import "testing" - -func TestBasic(t *testing.T) { - cases := map[string]bool{ - "foo.bar.baz.com": true, - "foo.bar.baz": false, - "foo.bar.baz.com.": true, - "com": false, // yeah yeah... - ".": false, // yeah yeah... - "..": false, - ".foo.com.": false, - ".foo.com": false, - "fo o.com": false, - "example.com": true, - "fjdoisajfdiosafdsa8fd8saf8dsa8fdsafdsa-fd-sa-fd-saf-dsa.org": true, - "fjdoisajfdiosafdsa8fd8saf8dsa8fdsafdsa-fd-sa-fd-saf-dsa.bit": true, - "fjdoisajfdiosafdsa8fd8saf8dsa8fdsafdsa-fd-sa-fd-saf-dsa.onion": true, - "a.b.c.d.e.f.g.h.i.j.k.l.museum": true, - "a.b.c.d.e.f.g.h.i.j.k.l": false, - } - - for d, ok := range cases { - if IsDomain(d) != ok { - t.Errorf("Misclassification: %v should be %v", d, ok) - } - } -} diff --git a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/tlds-alpha-by-domain.txt b/Godeps/_workspace/src/github.com/jbenet/go-is-domain/tlds-alpha-by-domain.txt deleted file mode 100644 index 521f80e7a..000000000 --- a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/tlds-alpha-by-domain.txt +++ /dev/null @@ -1,727 +0,0 @@ -# from http://data.iana.org/TLD/tlds-alpha-by-domain.txt -# Version 2014100300, Last Updated Fri Oct 3 07:07:01 2014 UTC -AC -ACADEMY -ACCOUNTANTS -ACTIVE -ACTOR -AD -AE -AERO -AF -AG -AGENCY -AI -AIRFORCE -AL -ALLFINANZ -AM -AN -AO -AQ -AR -ARCHI -ARMY -ARPA -AS -ASIA -ASSOCIATES -AT -ATTORNEY -AU -AUCTION -AUDIO -AUTOS -AW -AX -AXA -AZ -BA -BAR -BARGAINS -BAYERN -BB -BD -BE -BEER -BERLIN -BEST -BF -BG -BH -BI -BID -BIKE -BIO -BIZ -BJ -BLACK -BLACKFRIDAY -BLUE -BM -BMW -BN -BNPPARIBAS -BO -BOO -BOUTIQUE -BR -BRUSSELS -BS -BT -BUDAPEST -BUILD -BUILDERS -BUSINESS -BUZZ -BV -BW -BY -BZ -BZH -CA -CAB -CAL -CAMERA -CAMP -CANCERRESEARCH -CAPETOWN -CAPITAL -CARAVAN -CARDS -CARE -CAREER -CAREERS -CASA -CASH -CAT -CATERING -CC -CD -CENTER -CEO -CERN -CF -CG -CH -CHANNEL -CHEAP -CHRISTMAS -CHROME -CHURCH -CI -CITIC -CITY -CK -CL -CLAIMS -CLEANING -CLICK -CLINIC -CLOTHING -CLUB -CM -CN -CO -CODES -COFFEE -COLLEGE -COLOGNE -COM -COMMUNITY -COMPANY -COMPUTER -CONDOS -CONSTRUCTION -CONSULTING -CONTRACTORS -COOKING -COOL -COOP -COUNTRY -CR -CREDIT -CREDITCARD -CRUISES -CU -CUISINELLA -CV -CW -CX -CY -CYMRU -CZ -DAD -DANCE -DATING -DAY -DE -DEALS -DEGREE -DEMOCRAT -DENTAL -DENTIST -DESI -DIAMONDS -DIET -DIGITAL -DIRECT -DIRECTORY -DISCOUNT -DJ -DK -DM -DNP -DO -DOMAINS -DURBAN -DVAG -DZ -EAT -EC -EDU -EDUCATION -EE -EG -EMAIL -ENGINEER -ENGINEERING -ENTERPRISES -EQUIPMENT -ER -ES -ESQ -ESTATE -ET -EU -EUS -EVENTS -EXCHANGE -EXPERT -EXPOSED -FAIL -FARM -FEEDBACK -FI -FINANCE -FINANCIAL -FISH -FISHING -FITNESS -FJ -FK -FLIGHTS -FLORIST -FLY -FM -FO -FOO -FORSALE -FOUNDATION -FR -FRL -FROGANS -FUND -FURNITURE -FUTBOL -GA -GAL -GALLERY -GB -GBIZ -GD -GE -GENT -GF -GG -GH -GI -GIFT -GIFTS -GIVES -GL -GLASS -GLE -GLOBAL -GLOBO -GM -GMAIL -GMO -GMX -GN -GOOGLE -GOP -GOV -GP -GQ -GR -GRAPHICS -GRATIS -GREEN -GRIPE -GS -GT -GU -GUIDE -GUITARS -GURU -GW -GY -HAMBURG -HAUS -HEALTHCARE -HELP -HERE -HIPHOP -HIV -HK -HM -HN -HOLDINGS -HOLIDAY -HOMES -HORSE -HOST -HOSTING -HOUSE -HOW -HR -HT -HU -IBM -ID -IE -IL -IM -IMMO -IMMOBILIEN -IN -INDUSTRIES -INFO -ING -INK -INSTITUTE -INSURE -INT -INTERNATIONAL -INVESTMENTS -IO -IQ -IR -IS -IT -JE -JETZT -JM -JO -JOBS -JOBURG -JP -JUEGOS -KAUFEN -KE -KG -KH -KI -KIM -KITCHEN -KIWI -KM -KN -KOELN -KP -KR -KRD -KRED -KW -KY -KZ -LA -LACAIXA -LAND -LAWYER -LB -LC -LEASE -LGBT -LI -LIFE -LIGHTING -LIMITED -LIMO -LINK -LK -LOANS -LONDON -LOTTO -LR -LS -LT -LTDA -LU -LUXE -LUXURY -LV -LY -MA -MAISON -MANAGEMENT -MANGO -MARKET -MARKETING -MC -MD -ME -MEDIA -MEET -MELBOURNE -MEME -MENU -MG -MH -MIAMI -MIL -MINI -MK -ML -MM -MN -MO -MOBI -MODA -MOE -MONASH -MORTGAGE -MOSCOW -MOTORCYCLES -MOV -MP -MQ -MR -MS -MT -MU -MUSEUM -MV -MW -MX -MY -MZ -NA -NAGOYA -NAME -NAVY -NC -NE -NET -NETWORK -NEUSTAR -NEW -NEXUS -NF -NG -NGO -NHK -NI -NINJA -NL -NO -NP -NR -NRA -NRW -NU -NYC -NZ -OKINAWA -OM -ONG -ONL -OOO -ORG -ORGANIC -OTSUKA -OVH -PA -PARIS -PARTNERS -PARTS -PE -PF -PG -PH -PHARMACY -PHOTO -PHOTOGRAPHY -PHOTOS -PHYSIO -PICS -PICTURES -PINK -PIZZA -PK -PL -PLACE -PLUMBING -PM -PN -POHL -POST -PR -PRAXI -PRESS -PRO -PROD -PRODUCTIONS -PROF -PROPERTIES -PROPERTY -PS -PT -PUB -PW -PY -QA -QPON -QUEBEC -RE -REALTOR -RECIPES -RED -REHAB -REISE -REISEN -REN -RENTALS -REPAIR -REPORT -REPUBLICAN -REST -RESTAURANT -REVIEWS -RICH -RIO -RO -ROCKS -RODEO -RS -RSVP -RU -RUHR -RW -RYUKYU -SA -SAARLAND -SARL -SB -SC -SCA -SCB -SCHMIDT -SCHULE -SCOT -SD -SE -SERVICES -SEXY -SG -SH -SHIKSHA -SHOES -SI -SINGLES -SJ -SK -SL -SM -SN -SO -SOCIAL -SOFTWARE -SOHU -SOLAR -SOLUTIONS -SOY -SPACE -SPIEGEL -SR -ST -SU -SUPPLIES -SUPPLY -SUPPORT -SURF -SURGERY -SUZUKI -SV -SX -SY -SYSTEMS -SZ -TATAR -TATTOO -TAX -TC -TD -TECHNOLOGY -TEL -TF -TG -TH -TIENDA -TIPS -TIROL -TJ -TK -TL -TM -TN -TO -TODAY -TOKYO -TOOLS -TOP -TOWN -TOYS -TP -TR -TRADE -TRAINING -TRAVEL -TT -TUI -TV -TW -TZ -UA -UG -UK -UNIVERSITY -UNO -UOL -US -UY -UZ -VA -VACATIONS -VC -VE -VEGAS -VENTURES -VERSICHERUNG -VET -VG -VI -VIAJES -VILLAS -VISION -VLAANDEREN -VN -VODKA -VOTE -VOTING -VOTO -VOYAGE -VU -WALES -WANG -WATCH -WEBCAM -WEBSITE -WED -WF -WHOSWHO -WIEN -WIKI -WILLIAMHILL -WME -WORK -WORKS -WORLD -WS -WTC -WTF -XN--1QQW23A -XN--3BST00M -XN--3DS443G -XN--3E0B707E -XN--45BRJ9C -XN--4GBRIM -XN--55QW42G -XN--55QX5D -XN--6FRZ82G -XN--6QQ986B3XL -XN--80ADXHKS -XN--80AO21A -XN--80ASEHDB -XN--80ASWG -XN--90A3AC -XN--C1AVG -XN--CG4BKI -XN--CLCHC0EA0B2G2A9GCD -XN--CZR694B -XN--CZRU2D -XN--D1ACJ3B -XN--FIQ228C5HS -XN--FIQ64B -XN--FIQS8S -XN--FIQZ9S -XN--FPCRJ9C3D -XN--FZC2C9E2C -XN--GECRJ9C -XN--H2BRJ9C -XN--I1B6B1A6A2E -XN--IO0A7I -XN--J1AMH -XN--J6W193G -XN--KPRW13D -XN--KPRY57D -XN--KPUT3I -XN--L1ACC -XN--LGBBAT1AD8J -XN--MGB9AWBF -XN--MGBA3A4F16A -XN--MGBAAM7A8H -XN--MGBAB2BD -XN--MGBAYH7GPA -XN--MGBBH1A71E -XN--MGBC0A9AZCG -XN--MGBERP4A5D4AR -XN--MGBX4CD0AB -XN--NGBC5AZD -XN--NQV7F -XN--NQV7FS00EMA -XN--O3CW4H -XN--OGBPF8FL -XN--P1ACF -XN--P1AI -XN--PGBS0DH -XN--Q9JYB4C -XN--RHQV96G -XN--S9BRJ9C -XN--SES554G -XN--UNUP4Y -XN--VERMGENSBERATER-CTB -XN--VERMGENSBERATUNG-PWB -XN--VHQUV -XN--WGBH1C -XN--WGBL6A -XN--XHQ521B -XN--XKC2AL3HYE2A -XN--XKC2DL3A5EE0H -XN--YFRO4I67O -XN--YGBI2AMMX -XN--ZFR164B -XXX -XYZ -YACHTS -YANDEX -YE -YOKOHAMA -YOUTUBE -YT -ZA -ZIP -ZM -ZONE -ZW diff --git a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/tlds.go b/Godeps/_workspace/src/github.com/jbenet/go-is-domain/tlds.go deleted file mode 100644 index c4969dbc2..000000000 --- a/Godeps/_workspace/src/github.com/jbenet/go-is-domain/tlds.go +++ /dev/null @@ -1,737 +0,0 @@ -package isdomain - -// TLDs is a set of TLDs, according to ICANN in 2014. -var TLDs = map[string]bool{ - "AC": true, - "ACADEMY": true, - "ACCOUNTANTS": true, - "ACTIVE": true, - "ACTOR": true, - "AD": true, - "AE": true, - "AERO": true, - "AF": true, - "AG": true, - "AGENCY": true, - "AI": true, - "AIRFORCE": true, - "AL": true, - "ALLFINANZ": true, - "AM": true, - "AN": true, - "AO": true, - "AQ": true, - "AR": true, - "ARCHI": true, - "ARMY": true, - "ARPA": true, - "AS": true, - "ASIA": true, - "ASSOCIATES": true, - "AT": true, - "ATTORNEY": true, - "AU": true, - "AUCTION": true, - "AUDIO": true, - "AUTOS": true, - "AW": true, - "AX": true, - "AXA": true, - "AZ": true, - "BA": true, - "BAR": true, - "BARGAINS": true, - "BAYERN": true, - "BB": true, - "BD": true, - "BE": true, - "BEER": true, - "BERLIN": true, - "BEST": true, - "BF": true, - "BG": true, - "BH": true, - "BI": true, - "BID": true, - "BIKE": true, - "BIO": true, - "BIZ": true, - "BJ": true, - "BLACK": true, - "BLACKFRIDAY": true, - "BLUE": true, - "BM": true, - "BMW": true, - "BN": true, - "BNPPARIBAS": true, - "BO": true, - "BOO": true, - "BOUTIQUE": true, - "BR": true, - "BRUSSELS": true, - "BS": true, - "BT": true, - "BUDAPEST": true, - "BUILD": true, - "BUILDERS": true, - "BUSINESS": true, - "BUZZ": true, - "BV": true, - "BW": true, - "BY": true, - "BZ": true, - "BZH": true, - "CA": true, - "CAB": true, - "CAL": true, - "CAMERA": true, - "CAMP": true, - "CANCERRESEARCH": true, - "CAPETOWN": true, - "CAPITAL": true, - "CARAVAN": true, - "CARDS": true, - "CARE": true, - "CAREER": true, - "CAREERS": true, - "CASA": true, - "CASH": true, - "CAT": true, - "CATERING": true, - "CC": true, - "CD": true, - "CENTER": true, - "CEO": true, - "CERN": true, - "CF": true, - "CG": true, - "CH": true, - "CHANNEL": true, - "CHEAP": true, - "CHRISTMAS": true, - "CHROME": true, - "CHURCH": true, - "CI": true, - "CITIC": true, - "CITY": true, - "CK": true, - "CL": true, - "CLAIMS": true, - "CLEANING": true, - "CLICK": true, - "CLINIC": true, - "CLOTHING": true, - "CLUB": true, - "CM": true, - "CN": true, - "CO": true, - "CODES": true, - "COFFEE": true, - "COLLEGE": true, - "COLOGNE": true, - "COM": true, - "COMMUNITY": true, - "COMPANY": true, - "COMPUTER": true, - "CONDOS": true, - "CONSTRUCTION": true, - "CONSULTING": true, - "CONTRACTORS": true, - "COOKING": true, - "COOL": true, - "COOP": true, - "COUNTRY": true, - "CR": true, - "CREDIT": true, - "CREDITCARD": true, - "CRUISES": true, - "CU": true, - "CUISINELLA": true, - "CV": true, - "CW": true, - "CX": true, - "CY": true, - "CYMRU": true, - "CZ": true, - "DAD": true, - "DANCE": true, - "DATING": true, - "DAY": true, - "DE": true, - "DEALS": true, - "DEGREE": true, - "DEMOCRAT": true, - "DENTAL": true, - "DENTIST": true, - "DESI": true, - "DIAMONDS": true, - "DIET": true, - "DIGITAL": true, - "DIRECT": true, - "DIRECTORY": true, - "DISCOUNT": true, - "DJ": true, - "DK": true, - "DM": true, - "DNP": true, - "DO": true, - "DOMAINS": true, - "DURBAN": true, - "DVAG": true, - "DZ": true, - "EAT": true, - "EC": true, - "EDU": true, - "EDUCATION": true, - "EE": true, - "EG": true, - "EMAIL": true, - "ENGINEER": true, - "ENGINEERING": true, - "ENTERPRISES": true, - "EQUIPMENT": true, - "ER": true, - "ES": true, - "ESQ": true, - "ESTATE": true, - "ET": true, - "EU": true, - "EUS": true, - "EVENTS": true, - "EXCHANGE": true, - "EXPERT": true, - "EXPOSED": true, - "FAIL": true, - "FARM": true, - "FEEDBACK": true, - "FI": true, - "FINANCE": true, - "FINANCIAL": true, - "FISH": true, - "FISHING": true, - "FITNESS": true, - "FJ": true, - "FK": true, - "FLIGHTS": true, - "FLORIST": true, - "FLY": true, - "FM": true, - "FO": true, - "FOO": true, - "FORSALE": true, - "FOUNDATION": true, - "FR": true, - "FRL": true, - "FROGANS": true, - "FUND": true, - "FURNITURE": true, - "FUTBOL": true, - "GA": true, - "GAL": true, - "GALLERY": true, - "GB": true, - "GBIZ": true, - "GD": true, - "GE": true, - "GENT": true, - "GF": true, - "GG": true, - "GH": true, - "GI": true, - "GIFT": true, - "GIFTS": true, - "GIVES": true, - "GL": true, - "GLASS": true, - "GLE": true, - "GLOBAL": true, - "GLOBO": true, - "GM": true, - "GMAIL": true, - "GMO": true, - "GMX": true, - "GN": true, - "GOOGLE": true, - "GOP": true, - "GOV": true, - "GP": true, - "GQ": true, - "GR": true, - "GRAPHICS": true, - "GRATIS": true, - "GREEN": true, - "GRIPE": true, - "GS": true, - "GT": true, - "GU": true, - "GUIDE": true, - "GUITARS": true, - "GURU": true, - "GW": true, - "GY": true, - "HAMBURG": true, - "HAUS": true, - "HEALTHCARE": true, - "HELP": true, - "HERE": true, - "HIPHOP": true, - "HIV": true, - "HK": true, - "HM": true, - "HN": true, - "HOLDINGS": true, - "HOLIDAY": true, - "HOMES": true, - "HORSE": true, - "HOST": true, - "HOSTING": true, - "HOUSE": true, - "HOW": true, - "HR": true, - "HT": true, - "HU": true, - "IBM": true, - "ID": true, - "IE": true, - "IL": true, - "IM": true, - "IMMO": true, - "IMMOBILIEN": true, - "IN": true, - "INDUSTRIES": true, - "INFO": true, - "ING": true, - "INK": true, - "INSTITUTE": true, - "INSURE": true, - "INT": true, - "INTERNATIONAL": true, - "INVESTMENTS": true, - "IO": true, - "IQ": true, - "IR": true, - "IS": true, - "IT": true, - "JE": true, - "JETZT": true, - "JM": true, - "JO": true, - "JOBS": true, - "JOBURG": true, - "JP": true, - "JUEGOS": true, - "KAUFEN": true, - "KE": true, - "KG": true, - "KH": true, - "KI": true, - "KIM": true, - "KITCHEN": true, - "KIWI": true, - "KM": true, - "KN": true, - "KOELN": true, - "KP": true, - "KR": true, - "KRD": true, - "KRED": true, - "KW": true, - "KY": true, - "KZ": true, - "LA": true, - "LACAIXA": true, - "LAND": true, - "LAWYER": true, - "LB": true, - "LC": true, - "LEASE": true, - "LGBT": true, - "LI": true, - "LIFE": true, - "LIGHTING": true, - "LIMITED": true, - "LIMO": true, - "LINK": true, - "LK": true, - "LOANS": true, - "LONDON": true, - "LOTTO": true, - "LR": true, - "LS": true, - "LT": true, - "LTDA": true, - "LU": true, - "LUXE": true, - "LUXURY": true, - "LV": true, - "LY": true, - "MA": true, - "MAISON": true, - "MANAGEMENT": true, - "MANGO": true, - "MARKET": true, - "MARKETING": true, - "MC": true, - "MD": true, - "ME": true, - "MEDIA": true, - "MEET": true, - "MELBOURNE": true, - "MEME": true, - "MENU": true, - "MG": true, - "MH": true, - "MIAMI": true, - "MIL": true, - "MINI": true, - "MK": true, - "ML": true, - "MM": true, - "MN": true, - "MO": true, - "MOBI": true, - "MODA": true, - "MOE": true, - "MONASH": true, - "MORTGAGE": true, - "MOSCOW": true, - "MOTORCYCLES": true, - "MOV": true, - "MP": true, - "MQ": true, - "MR": true, - "MS": true, - "MT": true, - "MU": true, - "MUSEUM": true, - "MV": true, - "MW": true, - "MX": true, - "MY": true, - "MZ": true, - "NA": true, - "NAGOYA": true, - "NAME": true, - "NAVY": true, - "NC": true, - "NE": true, - "NET": true, - "NETWORK": true, - "NEUSTAR": true, - "NEW": true, - "NEXUS": true, - "NF": true, - "NG": true, - "NGO": true, - "NHK": true, - "NI": true, - "NINJA": true, - "NL": true, - "NO": true, - "NP": true, - "NR": true, - "NRA": true, - "NRW": true, - "NU": true, - "NYC": true, - "NZ": true, - "OKINAWA": true, - "OM": true, - "ONG": true, - "ONL": true, - "OOO": true, - "ORG": true, - "ORGANIC": true, - "OTSUKA": true, - "OVH": true, - "PA": true, - "PARIS": true, - "PARTNERS": true, - "PARTS": true, - "PE": true, - "PF": true, - "PG": true, - "PH": true, - "PHARMACY": true, - "PHOTO": true, - "PHOTOGRAPHY": true, - "PHOTOS": true, - "PHYSIO": true, - "PICS": true, - "PICTURES": true, - "PINK": true, - "PIZZA": true, - "PK": true, - "PL": true, - "PLACE": true, - "PLUMBING": true, - "PM": true, - "PN": true, - "POHL": true, - "POST": true, - "PR": true, - "PRAXI": true, - "PRESS": true, - "PRO": true, - "PROD": true, - "PRODUCTIONS": true, - "PROF": true, - "PROPERTIES": true, - "PROPERTY": true, - "PS": true, - "PT": true, - "PUB": true, - "PW": true, - "PY": true, - "QA": true, - "QPON": true, - "QUEBEC": true, - "RE": true, - "REALTOR": true, - "RECIPES": true, - "RED": true, - "REHAB": true, - "REISE": true, - "REISEN": true, - "REN": true, - "RENTALS": true, - "REPAIR": true, - "REPORT": true, - "REPUBLICAN": true, - "REST": true, - "RESTAURANT": true, - "REVIEWS": true, - "RICH": true, - "RIO": true, - "RO": true, - "ROCKS": true, - "RODEO": true, - "RS": true, - "RSVP": true, - "RU": true, - "RUHR": true, - "RW": true, - "RYUKYU": true, - "SA": true, - "SAARLAND": true, - "SARL": true, - "SB": true, - "SC": true, - "SCA": true, - "SCB": true, - "SCHMIDT": true, - "SCHULE": true, - "SCOT": true, - "SD": true, - "SE": true, - "SERVICES": true, - "SEXY": true, - "SG": true, - "SH": true, - "SHIKSHA": true, - "SHOES": true, - "SI": true, - "SINGLES": true, - "SJ": true, - "SK": true, - "SL": true, - "SM": true, - "SN": true, - "SO": true, - "SOCIAL": true, - "SOFTWARE": true, - "SOHU": true, - "SOLAR": true, - "SOLUTIONS": true, - "SOY": true, - "SPACE": true, - "SPIEGEL": true, - "SR": true, - "ST": true, - "SU": true, - "SUPPLIES": true, - "SUPPLY": true, - "SUPPORT": true, - "SURF": true, - "SURGERY": true, - "SUZUKI": true, - "SV": true, - "SX": true, - "SY": true, - "SYSTEMS": true, - "SZ": true, - "TATAR": true, - "TATTOO": true, - "TAX": true, - "TC": true, - "TD": true, - "TECHNOLOGY": true, - "TEL": true, - "TF": true, - "TG": true, - "TH": true, - "TIENDA": true, - "TIPS": true, - "TIROL": true, - "TJ": true, - "TK": true, - "TL": true, - "TM": true, - "TN": true, - "TO": true, - "TODAY": true, - "TOKYO": true, - "TOOLS": true, - "TOP": true, - "TOWN": true, - "TOYS": true, - "TP": true, - "TR": true, - "TRADE": true, - "TRAINING": true, - "TRAVEL": true, - "TT": true, - "TUI": true, - "TV": true, - "TW": true, - "TZ": true, - "UA": true, - "UG": true, - "UK": true, - "UNIVERSITY": true, - "UNO": true, - "UOL": true, - "US": true, - "UY": true, - "UZ": true, - "VA": true, - "VACATIONS": true, - "VC": true, - "VE": true, - "VEGAS": true, - "VENTURES": true, - "VERSICHERUNG": true, - "VET": true, - "VG": true, - "VI": true, - "VIAJES": true, - "VILLAS": true, - "VISION": true, - "VLAANDEREN": true, - "VN": true, - "VODKA": true, - "VOTE": true, - "VOTING": true, - "VOTO": true, - "VOYAGE": true, - "VU": true, - "WALES": true, - "WANG": true, - "WATCH": true, - "WEBCAM": true, - "WEBSITE": true, - "WED": true, - "WF": true, - "WHOSWHO": true, - "WIEN": true, - "WIKI": true, - "WILLIAMHILL": true, - "WME": true, - "WORK": true, - "WORKS": true, - "WORLD": true, - "WS": true, - "WTC": true, - "WTF": true, - "XN--1QQW23A": true, - "XN--3BST00M": true, - "XN--3DS443G": true, - "XN--3E0B707E": true, - "XN--45BRJ9C": true, - "XN--4GBRIM": true, - "XN--55QW42G": true, - "XN--55QX5D": true, - "XN--6FRZ82G": true, - "XN--6QQ986B3XL": true, - "XN--80ADXHKS": true, - "XN--80AO21A": true, - "XN--80ASEHDB": true, - "XN--80ASWG": true, - "XN--90A3AC": true, - "XN--C1AVG": true, - "XN--CG4BKI": true, - "XN--CLCHC0EA0B2G2A9GCD": true, - "XN--CZR694B": true, - "XN--CZRU2D": true, - "XN--D1ACJ3B": true, - "XN--FIQ228C5HS": true, - "XN--FIQ64B": true, - "XN--FIQS8S": true, - "XN--FIQZ9S": true, - "XN--FPCRJ9C3D": true, - "XN--FZC2C9E2C": true, - "XN--GECRJ9C": true, - "XN--H2BRJ9C": true, - "XN--I1B6B1A6A2E": true, - "XN--IO0A7I": true, - "XN--J1AMH": true, - "XN--J6W193G": true, - "XN--KPRW13D": true, - "XN--KPRY57D": true, - "XN--KPUT3I": true, - "XN--L1ACC": true, - "XN--LGBBAT1AD8J": true, - "XN--MGB9AWBF": true, - "XN--MGBA3A4F16A": true, - "XN--MGBAAM7A8H": true, - "XN--MGBAB2BD": true, - "XN--MGBAYH7GPA": true, - "XN--MGBBH1A71E": true, - "XN--MGBC0A9AZCG": true, - "XN--MGBERP4A5D4AR": true, - "XN--MGBX4CD0AB": true, - "XN--NGBC5AZD": true, - "XN--NQV7F": true, - "XN--NQV7FS00EMA": true, - "XN--O3CW4H": true, - "XN--OGBPF8FL": true, - "XN--P1ACF": true, - "XN--P1AI": true, - "XN--PGBS0DH": true, - "XN--Q9JYB4C": true, - "XN--RHQV96G": true, - "XN--S9BRJ9C": true, - "XN--SES554G": true, - "XN--UNUP4Y": true, - "XN--VERMGENSBERATER-CTB": true, - "XN--VERMGENSBERATUNG-PWB": true, - "XN--VHQUV": true, - "XN--WGBH1C": true, - "XN--WGBL6A": true, - "XN--XHQ521B": true, - "XN--XKC2AL3HYE2A": true, - "XN--XKC2DL3A5EE0H": true, - "XN--YFRO4I67O": true, - "XN--YGBI2AMMX": true, - "XN--ZFR164B": true, - "XXX": true, - "XYZ": true, - "YACHTS": true, - "YANDEX": true, - "YE": true, - "YOKOHAMA": true, - "YOUTUBE": true, - "YT": true, - "ZA": true, - "ZIP": true, - "ZM": true, - "ZONE": true, - "ZW": true, -} - -// ExtendedTLDs is a set of additional "TLDs", allowing decentralized name -// systems, like TOR and Namecoin. -var ExtendedTLDs = map[string]bool{ - "BIT": true, - "ONION": true, -} diff --git a/core/corehttp/ipns_hostname.go b/core/corehttp/ipns_hostname.go index c6b144040..b9fc25c1a 100644 --- a/core/corehttp/ipns_hostname.go +++ b/core/corehttp/ipns_hostname.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - isd "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-is-domain" "github.com/ipfs/go-ipfs/core" "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + isd "gx/ipfs/QmaeHSCBd9XjXxmgHEiKkHtLcMCb2eZsPLKT7bHgBfBkqw/go-is-domain" ) // IPNSHostnameOption rewrites an incoming request if its Host: header contains diff --git a/namesys/dns.go b/namesys/dns.go index bb9ebdfb3..d825ea00e 100644 --- a/namesys/dns.go +++ b/namesys/dns.go @@ -5,8 +5,8 @@ import ( "net" "strings" - isd "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-is-domain" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + isd "gx/ipfs/QmaeHSCBd9XjXxmgHEiKkHtLcMCb2eZsPLKT7bHgBfBkqw/go-is-domain" path "github.com/ipfs/go-ipfs/path" ) diff --git a/package.json b/package.json index 557d0e7aa..b9f25ac11 100644 --- a/package.json +++ b/package.json @@ -189,6 +189,12 @@ "hash": "QmVvJ27GcLaLSXvcB4auk3Gn3xuWK5ti5ENkZ2pCoJEYW4", "name": "autobatch", "version": "0.2.0" + }, + { + "author": "jbenet", + "hash": "QmaeHSCBd9XjXxmgHEiKkHtLcMCb2eZsPLKT7bHgBfBkqw", + "name": "go-is-domain", + "version": "1.0.0" } ], "gxVersion": "0.4.0",