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

Migrate creationDate and lastModified

Browse Source
This commit is contained in:
René Pfeuffer
2019-05-31 15:57:30 +02:00
parent 9a18facbf5
commit a91177a2d7
3 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package sonia.scm.user.update;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.SCMContextProvider; import sonia.scm.SCMContextProvider;
import sonia.scm.migration.UpdateException;
import sonia.scm.migration.UpdateStep; import sonia.scm.migration.UpdateStep;
import sonia.scm.plugin.Extension; import sonia.scm.plugin.Extension;
import sonia.scm.security.AssignedPermission; import sonia.scm.security.AssignedPermission;
@@ -22,9 +23,15 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import static java.util.Optional.empty;
import static java.util.Optional.of;
import static sonia.scm.version.Version.parse; import static sonia.scm.version.Version.parse;
@Extension @Extension
@@ -45,11 +52,12 @@ public class XmlUserV1UpdateStep implements UpdateStep {
@Override @Override
public void doUpdate() throws JAXBException { public void doUpdate() throws JAXBException {
if (!determineV1File().exists()) { Optional<Path> v1UsersFile = determineV1File();
if (!v1UsersFile.isPresent()) {
LOG.info("no v1 file for users found");
return; return;
} }
JAXBContext jaxbContext = JAXBContext.newInstance(XmlUserV1UpdateStep.V1UserDatabase.class); XmlUserV1UpdateStep.V1UserDatabase v1Database = readV1Database(v1UsersFile.get());
XmlUserV1UpdateStep.V1UserDatabase v1Database = readV1Database(jaxbContext);
ConfigurationEntryStore<AssignedPermission> securityStore = createSecurityStore(); ConfigurationEntryStore<AssignedPermission> securityStore = createSecurityStore();
v1Database.userList.users.forEach(user -> update(user, securityStore)); v1Database.userList.users.forEach(user -> update(user, securityStore));
} }
@@ -65,6 +73,7 @@ public class XmlUserV1UpdateStep implements UpdateStep {
} }
private void update(XmlUserV1UpdateStep.V1User v1User, ConfigurationEntryStore<AssignedPermission> securityStore) { private void update(XmlUserV1UpdateStep.V1User v1User, ConfigurationEntryStore<AssignedPermission> securityStore) {
LOG.debug("updating user {}", v1User.name);
User user = new User( User user = new User(
v1User.name, v1User.name,
v1User.displayName, v1User.displayName,
@@ -72,29 +81,39 @@ public class XmlUserV1UpdateStep implements UpdateStep {
v1User.password, v1User.password,
v1User.type, v1User.type,
v1User.active); v1User.active);
user.setCreationDate(v1User.creationDate);
user.setLastModified(v1User.lastModified);
userDAO.add(user); userDAO.add(user);
if (v1User.admin) { if (v1User.admin) {
LOG.debug("setting admin permissions for user {}", v1User.name);
securityStore.put(new AssignedPermission(v1User.name, "*")); securityStore.put(new AssignedPermission(v1User.name, "*"));
} }
} }
private XmlUserV1UpdateStep.V1UserDatabase readV1Database(JAXBContext jaxbContext) throws JAXBException { private XmlUserV1UpdateStep.V1UserDatabase readV1Database(Path v1UsersFile) throws JAXBException {
return (XmlUserV1UpdateStep.V1UserDatabase) jaxbContext.createUnmarshaller().unmarshal(determineV1File()); JAXBContext jaxbContext = JAXBContext.newInstance(XmlUserV1UpdateStep.V1UserDatabase.class);
return (XmlUserV1UpdateStep.V1UserDatabase) jaxbContext.createUnmarshaller().unmarshal(v1UsersFile.toFile());
} }
private ConfigurationEntryStore<AssignedPermission> createSecurityStore() { private ConfigurationEntryStore<AssignedPermission> createSecurityStore() {
return configurationEntryStoreFactory.withType(AssignedPermission.class).withName("security").build(); return configurationEntryStoreFactory.withType(AssignedPermission.class).withName("security").build();
} }
private File determineV1File() { private Optional<Path> determineV1File() {
File configDirectory = new File(contextProvider.getBaseDirectory(), StoreConstants.CONFIG_DIRECTORY_NAME); Path configDirectory = new File(contextProvider.getBaseDirectory(), StoreConstants.CONFIG_DIRECTORY_NAME).toPath();
for (File file : configDirectory.listFiles()) { Path existingUsersFile = configDirectory.resolve("users" + StoreConstants.FILE_EXTENSION);
if (file.getName().equals("users" + StoreConstants.FILE_EXTENSION)) { Path usersV1File = configDirectory.resolve("usersV1" + StoreConstants.FILE_EXTENSION);
file.renameTo(new File(configDirectory + "/usersV1" + StoreConstants.FILE_EXTENSION)); if (existingUsersFile.toFile().exists()) {
try {
Files.move(existingUsersFile, usersV1File);
} catch (IOException e) {
throw new UpdateException("could not move old users file to " + usersV1File.toAbsolutePath());
} }
LOG.info("moved old users file to {}", usersV1File.toAbsolutePath());
return of(usersV1File);
} }
return new File(configDirectory, "usersV1" + StoreConstants.FILE_EXTENSION); return empty();
} }
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)

9
scm-webapp/src/test/java/sonia/scm/user/update/XmlUserV1UpdateStepTest.java
View File

@@ -97,7 +97,14 @@ class XmlUserV1UpdateStepTest {
.hasFieldOrPropertyWithValue("displayName", "SCM Administrator") .hasFieldOrPropertyWithValue("displayName", "SCM Administrator")
.hasFieldOrPropertyWithValue("active", false) .hasFieldOrPropertyWithValue("active", false)
.hasFieldOrPropertyWithValue("password", "ff8f5c593a01f9fcd3ed48b09a4b013e8d8f3be7") .hasFieldOrPropertyWithValue("password", "ff8f5c593a01f9fcd3ed48b09a4b013e8d8f3be7")
.hasFieldOrPropertyWithValue("type", "xml"); .hasFieldOrPropertyWithValue("type", "xml")
.hasFieldOrPropertyWithValue("lastModified", 1558597367492L)
.hasFieldOrPropertyWithValue("creationDate", 1558597074732L);
} }
} }
@Test
void shouldNotFailForMissingConfigDir() throws JAXBException {
updateStep.doUpdate();
}
} }

1
scm-webapp/src/test/resources/sonia/scm/user/update/users.xml
View File

@@ -7,6 +7,7 @@
<properties/> <properties/>
<admin>true</admin> <admin>true</admin>
<creationDate>1558597074732</creationDate> <creationDate>1558597074732</creationDate>
<lastModified>1558597367492</lastModified>
<displayName>SCM Administrator</displayName> <displayName>SCM Administrator</displayName>
<mail>scm-admin@scm-manager.com</mail> <mail>scm-admin@scm-manager.com</mail>
<name>scmadmin</name> <name>scmadmin</name>