LDEV-5034 - extract permission part from mode and only use that

lucee · Aug 13, 2024 · cc16117 · cc16117
1 parent 60897bc
commit cc16117
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/core/src/main/java/lucee/commons/io/ModeUtil.java b/core/src/main/java/lucee/commons/io/ModeUtil.java
@@ -20,6 +20,9 @@
 
 import java.io.IOException;
 
+import lucee.commons.io.log.Log;
+import lucee.commons.io.log.LogUtil;
+
 public final class ModeUtil {
 
 	public static final int PERM_READ = 04;
@@ -66,6 +69,23 @@ private static int _toOctalMode(String strMode) {
 		return mode;
 	}
 
+	/**
+	 * Extracts the permission bits from the mode value. Logs a message if the file type bits are
+	 * removed and logging is enabled.
+	 * 
+	 * @param mode The mode value that includes file type and permission bits.
+	 * @param log If true, log a message if file type bits are removed.
+	 * @return The permission bits (e.g., 0700).
+	 */
+	public static int extractPermissions(int mode, boolean log) {
+		int permissionBits = mode & 07777;
+
+		if (log && (mode != permissionBits)) {
+			LogUtil.log(Log.LEVEL_WARN, "mode", "File type bits removed from mode: original=" + toStringMode(mode) + ", extracted=" + toStringMode(permissionBits));
+		}
+		return permissionBits;
+	}
+
 	/**
 	 * translate an octal mode value (73) to a string representation ("111")
 	 * 

diff --git a/core/src/main/java/lucee/commons/io/compress/CompressUtil.java b/core/src/main/java/lucee/commons/io/compress/CompressUtil.java
@@ -40,6 +40,7 @@
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
 
 import lucee.commons.io.IOUtil;
+import lucee.commons.io.ModeUtil;
 import lucee.commons.io.SystemUtil;
 import lucee.commons.io.res.Resource;
 import lucee.commons.io.res.ResourceProvider;
@@ -221,7 +222,9 @@ private static void extractTar(Resource tarFile, Resource targetDir) throws IOEx
 				}
 				target.setLastModified(entry.getModTime().getTime());
 				mode = entry.getMode();
-				if (mode > 0) target.setMode(mode);
+				if (mode > 0) {
+					target.setMode(ModeUtil.extractPermissions(mode, false));
+				}
 				// tis.closeEntry() ;
 			}
 		}

diff --git a/core/src/main/java/lucee/commons/io/res/type/file/FileResource.java b/core/src/main/java/lucee/commons/io/res/type/file/FileResource.java
@@ -439,8 +439,9 @@ public static int getMode(Path path) {
 
 	@Override
 	public void setMode(int mode) throws IOException {
-		// TODO unter windows mit setReadable usw.
+		// TODO for windows do it with help of NIO functions
 		if (!SystemUtil.isUnix()) return;
+		mode = ModeUtil.extractPermissions(mode, true); // we only need the permission part
 		provider.lock(this);
 		try {
 			// print.ln(ModeUtil.toStringMode(mode));

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.1.1.58-SNAPSHOT"/>
+  <property name="version" value="6.1.1.59-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.1.1.58-SNAPSHOT</version>
+  <version>6.1.1.59-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>