Consider setSslContextFactory and fix tests

Author: atorralba

java/ql/lib/semmle/code/java/security/UnsafeCertTrust.qll

@@ -121,12 +121,12 @@ private class SafeSetEndpointIdentificationAlgorithm extends MethodAccess {
 }
 
 /**
- * A call to the method `useSslProtocol` on an instance of `com.rabbitmq.client.ConnectionFactory`
- * that doesn't set `enableHostnameVerification`.
+ * A call to a method that enables SSL (`useSslProtocol` or `setSslContextFactory`)
+ * on an instance of `com.rabbitmq.client.ConnectionFactory` that doesn't set `enableHostnameVerification`.
  */
 class RabbitMQEnableHostnameVerificationNotSet extends MethodAccess {
   RabbitMQEnableHostnameVerificationNotSet() {
-    this.getMethod().hasName("useSslProtocol") and
+    this.getMethod().hasName(["useSslProtocol", "setSslContextFactory"]) and
     this.getMethod().getDeclaringType() instanceof RabbitMQConnectionFactory and
     exists(Variable v |
       v.getType() instanceof RabbitMQConnectionFactory and

java/ql/test/query-tests/security/CWE-273/UnsafeCertTrustTest.java

@@ -1,12 +1,14 @@
 import java.net.Socket;
 import java.nio.ByteBuffer;
+import java.security.NoSuchAlgorithmException;
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.SslContextFactory;
 
 public class UnsafeCertTrustTest {
 
@@ -146,13 +148,39 @@ public void testSocketEndpointIdNotSet() throws Exception {
 	}
 
 	public void testRabbitMQFactoryEnableHostnameVerificationNotSet() throws Exception {
-		ConnectionFactory connectionFactory = new ConnectionFactory();
-		connectionFactory.useSslProtocol(); // $hasUnsafeCertTrust
+		{
+			ConnectionFactory connectionFactory = new ConnectionFactory();
+			connectionFactory.useSslProtocol(SSLContext.getDefault()); // $hasUnsafeCertTrust
+		}
+		{
+			ConnectionFactory connectionFactory = new ConnectionFactory();
+			connectionFactory.setSslContextFactory(new TestSslContextFactory()); // $hasUnsafeCertTrust
+		}
 	}
 
 	public void testRabbitMQFactorySafe() throws Exception {
-		ConnectionFactory connectionFactory = new ConnectionFactory();
-		connectionFactory.useSslProtocol(); // Safe
-		connectionFactory.enableHostnameVerification();
+		{
+			ConnectionFactory connectionFactory = new ConnectionFactory();
+			connectionFactory.useSslProtocol(SSLContext.getDefault()); // Safe
+			connectionFactory.enableHostnameVerification();
+		}
+		{
+			ConnectionFactory connectionFactory = new ConnectionFactory();
+			connectionFactory.setSslContextFactory(new TestSslContextFactory()); // Safe
+			connectionFactory.enableHostnameVerification();
+		}
+	}
+
+	static class TestSslContextFactory implements SslContextFactory {
+
+		@Override
+		public SSLContext create(String name) {
+			try {
+				return SSLContext.getDefault();
+			} catch (NoSuchAlgorithmException e) {
+				return null;
+			}
+		}
+
 	}
 }