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

Preserve permissions in directory producer #182

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Preserve permissions in directory producer #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc3e224
In most simple usage of the task you will want to preserve file permi…
corecanarias Sep 3, 2014
70fc925
remove println
corecanarias Sep 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/vafer/jdeb/mapping/PermMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public TarArchiveEntry map( final TarArchiveEntry entry ) {
} else {
newEntry.setGroupName(entry.getGroupName());
}

// Set permissions
if (newEntry.isDirectory()) {
if (dirMode > -1) {
Expand Down
196 changes: 126 additions & 70 deletions src/main/java/org/vafer/jdeb/producers/DataProducerDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@
import java.io.File;
import java.io.FileInputStream;
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.util.HashMap;
import java.util.Map;
import java.util.Set;

import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.tools.ant.DirectoryScanner;
Expand All @@ -28,75 +34,125 @@
import org.vafer.jdeb.utils.Utils;

/**
* DataProducer iterating over a directory.
* For cross-platform permissions and ownerships you probably want to use a Mapper, too.
* DataProducer iterating over a directory. For cross-platform permissions and
* ownerships you probably want to use a Mapper, too.
*
* @author Torsten Curdt
*/
public final class DataProducerDirectory extends AbstractDataProducer implements DataProducer {

private final DirectoryScanner scanner = new DirectoryScanner();

public DataProducerDirectory( final File pDir, final String[] pIncludes, final String[] pExcludes, final Mapper[] pMappers ) {
super(pIncludes, pExcludes, pMappers);
scanner.setBasedir(pDir);
scanner.setIncludes(pIncludes);
scanner.setExcludes(pExcludes);
scanner.setCaseSensitive(true);
scanner.setFollowSymlinks(true);
}

public void produce( final DataConsumer pReceiver ) throws IOException {

scanner.scan();

final File baseDir = scanner.getBasedir();

for (String dir : scanner.getIncludedDirectories()) {
final File file = new File(baseDir, dir);
String dirname = getFilename(baseDir, file);

if ("".equals(dirname)) {
continue;
}

if ('/' != File.separatorChar) {
dirname = dirname.replace(File.separatorChar, '/');
}

if (!isIncluded(dirname)) {
continue;
}

if (!dirname.endsWith("/")) {
dirname += "/";
}

produceDir(pReceiver, dirname);
}


for (String f : scanner.getIncludedFiles()) {
final File file = new File(baseDir, f);
String filename = getFilename(baseDir, file);

if ('/' != File.separatorChar) {
filename = filename.replace(File.separatorChar, '/');
}

if (!isIncluded(filename)) {
continue;
}

produceFile(pReceiver, file, filename);
}
}

private String getFilename( File root, File file ) {

final String relativeFilename = file.getAbsolutePath().substring(root.getAbsolutePath().length());

return Utils.stripLeadingSlash(relativeFilename);
}

}
public final class DataProducerDirectory extends AbstractDataProducer implements
DataProducer {
public static final Map<String, Integer> ORDINAL_MASK = new HashMap<String, Integer>();
static {
ORDINAL_MASK.put("OTHERS_READ", 4);
ORDINAL_MASK.put("OTHERS_WRITE", 2);
ORDINAL_MASK.put("OTHERS_EXECUTE", 1);
ORDINAL_MASK.put("GROUP_READ", 32);
ORDINAL_MASK.put("GROUP_WRITE", 16);
ORDINAL_MASK.put("GROUP_EXECUTE", 8);
ORDINAL_MASK.put("OWNER_READ", 256);
ORDINAL_MASK.put("OWNER_WRITE", 128);
ORDINAL_MASK.put("OWNER_EXECUTE", 64);
}
private final DirectoryScanner scanner = new DirectoryScanner();

public DataProducerDirectory(final File pDir, final String[] pIncludes,
final String[] pExcludes, final Mapper[] pMappers) {
super(pIncludes, pExcludes, pMappers);
scanner.setBasedir(pDir);
scanner.setIncludes(pIncludes);
scanner.setExcludes(pExcludes);
scanner.setCaseSensitive(true);
scanner.setFollowSymlinks(true);
}

public void produce(final DataConsumer pReceiver) throws IOException {

scanner.scan();

final File baseDir = scanner.getBasedir();

for (String dir : scanner.getIncludedDirectories()) {
final File file = new File(baseDir, dir);
String dirname = getFilename(baseDir, file);

if ("".equals(dirname)) {
continue;
}

if ('/' != File.separatorChar) {
dirname = dirname.replace(File.separatorChar, '/');
}

if (!isIncluded(dirname)) {
continue;
}

if (!dirname.endsWith("/")) {
dirname += "/";
}

produceDir(pReceiver, dirname);
}

for (String f : scanner.getIncludedFiles()) {
final File file = new File(baseDir, f);
String filename = getFilename(baseDir, file);

if ('/' != File.separatorChar) {
filename = filename.replace(File.separatorChar, '/');
}

if (!isIncluded(filename)) {
continue;
}

produceFile(pReceiver, file, filename);
}
}

@Override
public void produceFile(final DataConsumer consumer, final File file,
final String entryName) throws IOException {
TarArchiveEntry entry = new TarArchiveEntry(entryName, true);
entry.setUserId(Producers.ROOT_UID);
entry.setUserName(Producers.ROOT_NAME);
entry.setGroupId(Producers.ROOT_UID);
entry.setGroupName(Producers.ROOT_NAME);
entry.setMode(getOrdinalPermissions(file));
entry.setSize(file.length());
entry = map(entry);
Producers.produceInputStreamWithEntry(consumer,
new FileInputStream(file), entry);
}

public static final int S_IFREG = 0100000;
public static final int S_IFDIR = 0040000;

public int getOrdinalPermissions(File file) {
try {
Path p = Paths.get(file.getAbsolutePath());
Set<PosixFilePermission> perms = Files.getPosixFilePermissions(p);
int mode = 0;
if (file.isDirectory()) {
mode |= S_IFDIR;
} else {
mode |= S_IFREG;
}
for (PosixFilePermission perm : perms) {
mode |= ORDINAL_MASK.get(perm.name());
}
return mode;
} catch (IOException e) {
throw new RuntimeException(e);
}
}

private String getFilename(File root, File file) {

final String relativeFilename = file.getAbsolutePath().substring(
root.getAbsolutePath().length());

return Utils.stripLeadingSlash(relativeFilename);
}

}