Browse Source

rpc/lib: fix RPC client, which was previously resolving https protocol to http (#4131)

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.
pull/3615/head
yk 5 years ago
committed by Anton Kaliaev
parent
commit
2be4b0fe05
3 changed files with 29 additions and 6 deletions
  1. +1
    -0
      CHANGELOG_PENDING.md
  2. +6
    -6
      rpc/lib/client/http_client.go
  3. +22
    -0
      rpc/lib/client/http_client_test.go

+ 1
- 0
CHANGELOG_PENDING.md View File

@ -36,3 +36,4 @@ program](https://hackerone.com/tendermint).
- [tools] [\#4023](https://github.com/tendermint/tendermint/issues/4023) Refresh `tm-monitor` health when validator count is updated (@erikgrinaker) - [tools] [\#4023](https://github.com/tendermint/tendermint/issues/4023) Refresh `tm-monitor` health when validator count is updated (@erikgrinaker)
- [state] [\#4104](https://github.com/tendermint/tendermint/pull/4104) txindex/kv: Fsync data to disk immediately after receiving it (@guagualvcha) - [state] [\#4104](https://github.com/tendermint/tendermint/pull/4104) txindex/kv: Fsync data to disk immediately after receiving it (@guagualvcha)
- [state] [\#4095](https://github.com/tendermint/tendermint/pull/4095) txindex/kv: Return an error if there's one when the user searches for a tx (hash=X) (@hsyis) - [state] [\#4095](https://github.com/tendermint/tendermint/pull/4095) txindex/kv: Return an error if there's one when the user searches for a tx (hash=X) (@hsyis)
- [rpc/lib] [\#4051](https://github.com/tendermint/tendermint/pull/4131) Fix RPC client, which was previously resolving https protocol to http (@yenkhoon)

+ 6
- 6
rpc/lib/client/http_client.go View File

@ -82,12 +82,6 @@ func parseRemoteAddr(remoteAddr string) (network string, s string, err error) {
return "", "", fmt.Errorf("invalid addr: %s", remoteAddr) 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 return protocol, address, nil
} }
@ -103,6 +97,12 @@ func makeHTTPDialer(remoteAddr string) func(string, string) (net.Conn, error) {
return makeErrorDialer(err) 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 func(proto, addr string) (net.Conn, error) {
return net.Dial(protocol, address) return net.Dial(protocol, address)
} }


+ 22
- 0
rpc/lib/client/http_client_test.go View File

@ -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)
}
}

Loading…
Cancel
Save