remove unused utils.HostnameFromAddr function

This commit is contained in:
Marten Seemann
2019-06-27 11:13:53 +08:00
parent eef45be73b
commit 2f09e1774c
2 changed files with 0 additions and 76 deletions

View File

@@ -1,27 +0,0 @@
package utils
import (
"net/url"
"strings"
)
// HostnameFromAddr determines the hostname in an address string
func HostnameFromAddr(addr string) (string, error) {
p, err := url.Parse(addr)
if err != nil {
return "", err
}
h := p.Host
// copied from https://golang.org/src/net/http/transport.go
if hasPort(h) {
h = h[:strings.LastIndex(h, ":")]
}
return h, nil
}
// copied from https://golang.org/src/net/http/http.go
func hasPort(s string) bool {
return strings.LastIndex(s, ":") > strings.LastIndex(s, "]")
}

View File

@@ -1,49 +0,0 @@
package utils
import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
var _ = Describe("Hostname", func() {
It("gets the hostname from an URL", func() {
h, err := HostnameFromAddr("https://quic.clemente.io/file.dat?param=true&param2=false")
Expect(err).ToNot(HaveOccurred())
Expect(h).To(Equal("quic.clemente.io"))
})
It("gets the hostname from an URL with a port number", func() {
h, err := HostnameFromAddr("https://quic.clemente.io:6121/file.dat")
Expect(err).ToNot(HaveOccurred())
Expect(h).To(Equal("quic.clemente.io"))
})
It("gets the hostname from an URL containing username and password", func() {
h, err := HostnameFromAddr("https://user:password@quic.clemente.io:6121/file.dat")
Expect(err).ToNot(HaveOccurred())
Expect(h).To(Equal("quic.clemente.io"))
})
It("gets local hostnames", func() {
h, err := HostnameFromAddr("https://localhost/file.dat")
Expect(err).ToNot(HaveOccurred())
Expect(h).To(Equal("localhost"))
})
It("gets the hostname for other protocols", func() {
h, err := HostnameFromAddr("ftp://quic.clemente.io:6121/file.dat")
Expect(err).ToNot(HaveOccurred())
Expect(h).To(Equal("quic.clemente.io"))
})
It("gets an IP", func() {
h, err := HostnameFromAddr("https://1.3.3.7:6121/file.dat")
Expect(err).ToNot(HaveOccurred())
Expect(h).To(Equal("1.3.3.7"))
})
It("errors on malformed URLs", func() {
_, err := HostnameFromAddr("://quic.clemente.io:6121/file.dat")
Expect(err).To(HaveOccurred())
})
})