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

fix: #425 plugin crashes on Android SDK levels < 24

Browse Source
This commit is contained in:
Sefa Ilkimen
2021-08-20 03:29:21 +02:00
parent 80315156ad
commit 16ac763a2a
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+4
View File
@@ -1,5 +1,9 @@
# Changelog # Changelog
## 3.2.1
- Fixed #425: plugin crashes on Android SDK levels < 24
## 3.2.0 ## 3.2.0
- Feature #420: implement blacklist feature to disable SSL/TLS versions on Android (thanks to @MobisysGmbH) - Feature #420: implement blacklist feature to disable SSL/TLS versions on Android (thanks to @MobisysGmbH)
src/android/com/silkimen/http/TLSSocketFactory.java
+15 -8
View File
@@ -5,8 +5,8 @@ import java.net.InetAddress;
import java.net.Socket; import java.net.Socket;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.Arrays; import java.util.ArrayList;
import java.util.stream.Stream; import java.util.List;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocket;
@@ -15,11 +15,15 @@ import javax.net.ssl.SSLSocketFactory;
public class TLSSocketFactory extends SSLSocketFactory { public class TLSSocketFactory extends SSLSocketFactory {
private SSLSocketFactory delegate; private SSLSocketFactory delegate;
private String[] blacklistedProtocols; private List<String> blacklistedProtocols;
public TLSSocketFactory(SSLContext context, String[] blacklistedProtocols) { public TLSSocketFactory(SSLContext context, String[] blacklistedProtocols) {
this.delegate = context.getSocketFactory(); this.delegate = context.getSocketFactory();
this.blacklistedProtocols = Arrays.stream(blacklistedProtocols).map(String::trim).toArray(String[]::new); this.blacklistedProtocols = new ArrayList();
for (int i = 0; i < blacklistedProtocols.length; ++i) {
this.blacklistedProtocols.add(blacklistedProtocols[i].trim());
}
} }
@Override @Override
@@ -65,12 +69,15 @@ public class TLSSocketFactory extends SSLSocketFactory {
} }
String[] supported = ((SSLSocket) socket).getSupportedProtocols(); String[] supported = ((SSLSocket) socket).getSupportedProtocols();
List<String> filtered = new ArrayList();
String[] filtered = Arrays.stream(supported).filter( for (int i = 0; i < supported.length; ++i) {
val -> Arrays.stream(this.blacklistedProtocols).noneMatch(val::equals) if (!this.blacklistedProtocols.contains(supported[i])) {
).toArray(String[]::new); filtered.add(supported[i]);
}
}
((SSLSocket) socket).setEnabledProtocols(filtered); ((SSLSocket) socket).setEnabledProtocols(filtered.toArray(new String[0]));
return socket; return socket;
} }