Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed tls connection issue #220

Merged
merged 1 commit into from
Apr 14, 2020
Merged

Fixed tls connection issue #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pulsar/client_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func newClient(options ClientOptions) (Client, error) {
cnxPool: internal.NewConnectionPool(tlsConfig, authProvider, connectionTimeout),
}
c.rpcClient = internal.NewRPCClient(url, c.cnxPool, operationTimeout)
c.lookupService = internal.NewLookupService(c.rpcClient, url)
c.lookupService = internal.NewLookupService(c.rpcClient, url, tlsConfig != nil)
c.handlers = internal.NewClientHandlers()
return c, nil
}
Expand Down
11 changes: 9 additions & 2 deletions pulsar/internal/lookup_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,26 @@ type LookupService interface {
type lookupService struct {
rpcClient RPCClient
serviceURL *url.URL
tlsEnabled bool
}

// NewLookupService init a lookup service struct and return an object of LookupService.
func NewLookupService(rpcClient RPCClient, serviceURL *url.URL) LookupService {
func NewLookupService(rpcClient RPCClient, serviceURL *url.URL, tlsEnabled bool) LookupService {
return &lookupService{
rpcClient: rpcClient,
serviceURL: serviceURL,
tlsEnabled: tlsEnabled,
}
}

func (ls *lookupService) getBrokerAddress(lr *pb.CommandLookupTopicResponse) (logicalAddress *url.URL,
physicalAddress *url.URL, err error) {
logicalAddress, err = url.ParseRequestURI(lr.GetBrokerServiceUrl())
if ls.tlsEnabled {
logicalAddress, err = url.ParseRequestURI(lr.GetBrokerServiceUrlTls())
} else {
logicalAddress, err = url.ParseRequestURI(lr.GetBrokerServiceUrl())
}

if err != nil {
return nil, nil, err
}
Expand Down
119 changes: 114 additions & 5 deletions pulsar/internal/lookup_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func TestLookupSuccess(t *testing.T) {
BrokerServiceUrl: proto.String("pulsar://broker-1:6650"),
},
},
}, url)
}, url, false)

lr, err := ls.Lookup("my-topic")
assert.NoError(t, err)
Expand All @@ -137,6 +137,38 @@ func TestLookupSuccess(t *testing.T) {
assert.Equal(t, "pulsar://broker-1:6650", lr.PhysicalAddr.String())
}

func TestTlsLookupSuccess(t *testing.T) {
url, err := url.Parse("pulsar+ssl://example:6651")
assert.NoError(t, err)

ls := NewLookupService(&mockedRPCClient{
t: t,

expectedRequests: []pb.CommandLookupTopic{
{
RequestId: proto.Uint64(1),
Topic: proto.String("my-topic"),
Authoritative: proto.Bool(false),
},
},
mockedResponses: []pb.CommandLookupTopicResponse{
{
RequestId: proto.Uint64(1),
Response: responseType(pb.CommandLookupTopicResponse_Connect),
Authoritative: proto.Bool(true),
BrokerServiceUrlTls: proto.String("pulsar+ssl://broker-1:6651"),
},
},
}, url, true)

lr, err := ls.Lookup("my-topic")
assert.NoError(t, err)
assert.NotNil(t, lr)

assert.Equal(t, "pulsar+ssl://broker-1:6651", lr.LogicalAddr.String())
assert.Equal(t, "pulsar+ssl://broker-1:6651", lr.PhysicalAddr.String())
}

func TestLookupWithProxy(t *testing.T) {
url, err := url.Parse("pulsar://example:6650")
assert.NoError(t, err)
Expand All @@ -160,7 +192,7 @@ func TestLookupWithProxy(t *testing.T) {
ProxyThroughServiceUrl: proto.Bool(true),
},
},
}, url)
}, url, false)

lr, err := ls.Lookup("my-topic")
assert.NoError(t, err)
Expand All @@ -170,6 +202,39 @@ func TestLookupWithProxy(t *testing.T) {
assert.Equal(t, "pulsar://example:6650", lr.PhysicalAddr.String())
}

func TestTlsLookupWithProxy(t *testing.T) {
url, err := url.Parse("pulsar+ssl://example:6651")
assert.NoError(t, err)

ls := NewLookupService(&mockedRPCClient{
t: t,

expectedRequests: []pb.CommandLookupTopic{
{
RequestId: proto.Uint64(1),
Topic: proto.String("my-topic"),
Authoritative: proto.Bool(false),
},
},
mockedResponses: []pb.CommandLookupTopicResponse{
{
RequestId: proto.Uint64(1),
Response: responseType(pb.CommandLookupTopicResponse_Connect),
Authoritative: proto.Bool(true),
BrokerServiceUrlTls: proto.String("pulsar+ssl://broker-1:6651"),
ProxyThroughServiceUrl: proto.Bool(true),
},
},
}, url, true)

lr, err := ls.Lookup("my-topic")
assert.NoError(t, err)
assert.NotNil(t, lr)

assert.Equal(t, "pulsar+ssl://broker-1:6651", lr.LogicalAddr.String())
assert.Equal(t, "pulsar+ssl://example:6651", lr.PhysicalAddr.String())
}

func TestLookupWithRedirect(t *testing.T) {
url, err := url.Parse("pulsar://example:6650")
assert.NoError(t, err)
Expand Down Expand Up @@ -204,7 +269,7 @@ func TestLookupWithRedirect(t *testing.T) {
BrokerServiceUrl: proto.String("pulsar://broker-1:6650"),
},
},
}, url)
}, url, false)

lr, err := ls.Lookup("my-topic")
assert.NoError(t, err)
Expand All @@ -214,6 +279,50 @@ func TestLookupWithRedirect(t *testing.T) {
assert.Equal(t, "pulsar://broker-1:6650", lr.PhysicalAddr.String())
}

func TestTlsLookupWithRedirect(t *testing.T) {
url, err := url.Parse("pulsar+ssl://example:6651")
assert.NoError(t, err)

ls := NewLookupService(&mockedRPCClient{
t: t,
expectedURL: "pulsar+ssl://broker-2:6651",

expectedRequests: []pb.CommandLookupTopic{
{
RequestId: proto.Uint64(1),
Topic: proto.String("my-topic"),
Authoritative: proto.Bool(false),
},
{
RequestId: proto.Uint64(2),
Topic: proto.String("my-topic"),
Authoritative: proto.Bool(true),
},
},
mockedResponses: []pb.CommandLookupTopicResponse{
{
RequestId: proto.Uint64(1),
Response: responseType(pb.CommandLookupTopicResponse_Redirect),
Authoritative: proto.Bool(true),
BrokerServiceUrlTls: proto.String("pulsar+ssl://broker-2:6651"),
},
{
RequestId: proto.Uint64(2),
Response: responseType(pb.CommandLookupTopicResponse_Connect),
Authoritative: proto.Bool(true),
BrokerServiceUrlTls: proto.String("pulsar+ssl://broker-1:6651"),
},
},
}, url, true)

lr, err := ls.Lookup("my-topic")
assert.NoError(t, err)
assert.NotNil(t, lr)

assert.Equal(t, "pulsar+ssl://broker-1:6651", lr.LogicalAddr.String())
assert.Equal(t, "pulsar+ssl://broker-1:6651", lr.PhysicalAddr.String())
}

func TestLookupWithInvalidUrlResponse(t *testing.T) {
url, err := url.Parse("pulsar://example:6650")
assert.NoError(t, err)
Expand All @@ -237,7 +346,7 @@ func TestLookupWithInvalidUrlResponse(t *testing.T) {
ProxyThroughServiceUrl: proto.Bool(false),
},
},
}, url)
}, url, false)

lr, err := ls.Lookup("my-topic")
assert.Error(t, err)
Expand Down Expand Up @@ -265,7 +374,7 @@ func TestLookupWithLookupFailure(t *testing.T) {
Authoritative: proto.Bool(true),
},
},
}, url)
}, url, false)

lr, err := ls.Lookup("my-topic")
assert.Error(t, err)
Expand Down