Upgrade to 0.12

5 files changed, 195 insertions, 150 deletions

diff --git a/vendor/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go
index 2475fe8..a851560 100644
--- a/vendor/google.golang.org/grpc/credentials/credentials.go
+++ b/vendor/google.golang.org/grpc/credentials/credentials.go
@@ -23,6 +23,7 @@
 package credentials // import "google.golang.org/grpc/credentials"
 
 import (
+        "context"
         "crypto/tls"
         "crypto/x509"
         "errors"
@@ -31,13 +32,12 @@ import (
         "net"
         "strings"
 
-        "golang.org/x/net/context"
+        "github.com/golang/protobuf/proto"
+        "google.golang.org/grpc/credentials/internal"
 )
 
-var (
-        // alpnProtoStr are the specified application level protocols for gRPC.
-        alpnProtoStr = []string{"h2"}
-)
+// alpnProtoStr are the specified application level protocols for gRPC.
+var alpnProtoStr = []string{"h2"}
 
 // PerRPCCredentials defines the common interface for the credentials which need to
 // attach security information to every RPC (e.g., oauth2).
@@ -45,8 +45,9 @@ type PerRPCCredentials interface {
         // GetRequestMetadata gets the current request metadata, refreshing
         // tokens if required. This should be called by the transport layer on
         // each request, and the data should be populated in headers or other
-        // context. uri is the URI of the entry point for the request. When
-        // supported by the underlying implementation, ctx can be used for
+        // context. If a status code is returned, it will be used as the status
+        // for the RPC. uri is the URI of the entry point for the request.
+        // When supported by the underlying implementation, ctx can be used for
         // timeout and cancellation.
         // TODO(zhaoq): Define the set of the qualified keys instead of leaving
         // it as an arbitrary string.
@@ -74,11 +75,9 @@ type AuthInfo interface {
         AuthType() string
 }
 
-var (
-        // ErrConnDispatched indicates that rawConn has been dispatched out of gRPC
-        // and the caller should not close rawConn.
-        ErrConnDispatched = errors.New("credentials: rawConn is dispatched out of gRPC")
-)
+// ErrConnDispatched indicates that rawConn has been dispatched out of gRPC
+// and the caller should not close rawConn.
+var ErrConnDispatched = errors.New("credentials: rawConn is dispatched out of gRPC")
 
 // TransportCredentials defines the common interface for all the live gRPC wire
 // protocols and supported transport security protocols (e.g., TLS, SSL).
@@ -91,10 +90,14 @@ type TransportCredentials interface {
         // (io.EOF, context.DeadlineExceeded or err.Temporary() == true).
         // If the returned error is a wrapper error, implementations should make sure that
         // the error implements Temporary() to have the correct retry behaviors.
+        //
+        // If the returned net.Conn is closed, it MUST close the net.Conn provided.
         ClientHandshake(context.Context, string, net.Conn) (net.Conn, AuthInfo, error)
         // ServerHandshake does the authentication handshake for servers. It returns
         // the authenticated connection and the corresponding auth information about
         // the connection.
+        //
+        // If the returned net.Conn is closed, it MUST close the net.Conn provided.
         ServerHandshake(net.Conn) (net.Conn, AuthInfo, error)
         // Info provides the ProtocolInfo of this TransportCredentials.
         Info() ProtocolInfo
@@ -106,6 +109,25 @@ type TransportCredentials interface {
         OverrideServerName(string) error
 }
 
+// Bundle is a combination of TransportCredentials and PerRPCCredentials.
+//
+// It also contains a mode switching method, so it can be used as a combination
+// of different credential policies.
+//
+// Bundle cannot be used together with individual TransportCredentials.
+// PerRPCCredentials from Bundle will be appended to other PerRPCCredentials.
+//
+// This API is experimental.
+type Bundle interface {
+        TransportCredentials() TransportCredentials
+        PerRPCCredentials() PerRPCCredentials
+        // NewWithMode should make a copy of Bundle, and switch mode. Modifying the
+        // existing Bundle may cause races.
+        //
+        // NewWithMode returns nil if the requested mode is not supported.
+        NewWithMode(mode string) (Bundle, error)
+}
+
 // TLSInfo contains the auth information for a TLS authenticated connection.
 // It implements the AuthInfo interface.
 type TLSInfo struct {
@@ -117,6 +139,18 @@ func (t TLSInfo) AuthType() string {
         return "tls"
 }
 
+// GetSecurityValue returns security info requested by channelz.
+func (t TLSInfo) GetSecurityValue() ChannelzSecurityValue {
+        v := &TLSChannelzSecurityValue{
+                StandardName: cipherSuiteLookup[t.State.CipherSuite],
+        }
+        // Currently there's no way to get LocalCertificate info from tls package.
+        if len(t.State.PeerCertificates) > 0 {
+                v.RemoteCertificate = t.State.PeerCertificates[0].Raw
+        }
+        return v
+}
+
 // tlsCreds is the credentials required for authenticating a connection using TLS.
 type tlsCreds struct {
         // TLS configuration
@@ -131,15 +165,15 @@ func (c tlsCreds) Info() ProtocolInfo {
         }
 }
 
-func (c *tlsCreds) ClientHandshake(ctx context.Context, addr string, rawConn net.Conn) (_ net.Conn, _ AuthInfo, err error) {
+func (c *tlsCreds) ClientHandshake(ctx context.Context, authority string, rawConn net.Conn) (_ net.Conn, _ AuthInfo, err error) {
         // use local cfg to avoid clobbering ServerName if using multiple endpoints
         cfg := cloneTLSConfig(c.config)
         if cfg.ServerName == "" {
-                colonPos := strings.LastIndex(addr, ":")
+                colonPos := strings.LastIndex(authority, ":")
                 if colonPos == -1 {
-                        colonPos = len(addr)
+                        colonPos = len(authority)
                 }
-                cfg.ServerName = addr[:colonPos]
+                cfg.ServerName = authority[:colonPos]
         }
         conn := tls.Client(rawConn, cfg)
         errChannel := make(chan error, 1)
@@ -154,7 +188,7 @@ func (c *tlsCreds) ClientHandshake(ctx context.Context, addr string, rawConn net
         case <-ctx.Done():
                 return nil, nil, ctx.Err()
         }
-        return conn, TLSInfo{conn.ConnectionState()}, nil
+        return internal.WrapSyscallConn(rawConn, conn), TLSInfo{conn.ConnectionState()}, nil
 }
 
 func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error) {
@@ -162,7 +196,7 @@ func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error)
         if err := conn.Handshake(); err != nil {
                 return nil, nil, err
         }
-        return conn, TLSInfo{conn.ConnectionState()}, nil
+        return internal.WrapSyscallConn(rawConn, conn), TLSInfo{conn.ConnectionState()}, nil
 }
 
 func (c *tlsCreds) Clone() TransportCredentials {
@@ -217,3 +251,78 @@ func NewServerTLSFromFile(certFile, keyFile string) (TransportCredentials, error
         }
         return NewTLS(&tls.Config{Certificates: []tls.Certificate{cert}}), nil
 }
+
+// ChannelzSecurityInfo defines the interface that security protocols should implement
+// in order to provide security info to channelz.
+type ChannelzSecurityInfo interface {
+        GetSecurityValue() ChannelzSecurityValue
+}
+
+// ChannelzSecurityValue defines the interface that GetSecurityValue() return value
+// should satisfy. This interface should only be satisfied by *TLSChannelzSecurityValue
+// and *OtherChannelzSecurityValue.
+type ChannelzSecurityValue interface {
+        isChannelzSecurityValue()
+}
+
+// TLSChannelzSecurityValue defines the struct that TLS protocol should return
+// from GetSecurityValue(), containing security info like cipher and certificate used.
+type TLSChannelzSecurityValue struct {
+        StandardName      string
+        LocalCertificate  []byte
+        RemoteCertificate []byte
+}
+
+func (*TLSChannelzSecurityValue) isChannelzSecurityValue() {}
+
+// OtherChannelzSecurityValue defines the struct that non-TLS protocol should return
+// from GetSecurityValue(), which contains protocol specific security info. Note
+// the Value field will be sent to users of channelz requesting channel info, and
+// thus sensitive info should better be avoided.
+type OtherChannelzSecurityValue struct {
+        Name  string
+        Value proto.Message
+}
+
+func (*OtherChannelzSecurityValue) isChannelzSecurityValue() {}
+
+var cipherSuiteLookup = map[uint16]string{
+        tls.TLS_RSA_WITH_RC4_128_SHA:                "TLS_RSA_WITH_RC4_128_SHA",
+        tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA:           "TLS_RSA_WITH_3DES_EDE_CBC_SHA",
+        tls.TLS_RSA_WITH_AES_128_CBC_SHA:            "TLS_RSA_WITH_AES_128_CBC_SHA",
+        tls.TLS_RSA_WITH_AES_256_CBC_SHA:            "TLS_RSA_WITH_AES_256_CBC_SHA",
+        tls.TLS_RSA_WITH_AES_128_GCM_SHA256:         "TLS_RSA_WITH_AES_128_GCM_SHA256",
+        tls.TLS_RSA_WITH_AES_256_GCM_SHA384:         "TLS_RSA_WITH_AES_256_GCM_SHA384",
+        tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:        "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
+        tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:    "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
+        tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:    "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
+        tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA:          "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
+        tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:     "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
+        tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:      "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
+        tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:      "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
+        tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:   "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+        tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
+        tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:   "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
+        tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384: "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
+        tls.TLS_FALLBACK_SCSV:                       "TLS_FALLBACK_SCSV",
+        tls.TLS_RSA_WITH_AES_128_CBC_SHA256:         "TLS_RSA_WITH_AES_128_CBC_SHA256",
+        tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256: "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
+        tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:   "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
+        tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305:    "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
+        tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305:  "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
+}
+
+// cloneTLSConfig returns a shallow clone of the exported
+// fields of cfg, ignoring the unexported sync.Once, which
+// contains a mutex and must not be copied.
+//
+// If cfg is nil, a new zero tls.Config is returned.
+//
+// TODO: inline this function if possible.
+func cloneTLSConfig(cfg *tls.Config) *tls.Config {
+        if cfg == nil {
+                return &tls.Config{}
+        }
+
+        return cfg.Clone()
+}
diff --git a/vendor/google.golang.org/grpc/credentials/credentials_util_go17.go b/vendor/google.golang.org/grpc/credentials/credentials_util_go17.go
deleted file mode 100644
index 60409aa..0000000
--- a/vendor/google.golang.org/grpc/credentials/credentials_util_go17.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// +build go1.7
-// +build !go1.8
-
-/*
- *
- * Copyright 2016 gRPC authors.
- *
- * 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 credentials
-
-import (
-        "crypto/tls"
-)
-
-// cloneTLSConfig returns a shallow clone of the exported
-// fields of cfg, ignoring the unexported sync.Once, which
-// contains a mutex and must not be copied.
-//
-// If cfg is nil, a new zero tls.Config is returned.
-func cloneTLSConfig(cfg *tls.Config) *tls.Config {
-        if cfg == nil {
-                return &tls.Config{}
-        }
-        return &tls.Config{
-                Rand:                        cfg.Rand,
-                Time:                        cfg.Time,
-                Certificates:                cfg.Certificates,
-                NameToCertificate:           cfg.NameToCertificate,
-                GetCertificate:              cfg.GetCertificate,
-                RootCAs:                     cfg.RootCAs,
-                NextProtos:                  cfg.NextProtos,
-                ServerName:                  cfg.ServerName,
-                ClientAuth:                  cfg.ClientAuth,
-                ClientCAs:                   cfg.ClientCAs,
-                InsecureSkipVerify:          cfg.InsecureSkipVerify,
-                CipherSuites:                cfg.CipherSuites,
-                PreferServerCipherSuites:    cfg.PreferServerCipherSuites,
-                SessionTicketsDisabled:      cfg.SessionTicketsDisabled,
-                SessionTicketKey:            cfg.SessionTicketKey,
-                ClientSessionCache:          cfg.ClientSessionCache,
-                MinVersion:                  cfg.MinVersion,
-                MaxVersion:                  cfg.MaxVersion,
-                CurvePreferences:            cfg.CurvePreferences,
-                DynamicRecordSizingDisabled: cfg.DynamicRecordSizingDisabled,
-                Renegotiation:               cfg.Renegotiation,
-        }
-}
diff --git a/vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go b/vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go
deleted file mode 100644
index d6bbcc9..0000000
--- a/vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// +build !go1.7
-
-/*
- *
- * Copyright 2016 gRPC authors.
- *
- * 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 credentials
-
-import (
-        "crypto/tls"
-)
-
-// cloneTLSConfig returns a shallow clone of the exported
-// fields of cfg, ignoring the unexported sync.Once, which
-// contains a mutex and must not be copied.
-//
-// If cfg is nil, a new zero tls.Config is returned.
-func cloneTLSConfig(cfg *tls.Config) *tls.Config {
-        if cfg == nil {
-                return &tls.Config{}
-        }
-        return &tls.Config{
-                Rand:                     cfg.Rand,
-                Time:                     cfg.Time,
-                Certificates:             cfg.Certificates,
-                NameToCertificate:        cfg.NameToCertificate,
-                GetCertificate:           cfg.GetCertificate,
-                RootCAs:                  cfg.RootCAs,
-                NextProtos:               cfg.NextProtos,
-                ServerName:               cfg.ServerName,
-                ClientAuth:               cfg.ClientAuth,
-                ClientCAs:                cfg.ClientCAs,
-                InsecureSkipVerify:       cfg.InsecureSkipVerify,
-                CipherSuites:             cfg.CipherSuites,
-                PreferServerCipherSuites: cfg.PreferServerCipherSuites,
-                SessionTicketsDisabled:   cfg.SessionTicketsDisabled,
-                SessionTicketKey:         cfg.SessionTicketKey,
-                ClientSessionCache:       cfg.ClientSessionCache,
-                MinVersion:               cfg.MinVersion,
-                MaxVersion:               cfg.MaxVersion,
-                CurvePreferences:         cfg.CurvePreferences,
-        }
-}
diff --git a/vendor/google.golang.org/grpc/credentials/internal/syscallconn.go b/vendor/google.golang.org/grpc/credentials/internal/syscallconn.go
new file mode 100644
index 0000000..2f4472b
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/internal/syscallconn.go
@@ -0,0 +1,61 @@
+// +build !appengine
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * 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 internal contains credentials-internal code.
+package internal
+
+import (
+        "net"
+        "syscall"
+)
+
+type sysConn = syscall.Conn
+
+// syscallConn keeps reference of rawConn to support syscall.Conn for channelz.
+// SyscallConn() (the method in interface syscall.Conn) is explicitly
+// implemented on this type,
+//
+// Interface syscall.Conn is implemented by most net.Conn implementations (e.g.
+// TCPConn, UnixConn), but is not part of net.Conn interface. So wrapper conns
+// that embed net.Conn don't implement syscall.Conn. (Side note: tls.Conn
+// doesn't embed net.Conn, so even if syscall.Conn is part of net.Conn, it won't
+// help here).
+type syscallConn struct {
+        net.Conn
+        // sysConn is a type alias of syscall.Conn. It's necessary because the name
+        // `Conn` collides with `net.Conn`.
+        sysConn
+}
+
+// WrapSyscallConn tries to wrap rawConn and newConn into a net.Conn that
+// implements syscall.Conn. rawConn will be used to support syscall, and newConn
+// will be used for read/write.
+//
+// This function returns newConn if rawConn doesn't implement syscall.Conn.
+func WrapSyscallConn(rawConn, newConn net.Conn) net.Conn {
+        sysConn, ok := rawConn.(syscall.Conn)
+        if !ok {
+                return newConn
+        }
+        return &syscallConn{
+                Conn:    newConn,
+                sysConn: sysConn,
+        }
+}
diff --git a/vendor/google.golang.org/grpc/credentials/credentials_util_go18.go b/vendor/google.golang.org/grpc/credentials/internal/syscallconn_appengine.go
index 93f0e1d..d4346e9 100644
--- a/vendor/google.golang.org/grpc/credentials/credentials_util_go18.go
+++ b/vendor/google.golang.org/grpc/credentials/internal/syscallconn_appengine.go
@@ -1,8 +1,8 @@
-// +build go1.8
+// +build appengine
 
 /*
  *
- * Copyright 2017 gRPC authors.
+ * Copyright 2018 gRPC authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,21 +18,13 @@
  *
  */
 
-package credentials
+package internal
 
 import (
-        "crypto/tls"
+        "net"
 )
 
-// cloneTLSConfig returns a shallow clone of the exported
-// fields of cfg, ignoring the unexported sync.Once, which
-// contains a mutex and must not be copied.
-//
-// If cfg is nil, a new zero tls.Config is returned.
-func cloneTLSConfig(cfg *tls.Config) *tls.Config {
-        if cfg == nil {
-                return &tls.Config{}
-        }
-
-        return cfg.Clone()
+// WrapSyscallConn returns newConn on appengine.
+func WrapSyscallConn(rawConn, newConn net.Conn) net.Conn {
+        return newConn
 }