From bbba8e432aa66b6a262fc1985448dc8151407c5e Mon Sep 17 00:00:00 2001
From: Anis Elleuch <vadmeste@gmail.com>
Date: Tue, 18 Oct 2016 19:46:33 +0100
Subject: [PATCH]  Add ssl support to s3/web peers connections (#2988)

---
 cmd/net-rpc-client.go | 6 ++++++
 cmd/s3-peer-client.go | 1 +
 cmd/web-peer-rpc.go   | 1 +
 3 files changed, 8 insertions(+)

diff --git a/cmd/net-rpc-client.go b/cmd/net-rpc-client.go
index ee971db4d..57e64e861 100644
--- a/cmd/net-rpc-client.go
+++ b/cmd/net-rpc-client.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")
diff --git a/cmd/s3-peer-client.go b/cmd/s3-peer-client.go
index 48e6d8c66..3ac412de6 100644
--- a/cmd/s3-peer-client.go
+++ b/cmd/s3-peer-client.go
@@ -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",
 	}
diff --git a/cmd/web-peer-rpc.go b/cmd/web-peer-rpc.go
index 2a11a9662..5908ab46d 100644
--- a/cmd/web-peer-rpc.go
+++ b/cmd/web-peer-rpc.go
@@ -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",
 			})