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

Refactor POSIX handling when installing plugins 

This commit refactors the handling of POSIX filesystem attributes when
install plugins.
This commit is contained in:
Jason Tedor 2016-03-19 11:32:06 -04:00
parent 4fad18d3bc
commit 554eb8aa87
1 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java
View File

@ -21,7 +21,6 @@ package org.elasticsearch.plugins;
import joptsimple.OptionSet; import joptsimple.OptionSet;
import joptsimple.OptionSpec; import joptsimple.OptionSpec;
import org.apache.lucene.util.Constants;
import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.IOUtils;
import org.elasticsearch.Build; import org.elasticsearch.Build;
import org.elasticsearch.Version; import org.elasticsearch.Version;
@ -56,6 +55,8 @@ import java.util.HashSet;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Objects;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
@ -249,21 +250,8 @@ class InstallPluginCommand extends Command {
private Path unzip(Path zip, Path pluginsDir) throws IOException, UserError { private Path unzip(Path zip, Path pluginsDir) throws IOException, UserError {
// unzip plugin to a staging temp dir // unzip plugin to a staging temp dir
final Path target;
if (Constants.WINDOWS) { final Path target = stagingDirectory(pluginsDir);
target = Files.createTempDirectory(pluginsDir, ".installing-");
} else {
Set<PosixFilePermission> perms = new HashSet<>();
perms.add(PosixFilePermission.OWNER_EXECUTE);
perms.add(PosixFilePermission.OWNER_READ);
perms.add(PosixFilePermission.OWNER_WRITE);
perms.add(PosixFilePermission.GROUP_READ);
perms.add(PosixFilePermission.GROUP_EXECUTE);
perms.add(PosixFilePermission.OTHERS_READ);
perms.add(PosixFilePermission.OTHERS_EXECUTE);
target = Files.createTempDirectory(pluginsDir, ".installing-", PosixFilePermissions.asFileAttribute(perms));
}
Files.createDirectories(target);
boolean hasEsDir = false; boolean hasEsDir = false;
// TODO: we should wrap this in a try/catch and try deleting the target dir on failure? // TODO: we should wrap this in a try/catch and try deleting the target dir on failure?
@ -308,6 +296,22 @@ class InstallPluginCommand extends Command {
return target; return target;
} }
private Path stagingDirectory(Path pluginsDir) throws IOException {
try {
Set<PosixFilePermission> perms = new HashSet<>();
perms.add(PosixFilePermission.OWNER_EXECUTE);
perms.add(PosixFilePermission.OWNER_READ);
perms.add(PosixFilePermission.OWNER_WRITE);
perms.add(PosixFilePermission.GROUP_READ);
perms.add(PosixFilePermission.GROUP_EXECUTE);
perms.add(PosixFilePermission.OTHERS_READ);
perms.add(PosixFilePermission.OTHERS_EXECUTE);
return Files.createTempDirectory(pluginsDir, ".installing-", PosixFilePermissions.asFileAttribute(perms));
} catch (UnsupportedOperationException e) {
return Files.createTempDirectory(pluginsDir, ".installing-");
}
}
/** Load information about the plugin, and verify it can be installed with no errors. */ /** Load information about the plugin, and verify it can be installed with no errors. */
private PluginInfo verify(Terminal terminal, Path pluginRoot, boolean isBatch) throws Exception { private PluginInfo verify(Terminal terminal, Path pluginRoot, boolean isBatch) throws Exception {
// read and validate the plugin descriptor // read and validate the plugin descriptor
@ -413,17 +417,15 @@ class InstallPluginCommand extends Command {
} }
Files.createDirectory(destBinDir); Files.createDirectory(destBinDir);
Set<PosixFilePermission> perms = new HashSet<>(); // setup file attributes for the installed files to those of the parent dir
if (Constants.WINDOWS == false) { final Set<PosixFilePermission> perms = new HashSet<>();
// setup file attributes for the installed files to those of the parent dir final PosixFileAttributeView binAttributeView = Files.getFileAttributeView(destBinDir.getParent(), PosixFileAttributeView.class);
PosixFileAttributeView binAttrs = Files.getFileAttributeView(destBinDir.getParent(), PosixFileAttributeView.class); if (binAttributeView != null) {
if (binAttrs != null) { perms.addAll(binAttributeView.readAttributes().permissions());
perms = new HashSet<>(binAttrs.readAttributes().permissions()); // setting execute bits, since this just means "the file is executable", and actual execution requires read
// setting execute bits, since this just means "the file is executable", and actual execution requires read perms.add(PosixFilePermission.OWNER_EXECUTE);
perms.add(PosixFilePermission.OWNER_EXECUTE); perms.add(PosixFilePermission.GROUP_EXECUTE);
perms.add(PosixFilePermission.GROUP_EXECUTE); perms.add(PosixFilePermission.OTHERS_EXECUTE);
perms.add(PosixFilePermission.OTHERS_EXECUTE);
}
} }
try (DirectoryStream<Path> stream = Files.newDirectoryStream(tmpBinDir)) { try (DirectoryStream<Path> stream = Files.newDirectoryStream(tmpBinDir)) {
@ -437,8 +439,8 @@ class InstallPluginCommand extends Command {
Path destFile = destBinDir.resolve(tmpBinDir.relativize(srcFile)); Path destFile = destBinDir.resolve(tmpBinDir.relativize(srcFile));
Files.copy(srcFile, destFile); Files.copy(srcFile, destFile);
if (perms.isEmpty() == false) { final PosixFileAttributeView view = Files.getFileAttributeView(destFile, PosixFileAttributeView.class);
PosixFileAttributeView view = Files.getFileAttributeView(destFile, PosixFileAttributeView.class); if (view != null) {
view.setPermissions(perms); view.setPermissions(perms);
} }
} }
@ -457,15 +459,12 @@ class InstallPluginCommand extends Command {
// create the plugin's config dir "if necessary" // create the plugin's config dir "if necessary"
Files.createDirectories(destConfigDir); Files.createDirectories(destConfigDir);
final PosixFileAttributeView destConfigDirAttributesView =
final PosixFileAttributes destConfigDirAttributes; Files.getFileAttributeView(destConfigDir.getParent(), PosixFileAttributeView.class);
if (Constants.WINDOWS) { final PosixFileAttributes destConfigDirAttributes =
destConfigDirAttributes = null; destConfigDirAttributesView != null ? destConfigDirAttributesView.readAttributes() : null;
} else { if (destConfigDirAttributes != null) {
destConfigDirAttributes =
Files.getFileAttributeView(destConfigDir.getParent(), PosixFileAttributeView.class).readAttributes();
setOwnerGroup(destConfigDir, destConfigDirAttributes); setOwnerGroup(destConfigDir, destConfigDirAttributes);
} }
try (DirectoryStream<Path> stream = Files.newDirectoryStream(tmpConfigDir)) { try (DirectoryStream<Path> stream = Files.newDirectoryStream(tmpConfigDir)) {
@ -477,7 +476,7 @@ class InstallPluginCommand extends Command {
Path destFile = destConfigDir.resolve(tmpConfigDir.relativize(srcFile)); Path destFile = destConfigDir.resolve(tmpConfigDir.relativize(srcFile));
if (Files.exists(destFile) == false) { if (Files.exists(destFile) == false) {
Files.copy(srcFile, destFile); Files.copy(srcFile, destFile);
if (Constants.WINDOWS == false) { if (destConfigDirAttributes != null) {
setOwnerGroup(destFile, destConfigDirAttributes); setOwnerGroup(destFile, destConfigDirAttributes);
} }
} }
@ -486,8 +485,10 @@ class InstallPluginCommand extends Command {
IOUtils.rm(tmpConfigDir); // clean up what we just copied IOUtils.rm(tmpConfigDir); // clean up what we just copied
} }
private static void setOwnerGroup(Path path, PosixFileAttributes attributes) throws IOException { private static void setOwnerGroup(final Path path, final PosixFileAttributes attributes) throws IOException {
Objects.requireNonNull(attributes);
PosixFileAttributeView fileAttributeView = Files.getFileAttributeView(path, PosixFileAttributeView.class); PosixFileAttributeView fileAttributeView = Files.getFileAttributeView(path, PosixFileAttributeView.class);
assert fileAttributeView != null;
fileAttributeView.setOwner(attributes.owner()); fileAttributeView.setOwner(attributes.owner());
fileAttributeView.setGroup(attributes.group()); fileAttributeView.setGroup(attributes.group());
} }