Skip to content

Commit 010a80c

Browse files
authored
Add some potential fixes for flaky tests in the SecurityTests (#940)
1 parent a671329 commit 010a80c

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

core/src/test/java/apoc/export/ExportCoreSecurityTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import java.util.logging.Logger;
4949
import java.util.stream.Collectors;
5050
import java.util.stream.Stream;
51+
import org.junit.jupiter.api.AfterEach;
5152
import org.junit.jupiter.api.BeforeAll;
5253
import org.junit.jupiter.api.Test;
5354
import org.junit.jupiter.params.ParameterizedTest;
@@ -88,6 +89,12 @@ void configure(TestDatabaseManagementServiceBuilder builder) {
8889
GraphDatabaseSettings.load_csv_file_url_root, directory.toPath().toAbsolutePath());
8990
}
9091

92+
@AfterEach
93+
void tearDown() {
94+
ApocConfig.apocConfig().setProperty(ApocConfig.APOC_EXPORT_FILE_ENABLED, false);
95+
ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_USE_NEO4J_CONFIG, true);
96+
}
97+
9198
@BeforeAll
9299
void setUpAll() {
93100
Logger logger = Logger.getLogger(ExportCoreSecurityTest.class.getName());
@@ -329,7 +336,7 @@ void testIllegalFSAccessExportCypherSchema() {
329336

330337
@Test
331338
void testIllegalExternalFSAccessExportCypherSchema() {
332-
setFileExport(true);
339+
setExportFileApocConfigs(true, true, false);
333340
assertPathTraversalError(
334341
db,
335342
String.format(apocSchemaProc, "'../hello', {}"),

core/src/test/java/apoc/export/arrow/ExportArrowSecurityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private static Collection<Object[]> getParameterData(List<Pair<String, Consumer<
105105
(Map e) -> assertTrue(((Exception) e.get(ERROR_KEY)).getMessage().contains("outside the import directory"));
106106

107107
// Illegal external FS access cases
108-
private static final String FILENAME = ExportCoreSecurityTest.FILENAME;
108+
private static final String FILENAME = "arrow-my-test.txt";
109109
private static final String PARAM_NAMES = ExportCoreSecurityTest.PARAM_NAMES;
110110

111111
private static final String case01 = "../imported/" + FILENAME;

0 commit comments

Comments
 (0)