ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use svchost.Hostname for FriendlyHost validation 

Use the svchost.Hostname for FriendlyHost normalization and validation.
This commit is contained in:
James Bardin 2017-11-20 16:09:27 -05:00
parent 9162213b01
commit 1ac5871a09
1 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
registry/regsrc/friendly_host.go
View File

@ -4,7 +4,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"golang.org/x/net/idna" "github.com/hashicorp/terraform/svchost"
) )
var ( var (
@ -95,42 +95,22 @@ func ParseFriendlyHost(source string) (host *FriendlyHost, rest string) {
// name specifications. Not that IDN prefixes containing punycode are not valid // name specifications. Not that IDN prefixes containing punycode are not valid
// input which we expect to always be in user-input or normalised display form. // input which we expect to always be in user-input or normalised display form.
func (h *FriendlyHost) Valid() bool { func (h *FriendlyHost) Valid() bool {
if h.Display() == InvalidHostString { return svchost.IsValid(h.Raw)
return false
}
if h.Normalized() == InvalidHostString {
return false
}
if containsPuny(h.Raw) {
return false
}
return true
} }
// Display returns the host formatted for display to the user in CLI or web // Display returns the host formatted for display to the user in CLI or web
// output. // output.
func (h *FriendlyHost) Display() string { func (h *FriendlyHost) Display() string {
parts := strings.SplitN(h.Raw, ":", 2) return svchost.ForDisplay(h.Raw)
var err error
parts[0], err = idna.Display.ToUnicode(parts[0])
if err != nil {
return InvalidHostString
}
return strings.Join(parts, ":")
} }
// Normalized returns the host formatted for internal reference or comparison. // Normalized returns the host formatted for internal reference or comparison.
func (h *FriendlyHost) Normalized() string { func (h *FriendlyHost) Normalized() string {
// For now IDNA does all the normalisation we need including case-folding host, err := svchost.ForComparison(h.Raw)
// pure ASCII to lower. But breaks if a custom port is included while we
// want to allow that and normalize comparison including it,
parts := strings.SplitN(h.Raw, ":", 2)
var err error
parts[0], err = idna.Lookup.ToASCII(parts[0])
if err != nil { if err != nil {
return InvalidHostString return InvalidHostString
} }
return strings.Join(parts, ":") return string(host)
} }
// String returns the host formatted as the user originally typed it assuming it // String returns the host formatted as the user originally typed it assuming it
@ -140,19 +120,15 @@ func (h *FriendlyHost) String() string {
} }
// Equal compares the FriendlyHost against another instance taking normalization // Equal compares the FriendlyHost against another instance taking normalization
// into account. // into account. Invalid hosts cannot be compared and will always return false.
func (h *FriendlyHost) Equal(other *FriendlyHost) bool { func (h *FriendlyHost) Equal(other *FriendlyHost) bool {
if other == nil { if other == nil {
return false return false
} }
return h.Normalized() == other.Normalized() return h.Normalized() == other.Normalized()
} }
func containsPuny(host string) bool { func (h *FriendlyHost) SvcHost() (svchost.Hostname, error) {
for _, lbl := range strings.Split(host, ".") { return svchost.ForComparison(h.Raw)
if strings.HasPrefix(strings.ToLower(lbl), "xn--") {
return true
}
}
return false
} }