grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use real authority parsing in ClientAuthInterceptor

This commit is contained in:
Eric Anderson 2015-09-10 15:25:37 -07:00
parent 5b2a03a02e
commit bccaf07497
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
auth/src/main/java/io/grpc/auth/ClientAuthInterceptor.java
View File

@ -116,18 +116,31 @@ public final class ClientAuthInterceptor implements ClientInterceptor {
}
// Always use HTTPS, by definition.
final String scheme = "https";
// The default port must not be present. Alternative ports should be present.
final String suffixToStrip = ":443";
if (authority.endsWith(suffixToStrip)) {
authority = authority.substring(0, authority.length() - suffixToStrip.length());
}
final int defaultPort = 443;
String path = "/" + MethodDescriptor.extractFullServiceName(method.getFullMethodName());
URI uri;
try {
return new URI(scheme, authority, path, null, null);
uri = new URI(scheme, authority, path, null, null);
} catch (URISyntaxException e) {
throw Status.UNAUTHENTICATED.withDescription("Unable to construct service URI for auth")
.withCause(e).asException();
}
// The default port must not be present. Alternative ports should be present.
if (uri.getPort() == defaultPort) {
uri = removePort(uri);
}
return uri;
}
private URI removePort(URI uri) throws StatusException {
try {
return new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), -1 /* port */,
uri.getPath(), uri.getQuery(), uri.getFragment());
} catch (URISyntaxException e) {
throw Status.UNAUTHENTICATED.withDescription(
"Unable to construct service URI after removing port")
.withCause(e).asException();
}
}
private Map<String, List<String>> getRequestMetadata(URI uri) throws StatusException {