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

Join repository roles from the system and from the database

Browse Source
This commit is contained in:
René Pfeuffer
2019-05-03 14:47:49 +02:00
parent 232102716c
commit c0760688e9
6 changed files with 132 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryPermissionResource.java
View File

@@ -3,7 +3,7 @@ package sonia.scm.api.v2.resources;
import com.webcohesion.enunciate.metadata.rs.ResponseCode;
import com.webcohesion.enunciate.metadata.rs.StatusCodes;
import de.otto.edison.hal.Links;
import sonia.scm.security.SystemRepositoryPermissionProvider;
import sonia.scm.security.RepositoryPermissionProvider;
import sonia.scm.web.VndMediaType;
import javax.inject.Inject;
@@ -19,11 +19,11 @@ public class RepositoryPermissionResource {
static final String PATH = "v2/repositoryPermissions/";
private final SystemRepositoryPermissionProvider repositoryPermissionProvider;
private final RepositoryPermissionProvider repositoryPermissionProvider;
private final ResourceLinks resourceLinks;
@Inject
public RepositoryPermissionResource(SystemRepositoryPermissionProvider repositoryPermissionProvider, ResourceLinks resourceLinks) {
public RepositoryPermissionResource(RepositoryPermissionProvider repositoryPermissionProvider, ResourceLinks resourceLinks) {
this.repositoryPermissionProvider = repositoryPermissionProvider;
this.resourceLinks = resourceLinks;
}

60
scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissionProvider.java Normal file
View File

@@ -0,0 +1,60 @@
package sonia.scm.security;
import com.google.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.plugin.PluginLoader;
import sonia.scm.repository.RepositoryRole;
import sonia.scm.repository.RepositoryRoleDAO;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.IOException;
import java.net.URL;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import static java.util.Collections.unmodifiableCollection;
public class RepositoryPermissionProvider {
private final SystemRepositoryPermissionProvider systemRepositoryPermissionProvider;
private final RepositoryRoleDAO repositoryRoleDAO;
@Inject
public RepositoryPermissionProvider(SystemRepositoryPermissionProvider systemRepositoryPermissionProvider, RepositoryRoleDAO repositoryRoleDAO) {
this.systemRepositoryPermissionProvider = systemRepositoryPermissionProvider;
this.repositoryRoleDAO = repositoryRoleDAO;
}
public Collection<String> availableVerbs() {
return systemRepositoryPermissionProvider.availableVerbs();
}
public Collection<RepositoryRole> availableRoles() {
List<RepositoryRole> customRoles = repositoryRoleDAO.getAll();
List<RepositoryRole> availableSystemRoles = systemRepositoryPermissionProvider.availableRoles();
return new AbstractList<RepositoryRole>() {
@Override
public RepositoryRole get(int index) {
return index < availableSystemRoles.size()? availableSystemRoles.get(index): customRoles.get(index - availableSystemRoles.size());
}
@Override
public int size() {
return availableSystemRoles.size() + customRoles.size();
}
};
}
}

14
scm-webapp/src/main/java/sonia/scm/security/SystemRepositoryPermissionProvider.java
View File

@@ -26,25 +26,25 @@ import java.util.stream.Collectors;
import static java.util.Collections.unmodifiableCollection;
import static java.util.Collections.unmodifiableList;
public class SystemRepositoryPermissionProvider {
class SystemRepositoryPermissionProvider {
private static final Logger logger = LoggerFactory.getLogger(SystemRepositoryPermissionProvider.class);
private static final String REPOSITORY_PERMISSION_DESCRIPTOR = "META-INF/scm/repository-permissions.xml";
private final Collection<String> availableVerbs;
private final Collection<RepositoryRole> availableRoles;
private final List<String> availableVerbs;
private final List<RepositoryRole> availableRoles;
@Inject
public SystemRepositoryPermissionProvider(PluginLoader pluginLoader) {
AvailableRepositoryPermissions availablePermissions = readAvailablePermissions(pluginLoader);
this.availableVerbs = unmodifiableCollection(new LinkedHashSet<>(availablePermissions.availableVerbs));
this.availableRoles = unmodifiableList(new LinkedHashSet<>(availablePermissions.availableRoles.stream().map(r -> new RepositoryRole(r.name, r.verbs.verbs, "system")).collect(Collectors.toList())));
this.availableVerbs = unmodifiableList(new ArrayList<>(availablePermissions.availableVerbs));
this.availableRoles = unmodifiableList(new ArrayList<>(availablePermissions.availableRoles.stream().map(r -> new RepositoryRole(r.name, r.verbs.verbs, "system")).collect(Collectors.toList())));
}
public Collection<String> availableVerbs() {
public List<String> availableVerbs() {
return availableVerbs;
}
public Collection<RepositoryRole> availableRoles() {
public List<RepositoryRole> availableRoles() {
return availableRoles;
}