Skip to content

Added support for TLS/SSL when building grpc channels #202

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

Open
mtiutin wants to merge 1 commit into
base: release_0.11.0
Choose a base branch
from
Open

Added support for TLS/SSL when building grpc channels #202

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
47 changes: 27 additions & 20 deletions core/src/main/java/org/tron/trident/core/ApiWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,9 @@ public class ApiWrapper implements Api {
private long expireTimeStamp = -1;

public ApiWrapper(String grpcEndpoint, String grpcEndpointSolidity, String hexPrivateKey) {
channel = ManagedChannelBuilder.forTarget(grpcEndpoint)
.usePlaintext()
channel = channelFor(grpcEndpoint)
.build();
channelSolidity = ManagedChannelBuilder.forTarget(grpcEndpointSolidity)
.usePlaintext()
channelSolidity = channelFor(grpcEndpointSolidity)
.build();
blockingStub = WalletGrpc.newBlockingStub(channel);
blockingStubSolidity = WalletSolidityGrpc.newBlockingStub(channelSolidity);
Expand All @@ -188,11 +186,9 @@ public ApiWrapper(String grpcEndpoint, String grpcEndpointSolidity, String hexPr

public ApiWrapper(String grpcEndpoint, String grpcEndpointSolidity, String hexPrivateKey,
String apiKey) {
channel = ManagedChannelBuilder.forTarget(grpcEndpoint)
.usePlaintext()
channel = channelFor(grpcEndpoint)
.build();
channelSolidity = ManagedChannelBuilder.forTarget(grpcEndpointSolidity)
.usePlaintext()
channelSolidity = channelFor(grpcEndpointSolidity)
.build();

//attach api key
Expand All @@ -212,13 +208,11 @@ public ApiWrapper(String grpcEndpoint, String grpcEndpointSolidity, String hexPr

public ApiWrapper(String grpcEndpoint, String grpcEndpointSolidity, String hexPrivateKey,
List<ClientInterceptor> clientInterceptors) {
channel = ManagedChannelBuilder.forTarget(grpcEndpoint)
channel = channelFor(grpcEndpoint)
.intercept(clientInterceptors)
.usePlaintext()
.build();
channelSolidity = ManagedChannelBuilder.forTarget(grpcEndpointSolidity)
channelSolidity = channelFor(grpcEndpointSolidity)
.intercept(clientInterceptors)
.usePlaintext()
.build();
blockingStub = WalletGrpc.newBlockingStub(channel);
blockingStubSolidity = WalletSolidityGrpc.newBlockingStub(channelSolidity);
Expand All @@ -230,12 +224,10 @@ public ApiWrapper(String grpcEndpoint, String grpcEndpointSolidity, String hexPr
*/
public ApiWrapper(String grpcEndpoint, String grpcEndpointSolidity, String hexPrivateKey,
int timeout) {
channel = ManagedChannelBuilder.forTarget(grpcEndpoint)
.usePlaintext()
channel = channelFor(grpcEndpoint)
.intercept(new TimeoutInterceptor(timeout))
.build();
channelSolidity = ManagedChannelBuilder.forTarget(grpcEndpointSolidity)
.usePlaintext()
channelSolidity = channelFor(grpcEndpointSolidity)
.intercept(new TimeoutInterceptor(timeout))
.build();
blockingStub = WalletGrpc.newBlockingStub(channel);
Expand All @@ -259,12 +251,10 @@ public ApiWrapper(String grpcEndpoint, String grpcEndpointSolidity, String hexPr
.forEach(clientInterceptorList::add);
}

channel = ManagedChannelBuilder.forTarget(grpcEndpoint)
.usePlaintext()
channel = channelFor(grpcEndpoint)
.intercept(clientInterceptorList)
.build();
channelSolidity = ManagedChannelBuilder.forTarget(grpcEndpointSolidity)
.usePlaintext()
channelSolidity = channelFor(grpcEndpointSolidity)
.intercept(clientInterceptorList)
.build();
blockingStub = WalletGrpc.newBlockingStub(channel);
Expand All @@ -273,6 +263,23 @@ public ApiWrapper(String grpcEndpoint, String grpcEndpointSolidity, String hexPr
}

/**
* construct channel builder from endpoint
* @param endpoint
* @return
*/
protected ManagedChannelBuilder<?> channelFor(String endpoint){
if (endpoint == null) {
throw new IllegalArgumentException("Endpoint cannot be null");
}
if(endpoint.startsWith("https://")){
return ManagedChannelBuilder.forTarget(endpoint.substring(8)).useTransportSecurity();
} else {
return ManagedChannelBuilder.forTarget(endpoint).usePlaintext();
}
}


/**
* The constructor for main net. Use TronGrid as default
*
* @param hexPrivateKey the binding private key. Operations require private key will all use this unless the private key is specified elsewhere.
Expand Down