Add ssl support to s3/web peers connections (#2988)

master
Anis Elleuch 8 years ago committed by Harshavardhana
parent 39331b6b4e
commit bbba8e432a
  1. 6
      cmd/net-rpc-client.go
  2. 1
      cmd/s3-peer-client.go
  3. 1
      cmd/web-peer-rpc.go

@ -19,6 +19,7 @@ package cmd
import (
"bufio"
"crypto/tls"
"crypto/x509"
"errors"
"io"
"net"
@ -83,6 +84,11 @@ func (rpcClient *RPCClient) dialRPCClient() (*rpc.Client, error) {
conn, err = net.DialTimeout("tcp", rpcClient.node, 3*time.Second)
}
if err != nil {
// Print RPC connection errors that are worthy to display in log
switch err.(type) {
case x509.HostnameError:
errorIf(err, "Unable to establish RPC to %s", rpcClient.node)
}
return nil, err
}
io.WriteString(conn, "CONNECT "+rpcClient.rpcPath+" HTTP/1.0\n\n")

@ -87,6 +87,7 @@ func (s3p *s3Peers) InitS3PeerClient(peer string) {
accessKey: serverConfig.GetCredential().AccessKeyID,
secretKey: serverConfig.GetCredential().SecretAccessKey,
address: peer,
secureConn: isSSL(),
path: path.Join(reservedBucket, s3Path),
loginMethod: "S3.LoginHandler",
}

@ -102,6 +102,7 @@ func updateCredsOnPeers(creds credential) map[string]error {
accessKey: serverConfig.GetCredential().AccessKeyID,
secretKey: serverConfig.GetCredential().SecretAccessKey,
address: peers[ix],
secureConn: isSSL(),
path: path.Join(reservedBucket, browserPath),
loginMethod: "Browser.LoginHandler",
})

Loading…
Cancel
Save