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

Keep order of permissions

Browse Source
This commit is contained in:
René Pfeuffer
2019-01-23 15:40:08 +01:00
parent f52edf4dd1
commit 42dcaec71a
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-core/src/main/java/sonia/scm/repository/RepositoryPermission.java
View File

@@ -46,7 +46,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable; import java.io.Serializable;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.LinkedHashSet;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
import static java.util.Collections.unmodifiableCollection; import static java.util.Collections.unmodifiableCollection;
@@ -79,7 +79,7 @@ public class RepositoryPermission implements PermissionObject, Serializable
public RepositoryPermission(String name, Collection<String> verbs, boolean groupPermission) public RepositoryPermission(String name, Collection<String> verbs, boolean groupPermission)
{ {
this.name = name; this.name = name;
this.verbs = unmodifiableCollection(new HashSet<>(verbs)); this.verbs = unmodifiableCollection(new LinkedHashSet<>(verbs));
this.groupPermission = groupPermission; this.groupPermission = groupPermission;
} }

6
scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissionProvider.java
View File

@@ -16,7 +16,7 @@ import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -32,8 +32,8 @@ public class RepositoryPermissionProvider {
@Inject @Inject
public RepositoryPermissionProvider(PluginLoader pluginLoader) { public RepositoryPermissionProvider(PluginLoader pluginLoader) {
AvailableRepositoryPermissions availablePermissions = readAvailablePermissions(pluginLoader); AvailableRepositoryPermissions availablePermissions = readAvailablePermissions(pluginLoader);
this.availableVerbs = unmodifiableCollection(new HashSet<>(availablePermissions.availableVerbs)); this.availableVerbs = unmodifiableCollection(new LinkedHashSet<>(availablePermissions.availableVerbs));
this.availableRoles = unmodifiableCollection(new HashSet<>(availablePermissions.availableRoles.stream().map(r -> new RepositoryRole(r.name, r.verbs.verbs)).collect(Collectors.toList()))); this.availableRoles = unmodifiableCollection(new LinkedHashSet<>(availablePermissions.availableRoles.stream().map(r -> new RepositoryRole(r.name, r.verbs.verbs)).collect(Collectors.toList())));
} }
public Collection<String> availableVerbs() { public Collection<String> availableVerbs() {

3
scm-webapp/src/main/resources/META-INF/scm/repository-permissions.xml
View File

@@ -3,12 +3,11 @@
<verb>read</verb> <verb>read</verb>
<verb>modify</verb> <verb>modify</verb>
<verb>delete</verb> <verb>delete</verb>
<verb>delete</verb>
<verb>healthCheck</verb>
<verb>pull</verb> <verb>pull</verb>
<verb>push</verb> <verb>push</verb>
<verb>permissionRead</verb> <verb>permissionRead</verb>
<verb>permissionWrite</verb> <verb>permissionWrite</verb>
<verb>healthCheck</verb>
<verb>*</verb> <verb>*</verb>
</verbs> </verbs>
<roles> <roles>