github/cordova-plugin-advanced-http
4
0
Fork 0
mirror of https://github.com/silkimen/cordova-plugin-advanced-http.git synced 2026-04-24 00:00:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ios-networking-indicator

Browse Source
This commit is contained in:
Florian Leitmann
2018-05-27 14:01:04 +02:00
parent cb597c0d30 60189a68b3
commit 3dbd07c9df
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/android/com/github/kevinsawicki/http/HttpRequest.java
+3 -13
View File
@@ -302,10 +302,13 @@ public class HttpRequest {
try {
if (mode == CERT_MODE_TRUSTALL) {
SOCKET_FACTORY = createSocketFactory(getNoopTrustManagers());
HOSTNAME_VERIFIER = getTrustedVerifier();
} else if (mode == CERT_MODE_PINNED) {
SOCKET_FACTORY = createSocketFactory(getPinnedTrustManagers());
HOSTNAME_VERIFIER = null;
} else {
SOCKET_FACTORY = null;
HOSTNAME_VERIFIER = null;
}
CURRENT_CERT_MODE = mode;
@@ -314,19 +317,6 @@ public class HttpRequest {
}
}
/**
* Configure host name verification for all future HTTPS connections
*
* @param enabled
*/
public static void setHostnameVerification(boolean enabled) {
if (enabled) {
HOSTNAME_VERIFIER = null;
} else {
HOSTNAME_VERIFIER = getTrustedVerifier();
}
}
private static TrustManager[] getPinnedTrustManagers() throws IOException {
if (PINNED_CERTS == null) {
throw new IOException("You must add at least 1 certificate in order to pin to certificates");
src/android/com/synconset/cordovahttp/CordovaHttpPlugin.java
-4
View File
@@ -100,10 +100,8 @@ public class CordovaHttpPlugin extends CordovaPlugin {
if (accept) {
HttpRequest.setSSLCertMode(HttpRequest.CERT_MODE_TRUSTALL);
HttpRequest.setHostnameVerification(false);
} else {
HttpRequest.setSSLCertMode(HttpRequest.CERT_MODE_DEFAULT);
HttpRequest.setHostnameVerification(true);
}
callbackContext.success();
@@ -169,10 +167,8 @@ public class CordovaHttpPlugin extends CordovaPlugin {
}
HttpRequest.setSSLCertMode(HttpRequest.CERT_MODE_PINNED);
HttpRequest.setHostnameVerification(true);
} else {
HttpRequest.setSSLCertMode(HttpRequest.CERT_MODE_DEFAULT);
HttpRequest.setHostnameVerification(true);
}
}
}