From 6b0c1168bcfc402b69de89cded8e9ea843057eb9 Mon Sep 17 00:00:00 2001 From: Andrei Stefan Date: Wed, 25 Aug 2021 00:44:31 +0300 Subject: [PATCH 1/2] Change the rolled over file name to consider the compression --- x-pack/plugin/sql/qa/server/security/build.gradle | 2 +- .../xpack/sql/qa/security/CliSecurityIT.java | 4 ---- .../xpack/sql/qa/security/SqlSecurityTestCase.java | 11 ++++++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/x-pack/plugin/sql/qa/server/security/build.gradle b/x-pack/plugin/sql/qa/server/security/build.gradle index f33ebc9e2168c..7146b089d1e76 100644 --- a/x-pack/plugin/sql/qa/server/security/build.gradle +++ b/x-pack/plugin/sql/qa/server/security/build.gradle @@ -50,7 +50,7 @@ subprojects { nonInputProperties.systemProperty 'tests.audit.logfile', "${-> testClusters.integTest.singleNode().getAuditLog()}" nonInputProperties.systemProperty 'tests.audit.yesterday.logfile', - "${-> testClusters.integTest.singleNode().getAuditLog().getParentFile()}/integTest_audit-${new Date().format('yyyy-MM-dd')}.json" + "${-> testClusters.integTest.singleNode().getAuditLog().getParentFile()}/integTest_audit-${new Date().format('yyyy-MM-dd')}-1.json.gz" } tasks.named("testingConventions").configure { enabled = false } diff --git a/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/CliSecurityIT.java b/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/CliSecurityIT.java index 2aba1676a9f5e..35aa0f2e048c5 100644 --- a/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/CliSecurityIT.java +++ b/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/CliSecurityIT.java @@ -28,19 +28,15 @@ public class CliSecurityIT extends SqlSecurityTestCase { @Override - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/76806") public void testDescribeWorksAsFullAccess() {} @Override - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/76806") public void testQuerySingleFieldGranted() {} @Override - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/76806") public void testScrollWithSingleFieldExcepted() {} @Override - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/76806") public void testQueryWorksAsAdmin() {} static SecurityConfig adminSecurityConfig() { diff --git a/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java b/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java index f12196e0a215b..40accb40e839d 100644 --- a/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java +++ b/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java @@ -28,7 +28,11 @@ import org.junit.Before; import java.io.BufferedReader; +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -44,6 +48,7 @@ import java.util.TreeMap; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.zip.GZIPInputStream; import static java.util.Arrays.asList; import static java.util.Collections.singletonMap; @@ -587,8 +592,12 @@ public void assertLogs() throws Exception { if (localAuditFileRolledOver == false && Files.exists(ROLLED_OVER_AUDIT_LOG_FILE)) { // once the audit file rolled over, it will stay like this auditFileRolledOver = true; + // unzip the file + InputStream fileStream = new FileInputStream(ROLLED_OVER_AUDIT_LOG_FILE.toFile()); + InputStream gzipStream = new GZIPInputStream(fileStream); + Reader decoder = new InputStreamReader(gzipStream, StandardCharsets.UTF_8); // the order in the array matters, as the readers will be used in that order - logReaders[0] = Files.newBufferedReader(ROLLED_OVER_AUDIT_LOG_FILE, StandardCharsets.UTF_8); + logReaders[0] = new BufferedReader(decoder); } logReaders[1] = Files.newBufferedReader(AUDIT_LOG_FILE, StandardCharsets.UTF_8); return null; From 78e011e3368b3e990b99f187c33ecc375eb6f95c Mon Sep 17 00:00:00 2001 From: Andrei Stefan Date: Tue, 24 Aug 2021 15:11:47 +0300 Subject: [PATCH 2/2] Use NIO instead of java.io.File --- .../xpack/sql/qa/security/SqlSecurityTestCase.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java b/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java index 40accb40e839d..10762bddfb71a 100644 --- a/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java +++ b/x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java @@ -28,7 +28,6 @@ import org.junit.Before; import java.io.BufferedReader; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -593,8 +592,7 @@ public void assertLogs() throws Exception { // once the audit file rolled over, it will stay like this auditFileRolledOver = true; // unzip the file - InputStream fileStream = new FileInputStream(ROLLED_OVER_AUDIT_LOG_FILE.toFile()); - InputStream gzipStream = new GZIPInputStream(fileStream); + InputStream gzipStream = new GZIPInputStream(Files.newInputStream(ROLLED_OVER_AUDIT_LOG_FILE)); Reader decoder = new InputStreamReader(gzipStream, StandardCharsets.UTF_8); // the order in the array matters, as the readers will be used in that order logReaders[0] = new BufferedReader(decoder);