Skip to content

Commit 5b9ccd7

Browse files
authored
SQL: [Tests] Re-enable testDriverConfigurationWithSSLInURL test with more logging (elastic#44800)
1 parent f1bdc0c commit 5b9ccd7

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcConfigurationTests.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
*/
66
package org.elasticsearch.xpack.sql.jdbc;
77

8+
import org.elasticsearch.SpecialPermission;
89
import org.elasticsearch.test.ESTestCase;
910
import org.elasticsearch.xpack.sql.client.SslConfig;
11+
import org.elasticsearch.xpack.sql.client.SuppressForbidden;
1012

1113
import java.net.URI;
1214
import java.net.URISyntaxException;
15+
import java.security.AccessController;
16+
import java.security.PrivilegedAction;
1317
import java.sql.DriverManager;
1418
import java.sql.SQLException;
1519
import java.util.HashMap;
@@ -252,14 +256,20 @@ public void testSSLPropertiesOverride() throws Exception {
252256
assertSslConfig(props, JdbcConfiguration.create("jdbc:es://test?" + sslUrlProps.toString(), props, 0).sslConfig());
253257
}
254258

255-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/41557")
259+
@SuppressForbidden(reason = "JDBC drivers allows logging to Sys.out")
256260
public void testDriverConfigurationWithSSLInURL() {
257261
Map<String, String> urlPropMap = sslProperties();
258-
259-
Properties allProps = new Properties();
260-
allProps.putAll(urlPropMap);
261262
String sslUrlProps = urlPropMap.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining("&"));
262263

264+
SecurityManager sm = System.getSecurityManager();
265+
if (sm != null) {
266+
sm.checkPermission(new SpecialPermission());
267+
}
268+
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
269+
DriverManager.setLogWriter(new java.io.PrintWriter(System.out));
270+
return null;
271+
});
272+
263273
try {
264274
DriverManager.getDriver("jdbc:es://test?" + sslUrlProps);
265275
} catch (SQLException sqle) {
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
grant {
22
// Required for testing the Driver registration
33
permission java.sql.SQLPermission "deregisterDriver";
4+
// Required for debug logging purposes
5+
permission java.sql.SQLPermission "setLog";
46
};

0 commit comments

Comments
 (0)