mirror of https://github.com/apache/jclouds.git
Adds windows ACL code for file permissions, fixes build.
This commit is contained in:
parent
2b855809a4
commit
786e5d8e25
|
@ -16,24 +16,27 @@
|
||||||
*/
|
*/
|
||||||
package org.jclouds.filesystem.strategy.internal;
|
package org.jclouds.filesystem.strategy.internal;
|
||||||
|
|
||||||
|
import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
|
import static com.google.common.base.Strings.isNullOrEmpty;
|
||||||
|
import static com.google.common.io.BaseEncoding.base16;
|
||||||
import static java.nio.file.Files.getFileAttributeView;
|
import static java.nio.file.Files.getFileAttributeView;
|
||||||
import static java.nio.file.Files.getPosixFilePermissions;
|
import static java.nio.file.Files.getPosixFilePermissions;
|
||||||
import static java.nio.file.Files.readAttributes;
|
import static java.nio.file.Files.readAttributes;
|
||||||
import static java.nio.file.Files.setPosixFilePermissions;
|
import static java.nio.file.Files.setPosixFilePermissions;
|
||||||
|
import static org.jclouds.filesystem.util.Utils.isPrivate;
|
||||||
import static com.google.common.base.Preconditions.checkNotNull;
|
import static org.jclouds.filesystem.util.Utils.isWindows;
|
||||||
import static com.google.common.base.Strings.isNullOrEmpty;
|
import static org.jclouds.filesystem.util.Utils.setPrivate;
|
||||||
import static com.google.common.io.BaseEncoding.base16;
|
import static org.jclouds.filesystem.util.Utils.setPublic;
|
||||||
import static org.jclouds.util.Closeables2.closeQuietly;
|
import static org.jclouds.util.Closeables2.closeQuietly;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.attribute.BasicFileAttributes;
|
import java.nio.file.attribute.BasicFileAttributes;
|
||||||
import java.nio.file.attribute.PosixFilePermission;
|
import java.nio.file.attribute.PosixFilePermission;
|
||||||
import java.nio.file.attribute.UserDefinedFileAttributeView;
|
import java.nio.file.attribute.UserDefinedFileAttributeView;
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
@ -156,6 +159,18 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy {
|
||||||
@Override
|
@Override
|
||||||
public ContainerAccess getContainerAccess(String container) {
|
public ContainerAccess getContainerAccess(String container) {
|
||||||
Path path = new File(buildPathStartingFromBaseDir(container)).toPath();
|
Path path = new File(buildPathStartingFromBaseDir(container)).toPath();
|
||||||
|
|
||||||
|
if ( isWindows() ) {
|
||||||
|
try {
|
||||||
|
if (isPrivate(path)) {
|
||||||
|
return ContainerAccess.PRIVATE;
|
||||||
|
} else {
|
||||||
|
return ContainerAccess.PUBLIC_READ;
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
Set<PosixFilePermission> permissions;
|
Set<PosixFilePermission> permissions;
|
||||||
try {
|
try {
|
||||||
permissions = getPosixFilePermissions(path);
|
permissions = getPosixFilePermissions(path);
|
||||||
|
@ -165,10 +180,23 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy {
|
||||||
return permissions.contains(PosixFilePermission.OTHERS_READ)
|
return permissions.contains(PosixFilePermission.OTHERS_READ)
|
||||||
? ContainerAccess.PUBLIC_READ : ContainerAccess.PRIVATE;
|
? ContainerAccess.PUBLIC_READ : ContainerAccess.PRIVATE;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setContainerAccess(String container, ContainerAccess access) {
|
public void setContainerAccess(String container, ContainerAccess access) {
|
||||||
Path path = new File(buildPathStartingFromBaseDir(container)).toPath();
|
Path path = new File(buildPathStartingFromBaseDir(container)).toPath();
|
||||||
|
|
||||||
|
if ( isWindows() ) {
|
||||||
|
try {
|
||||||
|
if (access == ContainerAccess.PRIVATE) {
|
||||||
|
setPrivate(path);
|
||||||
|
} else {
|
||||||
|
setPublic(path);
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
Set<PosixFilePermission> permissions;
|
Set<PosixFilePermission> permissions;
|
||||||
try {
|
try {
|
||||||
permissions = getPosixFilePermissions(path);
|
permissions = getPosixFilePermissions(path);
|
||||||
|
@ -182,6 +210,7 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy {
|
||||||
throw Throwables.propagate(ioe);
|
throw Throwables.propagate(ioe);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void deleteContainer(String container) {
|
public void deleteContainer(String container) {
|
||||||
|
@ -480,6 +509,18 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy {
|
||||||
@Override
|
@Override
|
||||||
public BlobAccess getBlobAccess(String containerName, String blobName) {
|
public BlobAccess getBlobAccess(String containerName, String blobName) {
|
||||||
Path path = new File(buildPathStartingFromBaseDir(containerName, blobName)).toPath();
|
Path path = new File(buildPathStartingFromBaseDir(containerName, blobName)).toPath();
|
||||||
|
|
||||||
|
if ( isWindows() ) {
|
||||||
|
try {
|
||||||
|
if (isPrivate(path)) {
|
||||||
|
return BlobAccess.PRIVATE;
|
||||||
|
} else {
|
||||||
|
return BlobAccess.PUBLIC_READ;
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
Set<PosixFilePermission> permissions;
|
Set<PosixFilePermission> permissions;
|
||||||
try {
|
try {
|
||||||
permissions = getPosixFilePermissions(path);
|
permissions = getPosixFilePermissions(path);
|
||||||
|
@ -489,10 +530,22 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy {
|
||||||
return permissions.contains(PosixFilePermission.OTHERS_READ)
|
return permissions.contains(PosixFilePermission.OTHERS_READ)
|
||||||
? BlobAccess.PUBLIC_READ : BlobAccess.PRIVATE;
|
? BlobAccess.PUBLIC_READ : BlobAccess.PRIVATE;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setBlobAccess(String container, String name, BlobAccess access) {
|
public void setBlobAccess(String container, String name, BlobAccess access) {
|
||||||
Path path = new File(buildPathStartingFromBaseDir(container, name)).toPath();
|
Path path = new File(buildPathStartingFromBaseDir(container, name)).toPath();
|
||||||
|
if ( isWindows() ) {
|
||||||
|
try {
|
||||||
|
if (access == BlobAccess.PRIVATE) {
|
||||||
|
setPrivate(path);
|
||||||
|
} else {
|
||||||
|
setPublic(path);
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
Set<PosixFilePermission> permissions;
|
Set<PosixFilePermission> permissions;
|
||||||
try {
|
try {
|
||||||
permissions = getPosixFilePermissions(path);
|
permissions = getPosixFilePermissions(path);
|
||||||
|
@ -506,6 +559,7 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy {
|
||||||
throw Throwables.propagate(ioe);
|
throw Throwables.propagate(ioe);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Location getLocation(final String containerName) {
|
public Location getLocation(final String containerName) {
|
||||||
|
|
|
@ -16,9 +16,19 @@
|
||||||
*/
|
*/
|
||||||
package org.jclouds.filesystem.util;
|
package org.jclouds.filesystem.util;
|
||||||
|
|
||||||
|
import static java.nio.file.FileSystems.getDefault;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.attribute.AclEntry;
|
||||||
|
import java.nio.file.attribute.AclEntryPermission;
|
||||||
|
import java.nio.file.attribute.AclEntryType;
|
||||||
|
import java.nio.file.attribute.AclFileAttributeView;
|
||||||
|
import java.nio.file.attribute.UserPrincipal;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utilities for the filesystem blobstore.
|
* Utilities for the filesystem blobstore.
|
||||||
|
@ -41,4 +51,64 @@ public class Utils {
|
||||||
}
|
}
|
||||||
Files.delete(file.toPath());
|
Files.delete(file.toPath());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine if Java is running on a windows OS
|
||||||
|
*/
|
||||||
|
public static boolean isWindows() {
|
||||||
|
return System.getProperty("os.name", "").toLowerCase().contains("windows");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param path The path to a Windows file or directory.
|
||||||
|
* @return true if path has permissions set to Everyone on windows. The exact permissions are not checked.
|
||||||
|
*/
|
||||||
|
public static boolean isPrivate(Path path) throws IOException {
|
||||||
|
UserPrincipal everyone = getDefault().getUserPrincipalLookupService()
|
||||||
|
.lookupPrincipalByName("Everyone");
|
||||||
|
AclFileAttributeView aclFileAttributes = java.nio.file.Files.getFileAttributeView(
|
||||||
|
path, AclFileAttributeView.class);
|
||||||
|
for (AclEntry aclEntry : aclFileAttributes.getAcl()) {
|
||||||
|
if (aclEntry.principal().equals(everyone)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param path Remove "Everyone" from this path's Windows ACL permissions.
|
||||||
|
*/
|
||||||
|
public static void setPrivate(Path path) throws IOException {
|
||||||
|
UserPrincipal everyone = getDefault().getUserPrincipalLookupService()
|
||||||
|
.lookupPrincipalByName("Everyone");
|
||||||
|
AclFileAttributeView aclFileAttributes = java.nio.file.Files.getFileAttributeView(
|
||||||
|
path, AclFileAttributeView.class);
|
||||||
|
CopyOnWriteArrayList<AclEntry> aclList = new CopyOnWriteArrayList(aclFileAttributes.getAcl());
|
||||||
|
for (AclEntry aclEntry : aclList) {
|
||||||
|
if (aclEntry.principal().equals(everyone) && aclEntry.type().equals(AclEntryType.ALLOW)) {
|
||||||
|
aclList.remove(aclEntry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
aclFileAttributes.setAcl(aclList);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param path Add "Everyone" with read enabled to this path's Windows ACL permissions.
|
||||||
|
*/
|
||||||
|
public static void setPublic(Path path) throws IOException {
|
||||||
|
UserPrincipal everyone = getDefault().getUserPrincipalLookupService()
|
||||||
|
.lookupPrincipalByName("Everyone");
|
||||||
|
AclFileAttributeView aclFileAttributes = java.nio.file.Files.getFileAttributeView(
|
||||||
|
path, AclFileAttributeView.class);
|
||||||
|
List<AclEntry> list = aclFileAttributes.getAcl();
|
||||||
|
list.add(AclEntry.newBuilder().setPrincipal(everyone).setPermissions(
|
||||||
|
AclEntryPermission.READ_DATA,
|
||||||
|
AclEntryPermission.READ_ACL,
|
||||||
|
AclEntryPermission.READ_ATTRIBUTES,
|
||||||
|
AclEntryPermission.READ_NAMED_ATTRS)
|
||||||
|
.setType(AclEntryType.ALLOW)
|
||||||
|
.build());
|
||||||
|
aclFileAttributes.setAcl(list);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue