1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454
|
From: Markus Koschany <apo@debian.org>
Date: Sun, 10 Feb 2019 11:04:58 +0100
Subject: no android
Disable Android support.
---
.../okhttp3/internal/platform/AndroidPlatform.java | 424 ---------------------
.../java/okhttp3/internal/platform/Platform.java | 2 +-
2 files changed, 1 insertion(+), 425 deletions(-)
delete mode 100644 okhttp/src/main/java/okhttp3/internal/platform/AndroidPlatform.java
diff --git a/okhttp/src/main/java/okhttp3/internal/platform/AndroidPlatform.java b/okhttp/src/main/java/okhttp3/internal/platform/AndroidPlatform.java
deleted file mode 100644
index cf184d1..0000000
--- a/okhttp/src/main/java/okhttp3/internal/platform/AndroidPlatform.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- * Copyright (C) 2016 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package okhttp3.internal.platform;
-
-import android.os.Build;
-import android.util.Log;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.Certificate;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509Certificate;
-import java.util.List;
-import javax.annotation.Nullable;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.X509TrustManager;
-import okhttp3.Protocol;
-import okhttp3.internal.Util;
-import okhttp3.internal.tls.BasicTrustRootIndex;
-import okhttp3.internal.tls.CertificateChainCleaner;
-import okhttp3.internal.tls.TrustRootIndex;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-/** Android 5+. */
-class AndroidPlatform extends Platform {
- private static final int MAX_LOG_LENGTH = 4000;
-
- private final Class<?> sslParametersClass;
- private final Class<?> sslSocketClass;
- private final Method setUseSessionTickets;
- private final Method setHostname;
- private final Method getAlpnSelectedProtocol;
- private final Method setAlpnProtocols;
-
- private final CloseGuard closeGuard = CloseGuard.get();
-
- AndroidPlatform(Class<?> sslParametersClass, Class<?> sslSocketClass, Method setUseSessionTickets,
- Method setHostname, Method getAlpnSelectedProtocol, Method setAlpnProtocols) {
- this.sslParametersClass = sslParametersClass;
- this.sslSocketClass = sslSocketClass;
- this.setUseSessionTickets = setUseSessionTickets;
- this.setHostname = setHostname;
- this.getAlpnSelectedProtocol = getAlpnSelectedProtocol;
- this.setAlpnProtocols = setAlpnProtocols;
- }
-
- @Override public void connectSocket(Socket socket, InetSocketAddress address,
- int connectTimeout) throws IOException {
- try {
- socket.connect(address, connectTimeout);
- } catch (AssertionError e) {
- if (Util.isAndroidGetsocknameError(e)) throw new IOException(e);
- throw e;
- } catch (ClassCastException e) {
- // On android 8.0, socket.connect throws a ClassCastException due to a bug
- // see https://issuetracker.google.com/issues/63649622
- if (Build.VERSION.SDK_INT == 26) {
- throw new IOException("Exception in connect", e);
- } else {
- throw e;
- }
- }
- }
-
- @Override protected @Nullable X509TrustManager trustManager(SSLSocketFactory sslSocketFactory) {
- Object context = readFieldOrNull(sslSocketFactory, sslParametersClass, "sslParameters");
- if (context == null) {
- // If that didn't work, try the Google Play Services SSL provider before giving up. This
- // must be loaded by the SSLSocketFactory's class loader.
- try {
- Class<?> gmsSslParametersClass = Class.forName(
- "com.google.android.gms.org.conscrypt.SSLParametersImpl", false,
- sslSocketFactory.getClass().getClassLoader());
- context = readFieldOrNull(sslSocketFactory, gmsSslParametersClass, "sslParameters");
- } catch (ClassNotFoundException e) {
- return super.trustManager(sslSocketFactory);
- }
- }
-
- X509TrustManager x509TrustManager = readFieldOrNull(
- context, X509TrustManager.class, "x509TrustManager");
- if (x509TrustManager != null) return x509TrustManager;
-
- return readFieldOrNull(context, X509TrustManager.class, "trustManager");
- }
-
- @Override public void configureTlsExtensions(
- SSLSocket sslSocket, String hostname, List<Protocol> protocols) {
- if (!sslSocketClass.isInstance(sslSocket)) {
- return; // No TLS extensions if the socket class is custom.
- }
- try {
- // Enable SNI and session tickets.
- if (hostname != null) {
- setUseSessionTickets.invoke(sslSocket, true);
- // This is SSLParameters.setServerNames() in API 24+.
- setHostname.invoke(sslSocket, hostname);
- }
-
- // Enable ALPN.
- setAlpnProtocols.invoke(sslSocket, concatLengthPrefixed(protocols));
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new AssertionError(e);
- }
- }
-
- @Override public @Nullable String getSelectedProtocol(SSLSocket socket) {
- if (!sslSocketClass.isInstance(socket)) {
- return null; // No TLS extensions if the socket class is custom.
- }
- try {
- byte[] alpnResult = (byte[]) getAlpnSelectedProtocol.invoke(socket);
- return alpnResult != null ? new String(alpnResult, UTF_8) : null;
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new AssertionError(e);
- }
- }
-
- @Override public void log(int level, String message, @Nullable Throwable t) {
- int logLevel = level == WARN ? Log.WARN : Log.DEBUG;
- if (t != null) message = message + '\n' + Log.getStackTraceString(t);
-
- // Split by line, then ensure each line can fit into Log's maximum length.
- for (int i = 0, length = message.length(); i < length; i++) {
- int newline = message.indexOf('\n', i);
- newline = newline != -1 ? newline : length;
- do {
- int end = Math.min(newline, i + MAX_LOG_LENGTH);
- Log.println(logLevel, "OkHttp", message.substring(i, end));
- i = end;
- } while (i < newline);
- }
- }
-
- @Override public Object getStackTraceForCloseable(String closer) {
- return closeGuard.createAndOpen(closer);
- }
-
- @Override public void logCloseableLeak(String message, Object stackTrace) {
- boolean reported = closeGuard.warnIfOpen(stackTrace);
- if (!reported) {
- // Unable to report via CloseGuard. As a last-ditch effort, send it to the logger.
- log(WARN, message, null);
- }
- }
-
- @Override public boolean isCleartextTrafficPermitted(String hostname) {
- try {
- Class<?> networkPolicyClass = Class.forName("android.security.NetworkSecurityPolicy");
- Method getInstanceMethod = networkPolicyClass.getMethod("getInstance");
- Object networkSecurityPolicy = getInstanceMethod.invoke(null);
- return api24IsCleartextTrafficPermitted(hostname, networkPolicyClass, networkSecurityPolicy);
- } catch (ClassNotFoundException | NoSuchMethodException e) {
- return super.isCleartextTrafficPermitted(hostname);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- throw new AssertionError("unable to determine cleartext support", e);
- }
- }
-
- private boolean api24IsCleartextTrafficPermitted(String hostname, Class<?> networkPolicyClass,
- Object networkSecurityPolicy) throws InvocationTargetException, IllegalAccessException {
- try {
- Method isCleartextTrafficPermittedMethod = networkPolicyClass
- .getMethod("isCleartextTrafficPermitted", String.class);
- return (boolean) isCleartextTrafficPermittedMethod.invoke(networkSecurityPolicy, hostname);
- } catch (NoSuchMethodException e) {
- return api23IsCleartextTrafficPermitted(hostname, networkPolicyClass, networkSecurityPolicy);
- }
- }
-
- private boolean api23IsCleartextTrafficPermitted(String hostname, Class<?> networkPolicyClass,
- Object networkSecurityPolicy) throws InvocationTargetException, IllegalAccessException {
- try {
- Method isCleartextTrafficPermittedMethod = networkPolicyClass
- .getMethod("isCleartextTrafficPermitted");
- return (boolean) isCleartextTrafficPermittedMethod.invoke(networkSecurityPolicy);
- } catch (NoSuchMethodException e) {
- return super.isCleartextTrafficPermitted(hostname);
- }
- }
-
- public CertificateChainCleaner buildCertificateChainCleaner(X509TrustManager trustManager) {
- try {
- Class<?> extensionsClass = Class.forName("android.net.http.X509TrustManagerExtensions");
- Constructor<?> constructor = extensionsClass.getConstructor(X509TrustManager.class);
- Object extensions = constructor.newInstance(trustManager);
- Method checkServerTrusted = extensionsClass.getMethod(
- "checkServerTrusted", X509Certificate[].class, String.class, String.class);
- return new AndroidCertificateChainCleaner(extensions, checkServerTrusted);
- } catch (Exception e) {
- return super.buildCertificateChainCleaner(trustManager);
- }
- }
-
- public static @Nullable Platform buildIfSupported() {
- // Attempt to find Android 5+ APIs.
- Class<?> sslParametersClass;
- Class<?> sslSocketClass;
- try {
- sslParametersClass = Class.forName("com.android.org.conscrypt.SSLParametersImpl");
- sslSocketClass = Class.forName("com.android.org.conscrypt.OpenSSLSocketImpl");
- } catch (ClassNotFoundException ignored) {
- return null; // Not an Android runtime.
- }
- if (Build.VERSION.SDK_INT >= 21) {
- try {
- Method setUseSessionTickets = sslSocketClass.getDeclaredMethod(
- "setUseSessionTickets", boolean.class);
- Method setHostname = sslSocketClass.getMethod("setHostname", String.class);
- Method getAlpnSelectedProtocol = sslSocketClass.getMethod("getAlpnSelectedProtocol");
- Method setAlpnProtocols = sslSocketClass.getMethod("setAlpnProtocols", byte[].class);
- return new AndroidPlatform(sslParametersClass, sslSocketClass, setUseSessionTickets,
- setHostname, getAlpnSelectedProtocol, setAlpnProtocols);
- } catch (NoSuchMethodException ignored) {
- }
- }
- throw new IllegalStateException(
- "Expected Android API level 21+ but was " + Build.VERSION.SDK_INT);
- }
-
- @Override public TrustRootIndex buildTrustRootIndex(X509TrustManager trustManager) {
- try {
- // From org.conscrypt.TrustManagerImpl, we want the method with this signature:
- // private TrustAnchor findTrustAnchorByIssuerAndSignature(X509Certificate lastCert);
- Method method = trustManager.getClass().getDeclaredMethod(
- "findTrustAnchorByIssuerAndSignature", X509Certificate.class);
- method.setAccessible(true);
- return new CustomTrustRootIndex(trustManager, method);
- } catch (NoSuchMethodException e) {
- return super.buildTrustRootIndex(trustManager);
- }
- }
-
- /**
- * X509TrustManagerExtensions was added to Android in API 17 (Android 4.2, released in late 2012).
- * This is the best way to get a clean chain on Android because it uses the same code as the TLS
- * handshake.
- */
- static final class AndroidCertificateChainCleaner extends CertificateChainCleaner {
- private final Object x509TrustManagerExtensions;
- private final Method checkServerTrusted;
-
- AndroidCertificateChainCleaner(Object x509TrustManagerExtensions, Method checkServerTrusted) {
- this.x509TrustManagerExtensions = x509TrustManagerExtensions;
- this.checkServerTrusted = checkServerTrusted;
- }
-
- @SuppressWarnings({"unchecked", "SuspiciousToArrayCall"}) // Reflection on List<Certificate>.
- @Override public List<Certificate> clean(List<Certificate> chain, String hostname)
- throws SSLPeerUnverifiedException {
- try {
- X509Certificate[] certificates = chain.toArray(new X509Certificate[chain.size()]);
- return (List<Certificate>) checkServerTrusted.invoke(
- x509TrustManagerExtensions, certificates, "RSA", hostname);
- } catch (InvocationTargetException e) {
- SSLPeerUnverifiedException exception = new SSLPeerUnverifiedException(e.getMessage());
- exception.initCause(e);
- throw exception;
- } catch (IllegalAccessException e) {
- throw new AssertionError(e);
- }
- }
-
- @Override public boolean equals(Object other) {
- return other instanceof AndroidCertificateChainCleaner; // All instances are equivalent.
- }
-
- @Override public int hashCode() {
- return 0;
- }
- }
-
- /**
- * Provides access to the internal dalvik.system.CloseGuard class. Android uses this in
- * combination with android.os.StrictMode to report on leaked java.io.Closeable's. Available since
- * Android API 11.
- */
- static final class CloseGuard {
- private final Method getMethod;
- private final Method openMethod;
- private final Method warnIfOpenMethod;
-
- CloseGuard(Method getMethod, Method openMethod, Method warnIfOpenMethod) {
- this.getMethod = getMethod;
- this.openMethod = openMethod;
- this.warnIfOpenMethod = warnIfOpenMethod;
- }
-
- Object createAndOpen(String closer) {
- if (getMethod != null) {
- try {
- Object closeGuardInstance = getMethod.invoke(null);
- openMethod.invoke(closeGuardInstance, closer);
- return closeGuardInstance;
- } catch (Exception ignored) {
- }
- }
- return null;
- }
-
- boolean warnIfOpen(Object closeGuardInstance) {
- boolean reported = false;
- if (closeGuardInstance != null) {
- try {
- warnIfOpenMethod.invoke(closeGuardInstance);
- reported = true;
- } catch (Exception ignored) {
- }
- }
- return reported;
- }
-
- static CloseGuard get() {
- Method getMethod;
- Method openMethod;
- Method warnIfOpenMethod;
-
- try {
- Class<?> closeGuardClass = Class.forName("dalvik.system.CloseGuard");
- getMethod = closeGuardClass.getMethod("get");
- openMethod = closeGuardClass.getMethod("open", String.class);
- warnIfOpenMethod = closeGuardClass.getMethod("warnIfOpen");
- } catch (Exception ignored) {
- getMethod = null;
- openMethod = null;
- warnIfOpenMethod = null;
- }
- return new CloseGuard(getMethod, openMethod, warnIfOpenMethod);
- }
- }
-
- /**
- * A trust manager for Android applications that customize the trust manager.
- *
- * <p>This class exploits knowledge of Android implementation details. This class is potentially
- * much faster to initialize than {@link BasicTrustRootIndex} because it doesn't need to load and
- * index trusted CA certificates.
- */
- static final class CustomTrustRootIndex implements TrustRootIndex {
- private final X509TrustManager trustManager;
- private final Method findByIssuerAndSignatureMethod;
-
- CustomTrustRootIndex(X509TrustManager trustManager, Method findByIssuerAndSignatureMethod) {
- this.findByIssuerAndSignatureMethod = findByIssuerAndSignatureMethod;
- this.trustManager = trustManager;
- }
-
- @Override public X509Certificate findByIssuerAndSignature(X509Certificate cert) {
- try {
- TrustAnchor trustAnchor = (TrustAnchor) findByIssuerAndSignatureMethod.invoke(
- trustManager, cert);
- return trustAnchor != null
- ? trustAnchor.getTrustedCert()
- : null;
- } catch (IllegalAccessException e) {
- throw new AssertionError("unable to get issues and signature", e);
- } catch (InvocationTargetException e) {
- return null;
- }
- }
-
- @Override public boolean equals(Object obj) {
- if (obj == this) {
- return true;
- }
- if (!(obj instanceof CustomTrustRootIndex)) {
- return false;
- }
- CustomTrustRootIndex that = (CustomTrustRootIndex) obj;
- return trustManager.equals(that.trustManager)
- && findByIssuerAndSignatureMethod.equals(that.findByIssuerAndSignatureMethod);
- }
-
- @Override public int hashCode() {
- return trustManager.hashCode() + 31 * findByIssuerAndSignatureMethod.hashCode();
- }
- }
-
- @Override public SSLContext getSSLContext() {
- boolean tryTls12;
- try {
- tryTls12 = (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT < 22);
- } catch (NoClassDefFoundError e) {
- // Not a real Android runtime; probably RoboVM or MoE
- // Try to load TLS 1.2 explicitly.
- tryTls12 = true;
- }
-
- if (tryTls12) {
- try {
- return SSLContext.getInstance("TLSv1.2");
- } catch (NoSuchAlgorithmException e) {
- // fallback to TLS
- }
- }
-
- try {
- return SSLContext.getInstance("TLS");
- } catch (NoSuchAlgorithmException e) {
- throw new IllegalStateException("No TLS provider", e);
- }
- }
-}
diff --git a/okhttp/src/main/java/okhttp3/internal/platform/Platform.java b/okhttp/src/main/java/okhttp3/internal/platform/Platform.java
index 67888bf..953111a 100644
--- a/okhttp/src/main/java/okhttp3/internal/platform/Platform.java
+++ b/okhttp/src/main/java/okhttp3/internal/platform/Platform.java
@@ -199,7 +199,7 @@ public class Platform {
/** Attempt to match the host runtime to a capable Platform implementation. */
private static Platform findPlatform() {
- Platform android = AndroidPlatform.buildIfSupported();
+ Platform android = null;
if (android != null) {
return android;
|