Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GEODE-4755: Use a more portable File permission API #1573

Merged
merged 1 commit into from Mar 8, 2018
Merged

GEODE-4755: Use a more portable File permission API #1573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 2 additions & 9 deletions ...core/src/main/java/org/apache/geode/distributed/internal/ClusterConfigurationService.java
View file
Open in desktop
Expand Up @@ -31,8 +31,6 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.PosixFilePermission;
import java.nio.file.attribute.PosixFilePermissions;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -75,7 +73,6 @@
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.LockServiceDestroyedException;
import org.apache.geode.distributed.internal.locks.DLockService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
Expand All @@ -84,6 +81,7 @@
import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.beans.FileUploader;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.configuration.callbacks.ConfigurationChangeListener;
import org.apache.geode.management.internal.configuration.domain.Configuration;
Expand Down Expand Up @@ -435,12 +433,7 @@ public File downloadJar(DistributedMember locator, String groupName, String jarN
List<RemoteInputStream> result = rc.getResult();
RemoteInputStream jarStream = result.get(0);

Set<PosixFilePermission> perms = new HashSet<>();
perms.add(PosixFilePermission.OWNER_READ);
perms.add(PosixFilePermission.OWNER_WRITE);
perms.add(PosixFilePermission.OWNER_EXECUTE);
Path tempDir =
Files.createTempDirectory("deploy-", PosixFilePermissions.asFileAttribute(perms));
Path tempDir = FileUploader.createSecuredTempDirectory("deploy-");
Path tempJar = Paths.get(tempDir.toString(), jarName);
FileOutputStream fos = new FileOutputStream(tempJar.toString());
InputStream input = RemoteInputStreamClient.wrap(jarStream);
Expand Down
11 changes: 2 additions & 9 deletions geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
View file
Open in desktop
Expand Up @@ -23,11 +23,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.UnknownHostException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.PosixFilePermission;
import java.nio.file.attribute.PosixFilePermissions;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -63,6 +60,7 @@
import org.apache.geode.internal.JarDeployer;
import org.apache.geode.internal.config.ClusterConfigurationNotAvailableException;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.beans.FileUploader;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.configuration.domain.Configuration;
import org.apache.geode.management.internal.configuration.functions.DownloadJarFunction;
Expand Down Expand Up @@ -141,12 +139,7 @@ public File downloadJar(DistributedMember locator, String groupName, String jarN
List<RemoteInputStream> result = rc.getResult();
RemoteInputStream jarStream = result.get(0);

Set<PosixFilePermission> perms = new HashSet<>();
perms.add(PosixFilePermission.OWNER_READ);
perms.add(PosixFilePermission.OWNER_WRITE);
perms.add(PosixFilePermission.OWNER_EXECUTE);
Path tempDir =
Files.createTempDirectory("deploy-", PosixFilePermissions.asFileAttribute(perms));
Path tempDir = FileUploader.createSecuredTempDirectory("deploy-");
Path tempJar = Paths.get(tempDir.toString(), jarName);
FileOutputStream fos = new FileOutputStream(tempJar.toString());

Expand Down
17 changes: 11 additions & 6 deletions geode-core/src/main/java/org/apache/geode/management/internal/beans/FileUploader.java
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.Serializable;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down Expand Up @@ -69,12 +70,7 @@ public FileUploader(RemoteStreamExporter exporter) {

@Override
public RemoteFile uploadFile(String filename) throws IOException {
Set<PosixFilePermission> perms = new HashSet<>();
perms.add(PosixFilePermission.OWNER_READ);
perms.add(PosixFilePermission.OWNER_WRITE);
perms.add(PosixFilePermission.OWNER_EXECUTE);
Path tempDir =
Files.createTempDirectory(STAGED_DIR_PREFIX, PosixFilePermissions.asFileAttribute(perms));
Path tempDir = createSecuredTempDirectory(STAGED_DIR_PREFIX);

File stagedFile = new File(tempDir.toString(), filename);
BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(stagedFile));
Expand Down Expand Up @@ -117,4 +113,13 @@ public void deleteFiles(List<String> files) {
FileUtils.deleteQuietly(parent);
}
}

public static Path createSecuredTempDirectory(String prefix) throws IOException {
Path tempDir = Files.createTempDirectory(prefix);
tempDir.toFile().setExecutable(true, true);
tempDir.toFile().setWritable(true, true);
tempDir.toFile().setReadable(true, true);

return tempDir;
}
}
13 changes: 2 additions & 11 deletions ...core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
View file
Open in desktop
Expand Up @@ -18,17 +18,12 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.PosixFilePermission;
import java.nio.file.attribute.PosixFilePermissions;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import com.healthmarketscience.rmiio.RemoteInputStream;
import com.healthmarketscience.rmiio.RemoteInputStreamClient;
Expand All @@ -45,6 +40,7 @@
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.InternalFunction;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.beans.FileUploader;

public class DeployFunction implements InternalFunction {
private static final Logger logger = LogService.getLogger();
Expand Down Expand Up @@ -154,12 +150,7 @@ private Map<String, File> stageJarContent(List<String> jarNames,
Map<String, File> stagedJars = new HashMap<>();

try {
Set<PosixFilePermission> perms = new HashSet<>();
perms.add(PosixFilePermission.OWNER_READ);
perms.add(PosixFilePermission.OWNER_WRITE);
perms.add(PosixFilePermission.OWNER_EXECUTE);
Path tempDir =
Files.createTempDirectory("deploy-", PosixFilePermissions.asFileAttribute(perms));
Path tempDir = FileUploader.createSecuredTempDirectory("deploy-");

for (int i = 0; i < jarNames.size(); i++) {
Path tempJar = Paths.get(tempDir.toString(), jarNames.get(i));
Expand Down
12 changes: 2 additions & 10 deletions ...java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
View file
Open in desktop
Expand Up @@ -18,16 +18,11 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.attribute.PosixFilePermission;
import java.nio.file.attribute.PosixFilePermissions;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.management.InstanceNotFoundException;
import javax.management.JMX;
Expand All @@ -54,6 +49,7 @@
import org.apache.geode.management.internal.MBeanJMXAdapter;
import org.apache.geode.management.internal.ManagementAgent;
import org.apache.geode.management.internal.SystemManagementService;
import org.apache.geode.management.internal.beans.FileUploader;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.web.controllers.support.LoginHandlerInterceptor;
import org.apache.geode.management.internal.web.util.UriUtils;
Expand Down Expand Up @@ -246,11 +242,7 @@ protected String processCommand(final String command, final Map<String, String>
List<String> filePaths = null;
Path tempDir = null;
if (multipartFiles != null) {
Set<PosixFilePermission> perms = new HashSet<>();
perms.add(PosixFilePermission.OWNER_READ);
perms.add(PosixFilePermission.OWNER_WRITE);
perms.add(PosixFilePermission.OWNER_EXECUTE);
tempDir = Files.createTempDirectory("uploaded-", PosixFilePermissions.asFileAttribute(perms));
tempDir = FileUploader.createSecuredTempDirectory("uploaded-");
// staging the files to local
filePaths = new ArrayList<>();
for (MultipartFile multipartFile : multipartFiles) {
Expand Down