Skip to content

Commit 1eaa076

Browse files
authored
Merge pull request #4695 from line-o/fix/permissions-on-install
[fix] permissions on install
2 parents 481a1d6 + ea72991 commit 1eaa076

File tree

3 files changed

+186
-108
lines changed

3 files changed

+186
-108
lines changed

exist-core/src/main/java/org/exist/repo/Deployment.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@
3030
import org.exist.collections.triggers.TriggerException;
3131
import org.exist.dom.QName;
3232
import org.exist.dom.memtree.*;
33-
import org.exist.security.Permission;
34-
import org.exist.security.PermissionDeniedException;
35-
import org.exist.security.PermissionFactory;
36-
import org.exist.security.UnixStylePermission;
33+
import org.exist.security.*;
3734
import org.exist.security.internal.aider.GroupAider;
3835
import org.exist.security.internal.aider.UserAider;
3936
import org.exist.source.FileSource;
@@ -875,7 +872,7 @@ private void setPermissions(final DBBroker broker, final Optional<RequestedPerms
875872
}
876873

877874
if (isCollection || (mime != null && mime.getName().equals(MimeType.XQUERY_TYPE.getName()))) {
878-
mode = mode | 0111; //TODO(AR) Whoever did this - this is a really bad idea. You are circumventing the security of the system
875+
mode = AbstractUnixStylePermission.safeSetExecutable(mode);
879876
}
880877

881878
PermissionFactory.chmod(broker, permission, Optional.of(mode), Optional.empty());

0 commit comments

Comments
 (0)