From 3007004b8b0e6ca7809fdf9ca989cb7cf5a58397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 21 Feb 2019 11:25:03 +0100 Subject: [PATCH] Fix permission check for plugins --- .../sonia/scm/api/v2/resources/GitConfigInIndexResource.java | 3 ++- .../sonia/scm/api/v2/resources/HgConfigInIndexResource.java | 3 ++- .../sonia/scm/api/v2/resources/SvnConfigInIndexResource.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigInIndexResource.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigInIndexResource.java index a1120adda4..e6d7546ff4 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigInIndexResource.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigInIndexResource.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import sonia.scm.config.ConfigurationPermissions; import sonia.scm.plugin.Extension; +import sonia.scm.repository.GitConfig; import sonia.scm.web.JsonEnricherBase; import sonia.scm.web.JsonEnricherContext; @@ -26,7 +27,7 @@ public class GitConfigInIndexResource extends JsonEnricherBase { @Override public void enrich(JsonEnricherContext context) { - if (resultHasMediaType(INDEX, context) && ConfigurationPermissions.list().isPermitted()) { + if (resultHasMediaType(INDEX, context) && ConfigurationPermissions.read(GitConfig.PERMISSION).isPermitted()) { String gitConfigUrl = new LinkBuilder(scmPathInfoStore.get().get(), GitConfigResource.class) .method("get") .parameters() diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInIndexResource.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInIndexResource.java index 3de79b2f81..73c6e2e52f 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInIndexResource.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInIndexResource.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import sonia.scm.config.ConfigurationPermissions; import sonia.scm.plugin.Extension; +import sonia.scm.repository.HgConfig; import sonia.scm.web.JsonEnricherBase; import sonia.scm.web.JsonEnricherContext; @@ -26,7 +27,7 @@ public class HgConfigInIndexResource extends JsonEnricherBase { @Override public void enrich(JsonEnricherContext context) { - if (resultHasMediaType(INDEX, context) && ConfigurationPermissions.list().isPermitted()) { + if (resultHasMediaType(INDEX, context) && ConfigurationPermissions.read(HgConfig.PERMISSION).isPermitted()) { String hgConfigUrl = new LinkBuilder(scmPathInfoStore.get().get(), HgConfigResource.class) .method("get") .parameters() diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigInIndexResource.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigInIndexResource.java index 5ee1de3169..918d38a346 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigInIndexResource.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigInIndexResource.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import sonia.scm.config.ConfigurationPermissions; import sonia.scm.plugin.Extension; +import sonia.scm.repository.SvnConfig; import sonia.scm.web.JsonEnricherBase; import sonia.scm.web.JsonEnricherContext; @@ -26,7 +27,7 @@ public class SvnConfigInIndexResource extends JsonEnricherBase { @Override public void enrich(JsonEnricherContext context) { - if (resultHasMediaType(INDEX, context) && ConfigurationPermissions.list().isPermitted()) { + if (resultHasMediaType(INDEX, context) && ConfigurationPermissions.read(SvnConfig.PERMISSION).isPermitted()) { String svnConfigUrl = new LinkBuilder(scmPathInfoStore.get().get(), SvnConfigResource.class) .method("get") .parameters()