Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 09:25:43 +01:00
Code Issues Packages Projects Releases Activity

Move migration of admin flags to own update step

Browse Source
This commit is contained in:
René Pfeuffer
2019-06-03 11:38:42 +02:00
parent 218937be19
commit a970404717
8 changed files with 210 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
scm-webapp/src/main/java/sonia/scm/user/update/XmlUserV1UpdateStep.java
View File

@@ -25,16 +25,12 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import static java.util.Collections.emptyList;
import static java.util.Optional.empty;
import static java.util.Optional.of;
import static java.util.Optional.ofNullable;
import static sonia.scm.version.Version.parse;
@Extension
@@ -60,30 +56,9 @@ public class XmlUserV1UpdateStep implements UpdateStep {
LOG.info("no v1 file for users found");
return;
}
Collection<String> adminUsers = determineAdminUsers();
LOG.debug("found the following admin users from global config: {}", adminUsers);
XmlUserV1UpdateStep.V1UserDatabase v1Database = readV1Database(v1UsersFile.get());
ConfigurationEntryStore<AssignedPermission> securityStore = createSecurityStore();
v1Database.userList.users.forEach(user -> update(user, adminUsers, securityStore));
}
private Collection<String> determineAdminUsers() throws JAXBException {
Path configDirectory = determineConfigDirectory();
Path existingConfigFile = configDirectory.resolve("config" + StoreConstants.FILE_EXTENSION);
if (existingConfigFile.toFile().exists()) {
return extractAdminUsersFromConfigFile(existingConfigFile);
} else {
return emptyList();
}
}
private Collection<String> extractAdminUsersFromConfigFile(Path existingConfigFile) throws JAXBException {
JAXBContext jaxbContext = JAXBContext.newInstance(XmlUserV1UpdateStep.V1Configuration.class);
V1Configuration v1Configuration = (V1Configuration) jaxbContext.createUnmarshaller().unmarshal(existingConfigFile.toFile());
return ofNullable(v1Configuration.adminUsers)
.map(userList -> userList.split(","))
.map(Arrays::asList)
.orElse(emptyList());
v1Database.userList.users.forEach(user -> update(user, securityStore));
}
@Override
@@ -96,7 +71,7 @@ public class XmlUserV1UpdateStep implements UpdateStep {
return "sonia.scm.user.xml";
}
private void update(V1User v1User, Collection<String> adminUsers, ConfigurationEntryStore<AssignedPermission> securityStore) {
private void update(V1User v1User, ConfigurationEntryStore<AssignedPermission> securityStore) {
LOG.debug("updating user {}", v1User.name);
User user = new User(
v1User.name,
@@ -109,7 +84,7 @@ public class XmlUserV1UpdateStep implements UpdateStep {
user.setLastModified(v1User.lastModified);
userDAO.add(user);
if (v1User.admin || adminUsers.contains(v1User.name)) {
if (v1User.admin) {
LOG.debug("setting admin permissions for user {}", v1User.name);
securityStore.put(new AssignedPermission(v1User.name, "*"));
}
@@ -174,13 +149,6 @@ public class XmlUserV1UpdateStep implements UpdateStep {
}
}
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "scm-config")
private static class V1Configuration {
@XmlElement(name = "admin-users")
private String adminUsers;
}
private static class UserList {
@XmlElement(name = "user")
private List<V1User> users;