infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-14 18:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

8324635: (zipfs) Regression in Files.setPosixFilePermissions called on existing MSDOS entries

Browse Source 
Reviewed-by: lancea
This commit is contained in:
Eirik Bjørsnøs 2024-02-02 21:50:13 +00:00
parent 7476e29053
commit a18b03b86f
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
View File

@ -646,6 +646,8 @@ class ZipFileSystem extends FileSystem {
}
if (perms == null) {
e.posixPerms = -1;
} else if (e.posixPerms == -1) {
e.posixPerms = ZipUtils.permsToFlags(perms);
} else {
e.posixPerms = ZipUtils.permsToFlags(perms) |
(e.posixPerms & 0xFE00); // Preserve unrelated bits

51
test/jdk/jdk/nio/zipfs/TestPosix.java
View File

@ -61,7 +61,7 @@ import static org.junit.jupiter.api.Assertions.fail;
/**
* @test
* @bug 8213031 8273935
* @bug 8213031 8273935 8324635
* @summary Test POSIX ZIP file operations.
* @modules jdk.zipfs
* jdk.jartool
@ -719,7 +719,7 @@ public class TestPosix {
}
/**
* Verify that calling Files.setPosixPermissions with the current
* Verify that calling Files.setPosixFilePermissions with the current
* permission set does not change the 'external file attributes' field.
*
* @throws IOException if an unexpected IOException occurs
@ -733,6 +733,53 @@ public class TestPosix {
});
}
/**
* Verify that calling Files.setPosixFilePermissions on an MS-DOS entry
* results in only the expected permission bits being set
*
* @throws IOException if an unexpected IOException occurs
*/
@Test
public void setPermissionsShouldConvertToUnix() throws IOException {
// The default environment creates MS-DOS entries, with zero 'external file attributes'
createEmptyZipFile(ZIP_FILE, ENV_DEFAULT);
try (FileSystem fs = FileSystems.newFileSystem(ZIP_FILE, ENV_DEFAULT)) {
Path path = fs.getPath("hello.txt");
Files.createFile(path);
}
// The CEN header is now as follows:
//
// 004A CENTRAL HEADER #1 02014B50
// 004E Created Zip Spec 14 '2.0'
// 004F Created OS 00 'MS-DOS'
// 0050 Extract Zip Spec 14 '2.0'
// 0051 Extract OS 00 'MS-DOS'
// [...]
// 0070 Ext File Attributes 00000000
// Sanity check that all 'external file attributes' bits are all zero
verifyExternalFileAttribute(Files.readAllBytes(ZIP_FILE), "0");
// Convert to a UNIX entry by calling Files.setPosixFilePermissions
try (FileSystem fs = FileSystems.newFileSystem(ZIP_FILE, ENV_POSIX)) {
Path path = fs.getPath("hello.txt");
Files.setPosixFilePermissions(path, EnumSet.of(OWNER_READ));
}
// The CEN header should now be as follows:
//
// 004A CENTRAL HEADER #1 02014B50
// 004E Created Zip Spec 14 '2.0'
// 004F Created OS 03 'Unix'
// 0050 Extract Zip Spec 14 '2.0'
// 0051 Extract OS 00 'MS-DOS'
// [...]
// 0070 Ext File Attributes 01000000
// The first of the nine trailing permission bits should be set
verifyExternalFileAttribute(Files.readAllBytes(ZIP_FILE), "100000000");
}
/**
* Verify that a non-POSIX operation such as Files.setLastModifiedTime
* does not change the 'external file attributes' field.