Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-06 12:18:34 +02:00
Code Issues Packages Projects Releases Activity

Merged in bugfix/repo_git_config_permissions (pull request #234)

Browse Source 
Fix permissions for repository git configuration
This commit is contained in:
Florian Scholdei
2019-04-11 13:46:28 +00:00
parent cde1ec8c3e 0ff1e2060c
commit 84c8f7159f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitRepositoryConfigMapper.java
View File

@@ -28,7 +28,7 @@ public abstract class GitRepositoryConfigMapper {
@AfterMapping
void appendLinks(@MappingTarget GitRepositoryConfigDto target, @Context Repository repository) {
Links.Builder linksBuilder = linkingTo().self(self());
if (RepositoryPermissions.modify(repository).isPermitted()) {
if (RepositoryPermissions.custom("git", repository).isPermitted()) {
linksBuilder.single(link("update", update()));
}
target.add(linksBuilder.build());

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitRepositoryConfigResource.java
View File

@@ -70,7 +70,7 @@ public class GitRepositoryConfigResource {
})
public Response setRepositoryConfig(@PathParam("namespace") String namespace, @PathParam("name") String name, GitRepositoryConfigDto dto) {
Repository repository = getRepository(namespace, name);
RepositoryPermissions.modify(repository).check();
RepositoryPermissions.custom("git", repository).check();
ConfigurationStore<GitRepositoryConfig> repositoryConfigStore = getStore(repository);
GitRepositoryConfig config = repositoryConfigMapper.map(dto);
repositoryConfigStore.set(config);

2
scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/configuration/shiro.ini
View File

@@ -10,4 +10,4 @@ writer = configuration:write:git
readerWriter = configuration:*:git,repository:*:id
admin = *
repoRead = repository:read:*
repoWrite = repository:modify:*
repoWrite = repository:modify:*,repository:git:*