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

core,okhttp: removed GrpcUtil.IS_RESTRICTED_APPENGINE and dependent code (#6051)

This commit is contained in:
Dharmesh Jogadia 2019-08-13 22:41:56 +05:30 committed by Jihun Cho
parent 1949ebd7ef
commit 5790503d79
10 changed files with 33 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/main/java/io/grpc/internal/GrpcUtil.java
View File

@ -25,7 +25,6 @@ import com.google.common.base.Splitter;
import com.google.common.base.Stopwatch;
import com.google.common.base.Supplier;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.grpc.CallOptions;
import io.grpc.ClientStreamTracer;
@ -73,12 +72,6 @@ public final class GrpcUtil {
public static final Charset US_ASCII = Charset.forName("US-ASCII");
// AppEngine runtimes have constraints on threading and socket handling
// that need to be accommodated.
public static final boolean IS_RESTRICTED_APPENGINE =
System.getProperty("com.google.appengine.runtime.environment") != null
&& "1.7".equals(System.getProperty("java.specification.version"));
/**
* {@link io.grpc.Metadata.Key} for the timeout header.
*/
@ -266,17 +259,6 @@ public final class GrpcUtil {
return !Boolean.TRUE.equals(callOptions.getOption(CALL_OPTIONS_RPC_OWNED_BY_BALANCER));
}
/**
* Returns a proxy detector appropriate for the current environment.
*/
public static ProxyDetector getDefaultProxyDetector() {
if (IS_RESTRICTED_APPENGINE) {
return NOOP_PROXY_DETECTOR;
} else {
return DEFAULT_PROXY_DETECTOR;
}
}
/**
* Maps HTTP error response status codes to transport codes, as defined in <a
* href="https://github.com/grpc/grpc/blob/master/doc/http-grpc-status-mapping.md">
@ -569,17 +551,11 @@ public final class GrpcUtil {
* @return a {@link ThreadFactory}.
*/
public static ThreadFactory getThreadFactory(String nameFormat, boolean daemon) {
if (IS_RESTRICTED_APPENGINE) {
@SuppressWarnings("BetaApi")
ThreadFactory factory = MoreExecutors.platformThreadFactory();
return factory;
} else {
return new ThreadFactoryBuilder()
.setDaemon(daemon)
.setNameFormat(nameFormat)
.build();
}
}
/**
* The factory of default Stopwatches.

4
core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java
View File

@ -64,10 +64,6 @@ final class JndiResourceResolverFactory implements DnsNameResolver.ResourceResol
@Nullable
@SuppressWarnings("LiteralClassName")
private static Throwable initJndi() {
if (GrpcUtil.IS_RESTRICTED_APPENGINE) {
return new UnsupportedOperationException(
"Currently running in an AppEngine restricted environment");
}
try {
Class.forName("javax.naming.directory.InitialDirContext");
Class.forName("com.sun.jndi.dns.DnsContextFactory");

2
core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
View File

@ -562,7 +562,7 @@ final class ManagedChannelImpl extends ManagedChannel implements
this.logId = InternalLogId.allocate("Channel", target);
this.nameResolverFactory = builder.getNameResolverFactory();
ProxyDetector proxyDetector =
builder.proxyDetector != null ? builder.proxyDetector : GrpcUtil.getDefaultProxyDetector();
builder.proxyDetector != null ? builder.proxyDetector : GrpcUtil.DEFAULT_PROXY_DETECTOR;
this.retryEnabled = builder.retryEnabled && !builder.temporarilyDisableRetry;
this.loadBalancerFactory = new AutoConfiguredLoadBalancerFactory(builder.defaultLbPolicy);
this.nameResolverRegistry = builder.nameResolverRegistry;

14
core/src/main/java/io/grpc/internal/SharedResourceHolder.java
View File

@ -124,19 +124,6 @@ public final class SharedResourceHolder {
Preconditions.checkState(cached.refcount > 0, "Refcount has already reached zero");
cached.refcount--;
if (cached.refcount == 0) {
if (GrpcUtil.IS_RESTRICTED_APPENGINE) {
// AppEngine must immediately release shared resources, particularly executors
// which could retain request-scoped threads which become zombies after the request
// completes.
// We do not encourage exceptions to be thrown during close, but we would like it to
// be able to recover eventually and do not want future resource fetches reuse the broken
// one.
try {
resource.close(instance);
} finally {
instances.remove(resource);
}
} else {
Preconditions.checkState(cached.destroyTask == null, "Destroy task already scheduled");
// Schedule a delayed task to destroy the resource.
if (destroyer == null) {
@ -162,7 +149,6 @@ public final class SharedResourceHolder {
}
}), DESTROY_DELAY_SECONDS, TimeUnit.SECONDS);
}
}
// Always returning null
return null;
}

2
core/src/test/java/io/grpc/internal/DnsNameResolverProviderTest.java
View File

@ -41,7 +41,7 @@ public class DnsNameResolverProviderTest {
});
private final NameResolver.Args args = NameResolver.Args.newBuilder()
.setDefaultPort(8080)
.setProxyDetector(GrpcUtil.getDefaultProxyDetector())
.setProxyDetector(GrpcUtil.DEFAULT_PROXY_DETECTOR)
.setSynchronizationContext(syncContext)
.setServiceConfigParser(mock(ServiceConfigParser.class))
.build();

2
core/src/test/java/io/grpc/internal/DnsNameResolverTest.java
View File

@ -111,7 +111,7 @@ public class DnsNameResolverTest {
});
private final NameResolver.Args args = NameResolver.Args.newBuilder()
.setDefaultPort(DEFAULT_PORT)
.setProxyDetector(GrpcUtil.getDefaultProxyDetector())
.setProxyDetector(GrpcUtil.DEFAULT_PROXY_DETECTOR)
.setSynchronizationContext(syncContext)
.setServiceConfigParser(mock(ServiceConfigParser.class))
.build();

23
okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
View File

@ -41,8 +41,6 @@ import io.grpc.okhttp.internal.TlsVersion;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
import java.security.SecureRandom;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@ -53,7 +51,6 @@ import javax.net.SocketFactory;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManagerFactory;
/** Convenience class for building channels with the OkHttp transport. */
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1785")
@ -416,25 +413,7 @@ public class OkHttpChannelBuilder extends
case TLS:
try {
if (sslSocketFactory == null) {
SSLContext sslContext;
if (GrpcUtil.IS_RESTRICTED_APPENGINE) {
// The following auth code circumvents the following AccessControlException:
// access denied ("java.util.PropertyPermission" "javax.net.ssl.keyStore" "read")
// Conscrypt will attempt to load the default KeyStore if a trust manager is not
// provided, which is forbidden on AppEngine
sslContext = SSLContext.getInstance("TLS", Platform.get().getProvider());
TrustManagerFactory trustManagerFactory =
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
trustManagerFactory.init((KeyStore) null);
sslContext.init(
null,
trustManagerFactory.getTrustManagers(),
// Use an algorithm that doesn't need /dev/urandom
SecureRandom.getInstance("SHA1PRNG", Platform.get().getProvider()));
} else {
sslContext = SSLContext.getInstance("Default", Platform.get().getProvider());
}
SSLContext sslContext = SSLContext.getInstance("Default", Platform.get().getProvider());
sslSocketFactory = sslContext.getSocketFactory();
}
return sslSocketFactory;

4
okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelProvider.java
View File

@ -19,7 +19,6 @@ package io.grpc.okhttp;
import io.grpc.Internal;
import io.grpc.InternalServiceProviders;
import io.grpc.ManagedChannelProvider;
import io.grpc.internal.GrpcUtil;
/**
* Provider for {@link OkHttpChannelBuilder} instances.
@ -34,8 +33,7 @@ public final class OkHttpChannelProvider extends ManagedChannelProvider {
@Override
public int priority() {
return (GrpcUtil.IS_RESTRICTED_APPENGINE
|| InternalServiceProviders.isAndroid(getClass().getClassLoader())) ? 8 : 3;
return InternalServiceProviders.isAndroid(getClass().getClassLoader()) ? 8 : 3;
}
@Override

5
okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
View File

@ -1067,9 +1067,7 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
@Override
public void run() {
String threadName = Thread.currentThread().getName();
if (!GrpcUtil.IS_RESTRICTED_APPENGINE) {
Thread.currentThread().setName("OkHttpClientTransport");
}
try {
// Read until the underlying socket closes.
while (frameReader.nextFrame(this)) {
@ -1095,12 +1093,9 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
log.log(Level.INFO, "Exception closing frame reader", ex);
}
listener.transportTerminated();
if (!GrpcUtil.IS_RESTRICTED_APPENGINE) {
// Restore the original thread name.
Thread.currentThread().setName(threadName);
}
}
}
/**
* Handle a HTTP2 DATA frame.

20
okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java vendored
View File

@ -158,8 +158,7 @@ public class Platform {
/** Attempt to match the host runtime to a capable Platform implementation. */
private static Platform findPlatform() {
Provider androidOrAppEngineProvider =
GrpcUtil.IS_RESTRICTED_APPENGINE ? getAppEngineProvider() : getAndroidSecurityProvider();
Provider androidOrAppEngineProvider = getAndroidSecurityProvider();
if (androidOrAppEngineProvider != null) {
// Attempt to find Android 2.3+ APIs.
OptionalMethod<Socket> setUseSessionTickets
@ -183,9 +182,7 @@ public class Platform {
}
TlsExtensionType tlsExtensionType;
if (GrpcUtil.IS_RESTRICTED_APPENGINE) {
tlsExtensionType = TlsExtensionType.ALPN_AND_NPN;
} else if (androidOrAppEngineProvider.getName().equals("GmsCore_OpenSSL")
if (androidOrAppEngineProvider.getName().equals("GmsCore_OpenSSL")
|| androidOrAppEngineProvider.getName().equals("Conscrypt")
|| androidOrAppEngineProvider.getName().equals("Ssl_Guard")) {
tlsExtensionType = TlsExtensionType.ALPN_AND_NPN;
@ -299,19 +296,6 @@ public class Platform {
return false;
}
/**
* Forcibly load the conscrypt security provider on AppEngine if it's available. If not fail.
*/
private static Provider getAppEngineProvider() {
try {
// Forcibly load conscrypt as it is unlikely to be an installed provider on AppEngine
return (Provider) Class.forName("org.conscrypt.OpenSSLProvider")
.getConstructor().newInstance();
} catch (Throwable t) {
throw new RuntimeException("Unable to load conscrypt security provider", t);
}
}
/**
* Select the first recognized security provider according to the preference order returned by
* {@link Security#getProviders}. If a recognized provider is not found then warn but continue.