Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Defines a new permission for unlocking files #1924

Merged
merged 3 commits into from
Jan 19, 2024
Merged

Defines a new permission for unlocking files #1924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94b6916
Defines a new permission to unlock files
idlira Jan 19, 2024
08253cc
Permits sys admins to unlock files by default
idlira Jan 19, 2024
61d1663
Checks new permission where unlock actions are triggered
idlira Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/sirius/biz/storage/layer3/VirtualFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
@Register(classes = VirtualFileSystem.class)
public class VirtualFileSystem {

/**
* Contains the permission required to unlock files.
*/
public static final String PERMISSION_UNLOCK_FILES = "permission-unlock-files";

/**
* Defines the name of the sub scope used by the {@link sirius.biz.storage.layer3.downlink.ftp.FTPServer} and
* {@link sirius.biz.storage.layer3.downlink.ssh.SSHServer} which grants access per FTP, SFTP or SCP.
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/sirius/biz/storage/layer3/VirtualFileSystemController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import io.netty.handler.codec.http.HttpHeaderNames;
import sirius.biz.storage.layer2.Blob;
import sirius.biz.tenants.TenantUserManager;
import sirius.biz.tycho.QuickAction;
import sirius.biz.tycho.UserAssistant;
import sirius.biz.web.BizController;
Expand Down Expand Up @@ -324,7 +323,7 @@ public void move(WebContext webContext) {
*/
@LoginRequired
@Routed("/fs/unlock")
@Permission(TenantUserManager.PERMISSION_SYSTEM_ADMINISTRATOR)
@Permission(VirtualFileSystem.PERMISSION_UNLOCK_FILES)
public void unlock(WebContext webContext) {
VirtualFile file = vfs.resolve(webContext.get("path").asString());
if (!file.exists()) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/component-070-biz.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,7 @@ security {
permission-view-files : "Required to view files stored in the system"
permission-view-processes : "Required to view processes"
permission-view-audit-log : "Required to view the audit log"
permission-unlock-files : "Required to unlock read-only files"

feature-bypass-process-log-limits : "Required to bypass log limits of processes via a job parameter"

Expand Down Expand Up @@ -1485,6 +1486,7 @@ security {
permission-delete-user-accounts = true
permission-control-disaster-mode = true
permission-system-scripting = true
permission-unlock-files = true

# By default we only permit sys admins to change the configs of any user in any
# tenant as this is quite a specific and dangerous task...
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/default/templates/biz/storage/list.html.pasta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
</t:dropdownSection>
</i:if>

<t:permission permission="flag-system-administrator">
<t:permission permission="permission-unlock-files">
<i:if test="child.readOnly()">
<t:dropdownItem
url="@apply('/fs/unlock?path=%s', urlEncode(child.path()))"
Expand Down