stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8066766: The commands in the modular images are executable by the owner only

Browse Source 
Also simplify the 'set executable' step of jspawnhelper in ImageBuilder.java

Reviewed-by: chegar, alanb
This commit is contained in:
Volker Simonis 2014-12-05 19:46:15 +01:00
parent 421fc583be
commit 2570fc5418
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jdk/make/src/classes/build/tools/module/ImageBuilder.java
View File

@ -349,21 +349,6 @@ class ImageBuilder {
return (new SimpleResolver(mods, moduleGraph)).resolve();
}
/**
* chmod ugo+x file
*/
private void setExecutable(Path file) {
try {
Set<PosixFilePermission> perms = Files.getPosixFilePermissions(file);
perms.add(PosixFilePermission.OWNER_EXECUTE);
perms.add(PosixFilePermission.GROUP_EXECUTE);
perms.add(PosixFilePermission.OTHERS_EXECUTE);
Files.setPosixFilePermissions(file, perms);
} catch (IOException ioe) {
throw new UncheckedIOException(ioe);
}
}
private void createImage() throws IOException {
Collection<String> modules = resolve(options.mods);
log.print(modules.stream().collect(Collectors.joining(" ")));
@ -377,7 +362,7 @@ class ImageBuilder {
.filter(f -> f.getFileName().equals(jspawnhelper))
.findFirst();
if (helper.isPresent())
setExecutable(helper.get());
helper.get().toFile().setExecutable(true, false);
}
private class ImageFileHelper {

2
jdk/make/src/classes/build/tools/module/ModuleArchive.java
View File

@ -194,7 +194,7 @@ public class ModuleArchive implements Archive {
case CMDS:
Path path = destFile("bin", filename);
writeEntry(in, path);
path.toFile().setExecutable(true);
path.toFile().setExecutable(true, false);
break;
case CONFIGS:
writeEntry(in, destFile("conf", filename));