honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tests: Fix systemkeytool tests 

One test was missing the check if posix permissions are supported by the file system.
As it does not make sense to not run 50% of the tests in 50% of the cases, the
logic to configure which capabilities a in-memory FS should have has been moved
into each test.

Original commit: elastic/x-pack-elasticsearch@59a32ea26d
This commit is contained in:
Alexander Reelsen 2016-04-05 14:08:03 +02:00
parent 323f80216d
commit 366498eca4
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/crypto/tool/SystemKeyToolTests.java
View File

@ -13,12 +13,10 @@ import org.elasticsearch.common.io.PathUtilsForTesting;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.shield.crypto.InternalCryptoService; import org.elasticsearch.shield.crypto.InternalCryptoService;
import org.junit.Before;
import java.nio.file.FileSystem; import java.nio.file.FileSystem;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.attribute.PosixFileAttributeView;
import java.nio.file.attribute.PosixFilePermission; import java.nio.file.attribute.PosixFilePermission;
import java.util.Set; import java.util.Set;
@ -28,9 +26,8 @@ public class SystemKeyToolTests extends CommandTestCase {
private Settings.Builder settingsBuilder; private Settings.Builder settingsBuilder;
private Path homeDir; private Path homeDir;
@Before private void initFileSystem(boolean needsPosix) throws Exception {
public void init() throws Exception { String view = needsPosix ? "posix" : randomFrom("basic", "posix");
String view = randomFrom("basic", "posix");
Configuration conf = Configuration.unix().toBuilder().setAttributeViews(view).build(); Configuration conf = Configuration.unix().toBuilder().setAttributeViews(view).build();
jimfs = Jimfs.newFileSystem(conf); jimfs = Jimfs.newFileSystem(conf);
PathUtilsForTesting.installMock(jimfs); PathUtilsForTesting.installMock(jimfs);
@ -46,8 +43,11 @@ public class SystemKeyToolTests extends CommandTestCase {
} }
public void testGenerate() throws Exception { public void testGenerate() throws Exception {
initFileSystem(true);
Path path = jimfs.getPath(randomAsciiOfLength(10)).resolve("key"); Path path = jimfs.getPath(randomAsciiOfLength(10)).resolve("key");
Files.createDirectory(path.getParent()); Files.createDirectory(path.getParent());
execute(path.toString()); execute(path.toString());
byte[] bytes = Files.readAllBytes(path); byte[] bytes = Files.readAllBytes(path);
// TODO: maybe we should actually check the key is...i dunno...valid? // TODO: maybe we should actually check the key is...i dunno...valid?
@ -60,6 +60,8 @@ public class SystemKeyToolTests extends CommandTestCase {
} }
public void testGeneratePathInSettings() throws Exception { public void testGeneratePathInSettings() throws Exception {
initFileSystem(false);
Path path = jimfs.getPath(randomAsciiOfLength(10)).resolve("key"); Path path = jimfs.getPath(randomAsciiOfLength(10)).resolve("key");
Files.createDirectories(path.getParent()); Files.createDirectories(path.getParent());
settingsBuilder.put("shield.system_key.file", path.toAbsolutePath().toString()); settingsBuilder.put("shield.system_key.file", path.toAbsolutePath().toString());
@ -69,6 +71,7 @@ public class SystemKeyToolTests extends CommandTestCase {
} }
public void testGenerateDefaultPath() throws Exception { public void testGenerateDefaultPath() throws Exception {
initFileSystem(false);
Path keyPath = homeDir.resolve("config/x-pack/system_key"); Path keyPath = homeDir.resolve("config/x-pack/system_key");
Files.createDirectories(keyPath.getParent()); Files.createDirectories(keyPath.getParent());
execute(); execute();
@ -77,10 +80,10 @@ public class SystemKeyToolTests extends CommandTestCase {
} }
public void testThatSystemKeyMayOnlyBeReadByOwner() throws Exception { public void testThatSystemKeyMayOnlyBeReadByOwner() throws Exception {
initFileSystem(true);
Path path = jimfs.getPath(randomAsciiOfLength(10)).resolve("key"); Path path = jimfs.getPath(randomAsciiOfLength(10)).resolve("key");
Files.createDirectories(path.getParent()); Files.createDirectories(path.getParent());
boolean isPosix = Files.getFileAttributeView(path.getParent(), PosixFileAttributeView.class) != null;
assumeTrue("posix filesystem", isPosix);
execute(path.toString()); execute(path.toString());
Set<PosixFilePermission> perms = Files.getPosixFilePermissions(path); Set<PosixFilePermission> perms = Files.getPosixFilePermissions(path);