diff --git a/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java b/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java index b8b2a69f8ab13e1c6ad3c8eaae1f67c0fea125e7..f9f1227956436748ecffdb8293f505ff5f39bd06 100644 --- a/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java +++ b/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java @@ -48,8 +48,8 @@ public class ApplicationPermissionEvaluator implements PermissionEvaluator { private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationPermissionEvaluator.class); - @Value("${security.adminaccount}") - private String adminaccount; + @Value("${security.admin-accounts}") + private String adminAccounts; @Autowired private IDatabaseDao dao; @@ -99,7 +99,7 @@ public class ApplicationPermissionEvaluator implements PermissionEvaluator { "motd".equals(targetType) && permission.equals("admin") ) { - String[] splittedNames = adminaccount.split(","); + String[] splittedNames = adminAccounts.split(","); if (Arrays.asList(splittedNames).contains(username)) { return true; } diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java index 803206a8e72f393e874b81858600539469c9c016..aa4be5e5619dff32c8f3c445e8b6b234ebc65e43 100644 --- a/src/main/java/de/thm/arsnova/services/UserService.java +++ b/src/main/java/de/thm/arsnova/services/UserService.java @@ -134,8 +134,8 @@ public class UserService implements IUserService { @Value("${security.authentication.login-try-limit}") private int loginTryLimit; - @Value("${security.adminaccount}") - private String adminaccount; + @Value("${security.admin-accounts}") + private String adminAccounts; private Pattern mailPattern; private BytesKeyGenerator keygen; @@ -191,7 +191,7 @@ public class UserService implements IUserService { } } - String[] splittedNames = adminaccount.split(","); + String[] splittedNames = adminAccounts.split(","); user.setAdmin(Arrays.asList(splittedNames).contains(user.getUsername())); if (user == null || user.getUsername().equals("anonymous")) { diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example index f84a81bdf538d4a79ddb176a463d6fdac962c398..450ab14d81130b3dab1e04b69404ebb19c592140 100644 --- a/src/main/resources/arsnova.properties.example +++ b/src/main/resources/arsnova.properties.example @@ -24,8 +24,10 @@ security.storepass=arsnova socketio.ip=0.0.0.0 socketio.port=10443 -# admin account -security.adminaccount= +# Admin accounts +# Usernames of the accounts which are allowed to manage global messages of the +# day. Multiple accounts are separated by commas. +security.admin-accounts= ################################################################################ diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example index 5c418583d93828e765366b48816946f7d28728d7..450ab14d81130b3dab1e04b69404ebb19c592140 100644 --- a/src/test/resources/arsnova.properties.example +++ b/src/test/resources/arsnova.properties.example @@ -24,8 +24,11 @@ security.storepass=arsnova socketio.ip=0.0.0.0 socketio.port=10443 -# admin account -security.adminaccount=username +# Admin accounts +# Usernames of the accounts which are allowed to manage global messages of the +# day. Multiple accounts are separated by commas. +security.admin-accounts= + ################################################################################ # Database