From fbdbe4956fdc33a1173a66e6fef83ff48fd9a597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 11 Apr 2019 12:09:06 +0200 Subject: [PATCH 1/3] Fix permissions for repository git configuration --- .../sonia/scm/api/v2/resources/GitRepositoryConfigMapper.java | 2 +- .../sonia/scm/api/v2/resources/GitRepositoryConfigResource.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitRepositoryConfigMapper.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitRepositoryConfigMapper.java index 6480e526b1..9fde8f7d98 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitRepositoryConfigMapper.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitRepositoryConfigMapper.java @@ -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()); diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitRepositoryConfigResource.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitRepositoryConfigResource.java index 292a934ea0..175caf8840 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitRepositoryConfigResource.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitRepositoryConfigResource.java @@ -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 repositoryConfigStore = getStore(repository); GitRepositoryConfig config = repositoryConfigMapper.map(dto); repositoryConfigStore.set(config); From e649a664231aeb2ba59f3e1c1e9dc8903e697cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 11 Apr 2019 13:52:23 +0200 Subject: [PATCH 2/3] Fix unit test --- .../src/test/resources/sonia/scm/configuration/shiro.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/configuration/shiro.ini b/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/configuration/shiro.ini index f0ffbe4ac5..083c685dbe 100644 --- a/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/configuration/shiro.ini +++ b/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/configuration/shiro.ini @@ -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:* From 0ff1e2060c3eab21e8eef812b43476970c797326 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Thu, 11 Apr 2019 13:46:28 +0000 Subject: [PATCH 3/3] Close branch bugfix/repo_git_config_permissions