From aad59f2a9ab0002ec86ef06288a2be6ab439be34 Mon Sep 17 00:00:00 2001
From: Greg Szabo <16846635+greg-szabo@users.noreply.github.com>
Date: Tue, 7 Jan 2020 03:33:20 -0500
Subject: [PATCH] rpc/lib: fix RPC client, which was previously resolving https
 protocol to http (#4131) (#4284)

Fixes #4051

Function `parseRemoteAddr` is forcing protocol HTTP and protocol HTTPs to tcp. This causes the bug in the issue #4051.

I find that the tcp is only needed where `net.Dial`. So I moved the switch to makeHTTPDialer.

This is a backport to the v0.32 branch.

Co-authored-by: yk <tankhoon@gmail.com>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
---
 CHANGELOG_PENDING.md               |  1 +
 rpc/lib/client/http_client.go      | 12 ++++++------
 rpc/lib/client/http_client_test.go | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 rpc/lib/client/http_client_test.go

diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index cd7ac2f2a..3b8eaf48c 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -20,4 +20,5 @@ program](https://hackerone.com/tendermint).
 ### IMPROVEMENTS:
 
 ### BUG FIXES:
+- [rpc/lib] [\#4051](https://github.com/tendermint/tendermint/pull/4131) Fix RPC client, which was previously resolving https protocol to http (@yenkhoon)
 - [cs] \#4069 Don't panic when block meta is not found in store (@gregzaitsev)
diff --git a/rpc/lib/client/http_client.go b/rpc/lib/client/http_client.go
index 5eb5382e7..0673177c3 100644
--- a/rpc/lib/client/http_client.go
+++ b/rpc/lib/client/http_client.go
@@ -82,12 +82,6 @@ func parseRemoteAddr(remoteAddr string) (network string, s string, err error) {
 		return "", "", fmt.Errorf("invalid addr: %s", remoteAddr)
 	}
 
-	// accept http(s) as an alias for tcp
-	switch protocol {
-	case protoHTTP, protoHTTPS:
-		protocol = protoTCP
-	}
-
 	return protocol, address, nil
 }
 
@@ -103,6 +97,12 @@ func makeHTTPDialer(remoteAddr string) func(string, string) (net.Conn, error) {
 		return makeErrorDialer(err)
 	}
 
+	// accept http(s) as an alias for tcp
+	switch protocol {
+	case protoHTTP, protoHTTPS:
+		protocol = protoTCP
+	}
+
 	return func(proto, addr string) (net.Conn, error) {
 		return net.Dial(protocol, address)
 	}
diff --git a/rpc/lib/client/http_client_test.go b/rpc/lib/client/http_client_test.go
new file mode 100644
index 000000000..b74425a54
--- /dev/null
+++ b/rpc/lib/client/http_client_test.go
@@ -0,0 +1,22 @@
+package rpcclient
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestHTTPClientMakeHTTPDialer(t *testing.T) {
+	remote := []string{"https://foo-bar.com:80", "http://foo-bar.net:80"}
+
+	for _, f := range remote {
+		protocol, address, err := parseRemoteAddr(f)
+		require.NoError(t, err)
+		dialFn := makeHTTPDialer(f)
+
+		addr, err := dialFn(protocol, address)
+		require.NoError(t, err)
+		require.NotNil(t, addr)
+	}
+
+}