sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use conscrypt api to set sni and alpn

This commit is contained in:
Daniel Gultsch 2018-09-23 11:20:23 +02:00
parent 70845c5e95
commit 2d206122a5
3 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/services/NotificationService.java
View File

@ -31,6 +31,8 @@ import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import org.conscrypt.Conscrypt;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

40
src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java
View File

@ -4,6 +4,8 @@ import android.os.Build;
import android.support.annotation.RequiresApi; import android.support.annotation.RequiresApi;
import android.util.Log; import android.util.Log;
import org.conscrypt.Conscrypt;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Arrays; import java.util.Arrays;
@ -40,37 +42,19 @@ public class SSLSocketHelper {
} }
} }
public static void setSNIHost(final SSLSocket socket, final String hostname) { public static void setHostname(final SSLSocket socket, final String hostname) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { try {
setSNIHostNougat(socket, hostname); Conscrypt.setHostname(socket, hostname);
} else { } catch (IllegalArgumentException e) {
try { Log.e(Config.LOGTAG, "unable to set SNI name on socket (" + hostname + ")", e);
socket.getClass().getMethod("setHostname", String.class).invoke(socket, hostname);
} catch (Throwable e) {
Log.e(Config.LOGTAG, "unable to set SNI name on socket (" + hostname + ")", e);
}
} }
} }
@RequiresApi(api = Build.VERSION_CODES.N) public static void setApplicationProtocol(final SSLSocket socket, final String protocol) {
private static void setSNIHostNougat(final SSLSocket socket, final String hostname) {
final SSLParameters parameters = new SSLParameters();
parameters.setServerNames(Collections.singletonList(new SNIHostName(hostname)));
socket.setSSLParameters(parameters);
}
public static void setAlpnProtocol(final SSLSocket socket, final String protocol) {
try { try {
final Method method = socket.getClass().getMethod("setAlpnProtocols", byte[].class); Conscrypt.setApplicationProtocols(socket, new String[]{protocol});
// the concatenation of 8-bit, length prefixed protocol names, just one in our case... } catch (IllegalArgumentException e) {
// http://tools.ietf.org/html/draft-agl-tls-nextprotoneg-04#page-4 Log.e(Config.LOGTAG, "unable to set ALPN on socket", e);
final byte[] protocolUTF8Bytes = protocol.getBytes("UTF-8");
final byte[] lengthPrefixedProtocols = new byte[protocolUTF8Bytes.length + 1];
lengthPrefixedProtocols[0] = (byte) protocol.length(); // cannot be over 255 anyhow
System.arraycopy(protocolUTF8Bytes, 0, lengthPrefixedProtocols, 1, protocolUTF8Bytes.length);
method.invoke(socket, new Object[]{lengthPrefixedProtocols});
} catch (Throwable e) {
Log.e(Config.LOGTAG,"unable to set ALPN on socket",e);
} }
} }
@ -80,6 +64,6 @@ public class SSLSocketHelper {
public static void log(Account account, SSLSocket socket) { public static void log(Account account, SSLSocket socket) {
SSLSession session = socket.getSession(); SSLSession session = socket.getSession();
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": protocol="+session.getProtocol()+" cipher="+session.getCipherSuite()); Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": protocol=" + session.getProtocol() + " cipher=" + session.getCipherSuite());
} }
} }

4
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View File

@ -377,8 +377,8 @@ public class XmppConnection implements Runnable {
} }
SSLSocketHelper.setSecurity((SSLSocket) localSocket); SSLSocketHelper.setSecurity((SSLSocket) localSocket);
SSLSocketHelper.setSNIHost((SSLSocket) localSocket, account.getServer()); SSLSocketHelper.setHostname((SSLSocket) localSocket, account.getServer());
SSLSocketHelper.setAlpnProtocol((SSLSocket) localSocket, "xmpp-client"); SSLSocketHelper.setApplicationProtocol((SSLSocket) localSocket, "xmpp-client");
localSocket.connect(addr, Config.SOCKET_TIMEOUT * 1000); localSocket.connect(addr, Config.SOCKET_TIMEOUT * 1000);