diff --git a/src/main/java/org/ultramine/permission/YamlBasedContainer.java b/src/main/java/org/ultramine/permission/YamlBasedContainer.java index f9a8e03..c5fdbeb 100644 --- a/src/main/java/org/ultramine/permission/YamlBasedContainer.java +++ b/src/main/java/org/ultramine/permission/YamlBasedContainer.java @@ -1,6 +1,5 @@ package org.ultramine.permission; -import org.apache.commons.io.FilenameUtils; import org.ultramine.server.util.YamlConfigProvider; import java.io.File; @@ -11,25 +10,15 @@ public class YamlBasedContainer extends UserContainer { - private static final String DP_PREFIX = "yaml-dp."; - private File config; private PermissionRepository repository; private GroupPermission defaultPermissions; - private PermissionHolder defaultUser; public YamlBasedContainer(PermissionRepository permissionRepository, File config) { this.config = config; this.repository = permissionRepository; - - String name = FilenameUtils.getBaseName(config.getName()).toLowerCase(); - defaultPermissions = new GroupPermission(DP_PREFIX + name); - defaultPermissions.setMeta("description", "Default permissions for " + name); - - defaultUser = new PermissionHolder(); - defaultUser.addPermission(defaultPermissions); - repository.registerPermission(defaultPermissions); + this.defaultPermissions = new GroupPermission(""); reload(); } @@ -94,7 +83,7 @@ PermissionResolver.CheckResult result = super.check(userName, permissionKey); if (result == PermissionResolver.CheckResult.UNRESOLVED) - result = defaultUser.getPermissions().check(permissionKey); + result = defaultPermissions.getPermissions().check(permissionKey); return result; } diff --git a/src/test/groovy/org/ultramine/permission/YamlBasedContainerTest.groovy b/src/test/groovy/org/ultramine/permission/YamlBasedContainerTest.groovy index 471a513..b2b8cb6 100644 --- a/src/test/groovy/org/ultramine/permission/YamlBasedContainerTest.groovy +++ b/src/test/groovy/org/ultramine/permission/YamlBasedContainerTest.groovy @@ -98,7 +98,7 @@ """ when: "Try to load this config" - def anotherContainer = new YamlBasedContainer(new PermissionRepository(), file) + def anotherContainer = new YamlBasedContainer(repository, file) then: "Container loaded correctly" anotherContainer.checkUserPermission("test", "d1")