mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
3153e635d5
This reverts commit f8ce5996b0566619fde8cca431890a49c52cf3d6. etcd no longer resolves TCP addresses passed in through flags, so there is no need to compare hostname and IP slices anymore. (for more details: a3892221eea4804f58ce83934c91964e83f4f30c) Conflicts: etcdserver/cluster.go etcdserver/config.go pkg/netutil/netutil.go pkg/netutil/netutil_test.go
92 lines
2.6 KiB
Go
92 lines
2.6 KiB
Go
// Copyright 2015 CoreOS, Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package netutil
|
|
|
|
import (
|
|
"encoding/base64"
|
|
"log"
|
|
"net"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
)
|
|
|
|
var (
|
|
// indirection for testing
|
|
resolveTCPAddr = net.ResolveTCPAddr
|
|
)
|
|
|
|
// ResolveTCPAddrs is a convenience wrapper for net.ResolveTCPAddr.
|
|
// ResolveTCPAddrs resolves all DNS hostnames in-place for the given set of
|
|
// url.URLs.
|
|
func ResolveTCPAddrs(urls ...[]url.URL) error {
|
|
for _, us := range urls {
|
|
for i, u := range us {
|
|
host, _, err := net.SplitHostPort(u.Host)
|
|
if err != nil {
|
|
log.Printf("netutil: Could not parse url %s during tcp resolving.", u.Host)
|
|
return err
|
|
}
|
|
if host == "localhost" {
|
|
continue
|
|
}
|
|
if net.ParseIP(host) != nil {
|
|
continue
|
|
}
|
|
tcpAddr, err := resolveTCPAddr("tcp", u.Host)
|
|
if err != nil {
|
|
log.Printf("netutil: Could not resolve host: %s", u.Host)
|
|
return err
|
|
}
|
|
log.Printf("netutil: Resolving %s to %s", u.Host, tcpAddr.String())
|
|
us[i].Host = tcpAddr.String()
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// BasicAuth returns the username and password provided in the request's
|
|
// Authorization header, if the request uses HTTP Basic Authentication.
|
|
// See RFC 2617, Section 2.
|
|
// Based on the BasicAuth method from the Golang standard lib.
|
|
// TODO: use the standard lib BasicAuth method when we move to Go 1.4.
|
|
func BasicAuth(r *http.Request) (username, password string, ok bool) {
|
|
auth := r.Header.Get("Authorization")
|
|
if auth == "" {
|
|
return
|
|
}
|
|
return parseBasicAuth(auth)
|
|
}
|
|
|
|
// parseBasicAuth parses an HTTP Basic Authentication string.
|
|
// "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" returns ("Aladdin", "open sesame", true).
|
|
// Taken from the Golang standard lib.
|
|
// TODO: use the standard lib BasicAuth method when we move to Go 1.4.
|
|
func parseBasicAuth(auth string) (username, password string, ok bool) {
|
|
if !strings.HasPrefix(auth, "Basic ") {
|
|
return
|
|
}
|
|
c, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(auth, "Basic "))
|
|
if err != nil {
|
|
return
|
|
}
|
|
cs := string(c)
|
|
s := strings.IndexByte(cs, ':')
|
|
if s < 0 {
|
|
return
|
|
}
|
|
return cs[:s], cs[s+1:], true
|
|
}
|