[MASSEMBLY-791] - overrideUmask option to ensure permissions in packa…

…ged archive match expected ones.
apache · Jul 5, 2023 · 583c538 · 583c538
1 parent d607c75
commit 583c538
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 0 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java b/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
@@ -223,4 +223,12 @@ public interface AssemblerConfigurationSource {
      * @return Override group name.
      */
     String getOverrideGroupName();
+
+    /**
+     * @return Mask which is applied to permissions of files/directories before they are put into assembly.
+     * If {@code null} then the mask is not explicitly configured and remains implementation-specific.
+     */
+    default Integer getOverrideUmask() {
+        return null;
+    }
 }
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
@@ -347,6 +347,10 @@ protected Archiver createArchiver(
         if (StringUtils.isNotBlank(configSource.getOverrideGroupName())) {
             archiver.setOverrideGroupName(StringUtils.trim(configSource.getOverrideGroupName()));
         }
+        final Integer overrideUmask = configSource.getOverrideUmask();
+        if (overrideUmask != null) {
+            archiver.setUmask(overrideUmask);
+        }
 
         return archiver;
     }

diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
@@ -430,6 +430,13 @@ public abstract class AbstractAssemblyMojo extends AbstractMojo implements Assem
     @Parameter
     private String overrideGroupName;
 
+    /**
+     * Override of mask which is applied to permissions of files/directories before they are put into assembly.
+     * If {@code null} then the mask is not explicitly configured and remains implementation-specific.
+     */
+    @Parameter
+    private Integer overrideUmask;
+
     public static FixedStringSearchInterpolator mainProjectInterpolator(MavenProject mainProject) {
         if (mainProject != null) {
             // 5
@@ -879,4 +886,9 @@ public Integer getOverrideGid() {
     public String getOverrideGroupName() {
         return this.overrideGroupName;
     }
+
+    @Override
+    public Integer getOverrideUmask() {
+        return this.overrideUmask;
+    }
 }
diff --git a/src/test/java/org/apache/maven/plugins/assembly/testutils/PojoConfigSource.java b/src/test/java/org/apache/maven/plugins/assembly/testutils/PojoConfigSource.java
@@ -451,4 +451,9 @@ public Integer getOverrideGid() {
     public String getOverrideGroupName() {
         return "root";
     }
+
+    @Override
+    public Integer getOverrideUmask() {
+        return null;
+    }
 }