Clone the repository
- git clone {repository._links.httpProtocol.href}
+ git clone {href}
Create a new repository
@@ -30,7 +33,7 @@ class ProtocolInformation extends React.Component {
git commit -m "added readme"
- git remote add origin {repository._links.httpProtocol.href}
+ git remote add origin {href}
git push -u origin master
@@ -39,7 +42,7 @@ class ProtocolInformation extends React.Component {
Push an existing repository
- git remote add origin {repository._links.httpProtocol.href}
+ git remote add origin {href}
git push -u origin master
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigInIndexResourceTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigInIndexResourceTest.java
new file mode 100644
index 0000000000..665be19788
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigInIndexResourceTest.java
@@ -0,0 +1,64 @@
+package sonia.scm.api.v2.resources;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.sdorra.shiro.ShiroRule;
+import com.github.sdorra.shiro.SubjectAware;
+import com.google.inject.util.Providers;
+import org.junit.Rule;
+import org.junit.Test;
+import sonia.scm.web.JsonEnricherContext;
+import sonia.scm.web.VndMediaType;
+
+import javax.ws.rs.core.MediaType;
+import java.net.URI;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+@SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini")
+public class GitConfigInIndexResourceTest {
+
+ @Rule
+ public final ShiroRule shiroRule = new ShiroRule();
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+ private final ObjectNode root = objectMapper.createObjectNode();
+ private final GitConfigInIndexResource gitConfigInIndexResource;
+
+ public GitConfigInIndexResourceTest() {
+ root.put("_links", objectMapper.createObjectNode());
+ ScmPathInfoStore pathInfoStore = new ScmPathInfoStore();
+ pathInfoStore.set(() -> URI.create("/"));
+ gitConfigInIndexResource = new GitConfigInIndexResource(Providers.of(pathInfoStore), objectMapper);
+ }
+
+ @Test
+ @SubjectAware(username = "admin", password = "secret")
+ public void admin() {
+ JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+ gitConfigInIndexResource.enrich(context);
+
+ assertEquals("/v2/config/git", root.get("_links").get("gitConfig").get("href").asText());
+ }
+
+ @Test
+ @SubjectAware(username = "readOnly", password = "secret")
+ public void user() {
+ JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+ gitConfigInIndexResource.enrich(context);
+
+ assertFalse(root.get("_links").iterator().hasNext());
+ }
+
+ @Test
+ public void anonymous() {
+ JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+ gitConfigInIndexResource.enrich(context);
+
+ assertFalse(root.get("_links").iterator().hasNext());
+ }
+}
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java
index d6e6ac98d8..78db8ae686 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java
@@ -1,3 +1,4 @@
+
/**
* Copyright (c) 2010, Sebastian Sdorra
* All rights reserved.
@@ -33,14 +34,17 @@
package sonia.scm.repository.spi;
-//~--- non-JDK imports --------------------------------------------------------
-
+import com.google.common.io.Files;
import org.junit.Test;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.GitConstants;
import sonia.scm.repository.Modifications;
+import java.io.File;
+import java.io.IOException;
+
+import static java.nio.charset.Charset.defaultCharset;
import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -48,8 +52,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-//~--- JDK imports ------------------------------------------------------------
-
/**
* Unit tests for {@link GitLogCommand}.
*
@@ -72,6 +74,8 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
assertEquals("86a6645eceefe8b9a247db5eb16e3d89a7e6e6d1", result.getChangesets().get(1).getId());
assertEquals("592d797cd36432e591416e8b2b98154f4f163411", result.getChangesets().get(2).getId());
assertEquals("435df2f061add3589cb326cc64be9b9c3897ceca", result.getChangesets().get(3).getId());
+ assertEquals("master", result.getBranchName());
+ assertTrue(result.getChangesets().stream().allMatch(r -> r.getBranches().isEmpty()));
// set default branch and fetch again
repository.setProperty(GitConstants.PROPERTY_DEFAULT_BRANCH, "test-branch");
@@ -79,10 +83,12 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
result = createCommand().getChangesets(new LogCommandRequest());
assertNotNull(result);
+ assertEquals("test-branch", result.getBranchName());
assertEquals(3, result.getTotal());
assertEquals("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4", result.getChangesets().get(0).getId());
assertEquals("592d797cd36432e591416e8b2b98154f4f163411", result.getChangesets().get(1).getId());
assertEquals("435df2f061add3589cb326cc64be9b9c3897ceca", result.getChangesets().get(2).getId());
+ assertTrue(result.getChangesets().stream().allMatch(r -> r.getBranches().isEmpty()));
}
@Test
@@ -210,6 +216,32 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
assertEquals("435df2f061add3589cb326cc64be9b9c3897ceca", c2.getId());
}
+ @Test
+ public void shouldFindDefaultBranchFromHEAD() throws Exception {
+ setRepositoryHeadReference("ref: refs/heads/test-branch");
+
+ ChangesetPagingResult changesets = createCommand().getChangesets(new LogCommandRequest());
+
+ assertEquals("test-branch", changesets.getBranchName());
+ }
+
+ @Test
+ public void shouldFindMasterBranchWhenHEADisNoRef() throws Exception {
+ setRepositoryHeadReference("592d797cd36432e591416e8b2b98154f4f163411");
+
+ ChangesetPagingResult changesets = createCommand().getChangesets(new LogCommandRequest());
+
+ assertEquals("master", changesets.getBranchName());
+ }
+
+ private void setRepositoryHeadReference(String s) throws IOException {
+ Files.write(s, repositoryHeadReferenceFile(), defaultCharset());
+ }
+
+ private File repositoryHeadReferenceFile() {
+ return new File(repositoryDirectory, "HEAD");
+ }
+
private GitLogCommand createCommand()
{
return new GitLogCommand(createContext(), repository);
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 36226edd7d..5d30a000f2 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
@@ -2,8 +2,10 @@
readOnly = secret, reader
writeOnly = secret, writer
readWrite = secret, readerWriter
+admin = secret, admin
[roles]
reader = configuration:read:git
writer = configuration:write:git
readerWriter = configuration:*:git
+admin = *
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
new file mode 100644
index 0000000000..3de79b2f81
--- /dev/null
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInIndexResource.java
@@ -0,0 +1,40 @@
+package sonia.scm.api.v2.resources;
+
+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.web.JsonEnricherBase;
+import sonia.scm.web.JsonEnricherContext;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+
+import static java.util.Collections.singletonMap;
+import static sonia.scm.web.VndMediaType.INDEX;
+
+@Extension
+public class HgConfigInIndexResource extends JsonEnricherBase {
+
+ private final Provider scmPathInfoStore;
+
+ @Inject
+ public HgConfigInIndexResource(Provider scmPathInfoStore, ObjectMapper objectMapper) {
+ super(objectMapper);
+ this.scmPathInfoStore = scmPathInfoStore;
+ }
+
+ @Override
+ public void enrich(JsonEnricherContext context) {
+ if (resultHasMediaType(INDEX, context) && ConfigurationPermissions.list().isPermitted()) {
+ String hgConfigUrl = new LinkBuilder(scmPathInfoStore.get().get(), HgConfigResource.class)
+ .method("get")
+ .parameters()
+ .href();
+
+ JsonNode hgConfigRefNode = createObject(singletonMap("href", value(hgConfigUrl)));
+
+ addPropertyNode(context.getResponseEntity().get("_links"), "hgConfig", hgConfigRefNode);
+ }
+ }
+}
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
index 68d6913962..e9de7f7471 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
@@ -132,7 +132,11 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
List changesets = on(repository).rev(start + ":"
+ end).execute();
- result = new ChangesetPagingResult(total, changesets);
+ if (request.getBranch() == null) {
+ result = new ChangesetPagingResult(total, changesets);
+ } else {
+ result = new ChangesetPagingResult(total, changesets, request.getBranch());
+ }
}
else
{
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/AbstractChangesetCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/AbstractChangesetCommand.java
index 6466eb6d11..89164a8d80 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/AbstractChangesetCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/AbstractChangesetCommand.java
@@ -216,10 +216,7 @@ public abstract class AbstractChangesetCommand extends AbstractCommand
String branch = in.textUpTo('\n');
- if (!BRANCH_DEFAULT.equals(branch))
- {
- changeset.getBranches().add(branch);
- }
+ changeset.getBranches().add(branch);
String p1 = readId(in, changeset, PROPERTY_PARENT1_REVISION);
diff --git a/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.js b/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.js
index 28c1e53a07..03fc41450a 100644
--- a/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.js
+++ b/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.js
@@ -1,5 +1,6 @@
//@flow
import React from "react";
+import { repositories } from "@scm-manager/ui-components";
import type { Repository } from "@scm-manager/ui-types";
type Props = {
@@ -10,14 +11,15 @@ class ProtocolInformation extends React.Component {
render() {
const { repository } = this.props;
- if (!repository._links.httpProtocol) {
+ const href = repositories.getProtocolLinkByType(repository, "http");
+ if (!href) {
return null;
}
return (
Clone the repository
- hg clone {repository._links.httpProtocol.href}
+ hg clone {href}
Create a new repository
@@ -26,7 +28,7 @@ class ProtocolInformation extends React.Component {
echo "[paths]" > .hg/hgrc
- echo "default = {repository._links.httpProtocol.href}" > .hg/hgrc
+ echo "default = {href}" > .hg/hgrc
echo "# {repository.name}" > README.md
@@ -44,7 +46,7 @@ class ProtocolInformation extends React.Component {
# add the repository url as default to your .hg/hgrc e.g:
- default = {repository._links.httpProtocol.href}
+ default = {href}
# push to remote repository
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInIndexResourceTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInIndexResourceTest.java
new file mode 100644
index 0000000000..27ab74932c
--- /dev/null
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInIndexResourceTest.java
@@ -0,0 +1,64 @@
+package sonia.scm.api.v2.resources;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.sdorra.shiro.ShiroRule;
+import com.github.sdorra.shiro.SubjectAware;
+import com.google.inject.util.Providers;
+import org.junit.Rule;
+import org.junit.Test;
+import sonia.scm.web.JsonEnricherContext;
+import sonia.scm.web.VndMediaType;
+
+import javax.ws.rs.core.MediaType;
+import java.net.URI;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+@SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini")
+public class HgConfigInIndexResourceTest {
+
+ @Rule
+ public final ShiroRule shiroRule = new ShiroRule();
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+ private final ObjectNode root = objectMapper.createObjectNode();
+ private final HgConfigInIndexResource hgConfigInIndexResource;
+
+ public HgConfigInIndexResourceTest() {
+ root.put("_links", objectMapper.createObjectNode());
+ ScmPathInfoStore pathInfoStore = new ScmPathInfoStore();
+ pathInfoStore.set(() -> URI.create("/"));
+ hgConfigInIndexResource = new HgConfigInIndexResource(Providers.of(pathInfoStore), objectMapper);
+ }
+
+ @Test
+ @SubjectAware(username = "admin", password = "secret")
+ public void admin() {
+ JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+ hgConfigInIndexResource.enrich(context);
+
+ assertEquals("/v2/config/hg", root.get("_links").get("hgConfig").get("href").asText());
+ }
+
+ @Test
+ @SubjectAware(username = "readOnly", password = "secret")
+ public void user() {
+ JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+ hgConfigInIndexResource.enrich(context);
+
+ assertFalse(root.get("_links").iterator().hasNext());
+ }
+
+ @Test
+ public void anonymous() {
+ JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+ hgConfigInIndexResource.enrich(context);
+
+ assertFalse(root.get("_links").iterator().hasNext());
+ }
+}
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgLogCommandTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgLogCommandTest.java
index 99e9fc191a..29fc46ed57 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgLogCommandTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgLogCommandTest.java
@@ -88,6 +88,21 @@ public class HgLogCommandTest extends AbstractHgCommandTestBase
result.getChangesets().get(2).getId());
}
+ @Test
+ public void testGetDefaultBranchInfo() {
+ LogCommandRequest request = new LogCommandRequest();
+
+ request.setPath("a.txt");
+
+ ChangesetPagingResult result = createComamnd().getChangesets(request);
+
+ assertNotNull(result);
+ assertEquals(1,
+ result.getChangesets().get(0).getBranches().size());
+ assertEquals("default",
+ result.getChangesets().get(0).getBranches().get(0));
+ }
+
@Test
public void testGetAllWithLimit() {
LogCommandRequest request = new LogCommandRequest();
diff --git a/scm-plugins/scm-hg-plugin/src/test/resources/sonia/scm/configuration/shiro.ini b/scm-plugins/scm-hg-plugin/src/test/resources/sonia/scm/configuration/shiro.ini
index fc08bb83ac..d8083a04c9 100644
--- a/scm-plugins/scm-hg-plugin/src/test/resources/sonia/scm/configuration/shiro.ini
+++ b/scm-plugins/scm-hg-plugin/src/test/resources/sonia/scm/configuration/shiro.ini
@@ -2,8 +2,10 @@
readOnly = secret, reader
writeOnly = secret, writer
readWrite = secret, readerWriter
+admin = secret, admin
[roles]
reader = configuration:read:hg
writer = configuration:write:hg
readerWriter = configuration:*:hg
+admin = *
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
new file mode 100644
index 0000000000..5ee1de3169
--- /dev/null
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigInIndexResource.java
@@ -0,0 +1,40 @@
+package sonia.scm.api.v2.resources;
+
+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.web.JsonEnricherBase;
+import sonia.scm.web.JsonEnricherContext;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+
+import static java.util.Collections.singletonMap;
+import static sonia.scm.web.VndMediaType.INDEX;
+
+@Extension
+public class SvnConfigInIndexResource extends JsonEnricherBase {
+
+ private final Provider scmPathInfoStore;
+
+ @Inject
+ public SvnConfigInIndexResource(Provider scmPathInfoStore, ObjectMapper objectMapper) {
+ super(objectMapper);
+ this.scmPathInfoStore = scmPathInfoStore;
+ }
+
+ @Override
+ public void enrich(JsonEnricherContext context) {
+ if (resultHasMediaType(INDEX, context) && ConfigurationPermissions.list().isPermitted()) {
+ String svnConfigUrl = new LinkBuilder(scmPathInfoStore.get().get(), SvnConfigResource.class)
+ .method("get")
+ .parameters()
+ .href();
+
+ JsonNode svnConfigRefNode = createObject(singletonMap("href", value(svnConfigUrl)));
+
+ addPropertyNode(context.getResponseEntity().get("_links"), "svnConfig", svnConfigRefNode);
+ }
+ }
+}
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnGZipFilter.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnGZipFilter.java
index 7cc78180ff..4352299ed5 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnGZipFilter.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnGZipFilter.java
@@ -32,122 +32,45 @@
package sonia.scm.web;
-//~--- non-JDK imports --------------------------------------------------------
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import sonia.scm.filter.GZipFilter;
+import sonia.scm.filter.GZipFilterConfig;
+import sonia.scm.filter.GZipResponseWrapper;
import sonia.scm.repository.Repository;
import sonia.scm.repository.SvnRepositoryHandler;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
+import sonia.scm.util.WebUtil;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-//~--- JDK imports ------------------------------------------------------------
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public class SvnGZipFilter extends GZipFilter implements ScmProviderHttpServlet
-{
+class SvnGZipFilter implements ScmProviderHttpServlet {
private static final Logger logger = LoggerFactory.getLogger(SvnGZipFilter.class);
private final SvnRepositoryHandler handler;
private final ScmProviderHttpServlet delegate;
- //~--- constructors ---------------------------------------------------------
+ private GZipFilterConfig config = new GZipFilterConfig();
- /**
- * Constructs ...
- *
- *
- * @param handler
- */
- public SvnGZipFilter(SvnRepositoryHandler handler, ScmProviderHttpServlet delegate)
- {
+ SvnGZipFilter(SvnRepositoryHandler handler, ScmProviderHttpServlet delegate) {
this.handler = handler;
this.delegate = delegate;
- }
-
- //~--- methods --------------------------------------------------------------
-
- /**
- * Method description
- *
- *
- * @param filterConfig
- *
- * @throws ServletException
- */
- @Override
- public void init(FilterConfig filterConfig) throws ServletException
- {
- super.init(filterConfig);
- getConfig().setBufferResponse(false);
- }
-
- /**
- * Method description
- *
- *
- * @param request
- * @param response
- * @param chain
- *
- * @throws IOException
- * @throws ServletException
- */
- @Override
- protected void doFilter(HttpServletRequest request,
- HttpServletResponse response, FilterChain chain)
- throws IOException, ServletException
- {
- if (handler.getConfig().isEnabledGZip())
- {
- if (logger.isTraceEnabled())
- {
- logger.trace("encode svn request with gzip");
- }
-
- super.doFilter(request, response, chain);
- }
- else
- {
- if (logger.isTraceEnabled())
- {
- logger.trace("skip gzip encoding");
- }
-
- chain.doFilter(request, response);
- }
+ config.setBufferResponse(false);
}
@Override
public void service(HttpServletRequest request, HttpServletResponse response, Repository repository) throws ServletException, IOException {
- if (handler.getConfig().isEnabledGZip())
- {
- if (logger.isTraceEnabled())
- {
- logger.trace("encode svn request with gzip");
- }
-
- super.doFilter(request, response, (servletRequest, servletResponse) -> delegate.service((HttpServletRequest) servletRequest, (HttpServletResponse) servletResponse, repository));
- }
- else
- {
- if (logger.isTraceEnabled())
- {
- logger.trace("skip gzip encoding");
- }
-
+ if (handler.getConfig().isEnabledGZip() && WebUtil.isGzipSupported(request)) {
+ logger.trace("compress svn response with gzip");
+ GZipResponseWrapper wrappedResponse = new GZipResponseWrapper(response, config);
+ delegate.service(request, wrappedResponse, repository);
+ wrappedResponse.finishResponse();
+ } else {
+ logger.trace("skip gzip encoding");
delegate.service(request, response, repository);
}
}
diff --git a/scm-plugins/scm-svn-plugin/src/main/js/ProtocolInformation.js b/scm-plugins/scm-svn-plugin/src/main/js/ProtocolInformation.js
index ccff4118ba..0ba195887f 100644
--- a/scm-plugins/scm-svn-plugin/src/main/js/ProtocolInformation.js
+++ b/scm-plugins/scm-svn-plugin/src/main/js/ProtocolInformation.js
@@ -1,5 +1,6 @@
//@flow
import React from "react";
+import { repositories } from "@scm-manager/ui-components";
import type { Repository } from "@scm-manager/ui-types";
type Props = {
@@ -10,14 +11,15 @@ class ProtocolInformation extends React.Component {
render() {
const { repository } = this.props;
- if (!repository._links.httpProtocol) {
+ const href = repositories.getProtocolLinkByType(repository, "http");
+ if (!href) {
return null;
}
return (
Checkout the repository
- svn checkout {repository._links.httpProtocol.href}
+ svn checkout {href}
);
diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigInIndexResourceTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigInIndexResourceTest.java
new file mode 100644
index 0000000000..8b87b57c6c
--- /dev/null
+++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigInIndexResourceTest.java
@@ -0,0 +1,64 @@
+package sonia.scm.api.v2.resources;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.sdorra.shiro.ShiroRule;
+import com.github.sdorra.shiro.SubjectAware;
+import com.google.inject.util.Providers;
+import org.junit.Rule;
+import org.junit.Test;
+import sonia.scm.web.JsonEnricherContext;
+import sonia.scm.web.VndMediaType;
+
+import javax.ws.rs.core.MediaType;
+import java.net.URI;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+@SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini")
+public class SvnConfigInIndexResourceTest {
+
+ @Rule
+ public final ShiroRule shiroRule = new ShiroRule();
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+ private final ObjectNode root = objectMapper.createObjectNode();
+ private final SvnConfigInIndexResource svnConfigInIndexResource;
+
+ public SvnConfigInIndexResourceTest() {
+ root.put("_links", objectMapper.createObjectNode());
+ ScmPathInfoStore pathInfoStore = new ScmPathInfoStore();
+ pathInfoStore.set(() -> URI.create("/"));
+ svnConfigInIndexResource = new SvnConfigInIndexResource(Providers.of(pathInfoStore), objectMapper);
+ }
+
+ @Test
+ @SubjectAware(username = "admin", password = "secret")
+ public void admin() {
+ JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+ svnConfigInIndexResource.enrich(context);
+
+ assertEquals("/v2/config/svn", root.get("_links").get("svnConfig").get("href").asText());
+ }
+
+ @Test
+ @SubjectAware(username = "readOnly", password = "secret")
+ public void user() {
+ JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+ svnConfigInIndexResource.enrich(context);
+
+ assertFalse(root.get("_links").iterator().hasNext());
+ }
+
+ @Test
+ public void anonymous() {
+ JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+ svnConfigInIndexResource.enrich(context);
+
+ assertFalse(root.get("_links").iterator().hasNext());
+ }
+}
diff --git a/scm-plugins/scm-svn-plugin/src/test/resources/sonia/scm/configuration/shiro.ini b/scm-plugins/scm-svn-plugin/src/test/resources/sonia/scm/configuration/shiro.ini
index 7e4233b540..fe84723e0a 100644
--- a/scm-plugins/scm-svn-plugin/src/test/resources/sonia/scm/configuration/shiro.ini
+++ b/scm-plugins/scm-svn-plugin/src/test/resources/sonia/scm/configuration/shiro.ini
@@ -2,8 +2,10 @@
readOnly = secret, reader
writeOnly = secret, writer
readWrite = secret, readerWriter
+admin = secret, admin
[roles]
reader = configuration:read:svn
writer = configuration:write:svn
readerWriter = configuration:*:svn
+admin = *
diff --git a/scm-ui-components/package.json b/scm-ui-components/package.json
index 6fe782506e..73c20625bd 100644
--- a/scm-ui-components/package.json
+++ b/scm-ui-components/package.json
@@ -4,7 +4,8 @@
"private": true,
"scripts": {
"bootstrap": "lerna bootstrap",
- "link": "lerna exec -- yarn link"
+ "link": "lerna exec -- yarn link",
+ "unlink": "lerna exec --no-bail -- yarn unlink"
},
"devDependencies": {
"lerna": "^3.2.1"
diff --git a/scm-ui-components/packages/ui-components/src/Help.js b/scm-ui-components/packages/ui-components/src/Help.js
new file mode 100644
index 0000000000..965d16f145
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/Help.js
@@ -0,0 +1,39 @@
+//@flow
+import React from "react";
+import injectSheet from "react-jss";
+import classNames from "classnames";
+
+const styles = {
+ img: {
+ display: "block"
+ },
+ q: {
+ float: "left",
+ paddingLeft: "3px",
+ float: "right"
+ }
+};
+
+type Props = {
+ message: string,
+ classes: any
+};
+
+class Help extends React.Component {
+ render() {
+ const { message, classes } = this.props;
+ const multiline = message.length > 60 ? "is-tooltip-multiline" : "";
+ return (
+
+
+
+ );
+ }
+}
+
+export default injectSheet(styles)(Help);
diff --git a/scm-ui-components/packages/ui-components/src/LabelWithHelpIcon.js b/scm-ui-components/packages/ui-components/src/LabelWithHelpIcon.js
new file mode 100644
index 0000000000..b5d049e68d
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/LabelWithHelpIcon.js
@@ -0,0 +1,46 @@
+//@flow
+import React from "react";
+import { Help } from "./index";
+
+type Props = {
+ label: string,
+ helpText?: string
+};
+
+class LabelWithHelpIcon extends React.Component {
+ renderLabel = () => {
+ const label = this.props.label;
+ if (label) {
+ return ;
+ }
+ return "";
+ };
+
+ renderHelp = () => {
+ const helpText = this.props.helpText;
+ if (helpText) {
+ return (
+
+
+
+ );
+ } else return null;
+ };
+
+ renderLabelWithHelpIcon = () => {
+ if (this.props.label) {
+ return (
+
+
{this.renderLabel()}
+ {this.renderHelp()}
+
{
value={this.state.entryToAdd}
onReturnPressed={this.appendEntry}
disabled={disabled}
+ helpText={helpText}
/>
void,
- disabled?: boolean
+ disabled?: boolean,
+ helpText?: string
};
class Checkbox extends React.Component {
onCheckboxChange = (event: SyntheticInputEvent) => {
@@ -14,9 +16,20 @@ class Checkbox extends React.Component {
}
};
+ renderHelp = () => {
+ const helpText = this.props.helpText;
+ if (helpText) {
+ return (
+
+
+
+ );
+ } else return null;
+ };
+
render() {
return (
-
+
);
}
diff --git a/scm-ui-components/packages/ui-components/src/forms/InputField.js b/scm-ui-components/packages/ui-components/src/forms/InputField.js
index 6f87683939..79b71298f8 100644
--- a/scm-ui-components/packages/ui-components/src/forms/InputField.js
+++ b/scm-ui-components/packages/ui-components/src/forms/InputField.js
@@ -1,6 +1,7 @@
//@flow
import React from "react";
import classNames from "classnames";
+import { LabelWithHelpIcon } from "../index";
type Props = {
label?: string,
@@ -12,7 +13,8 @@ type Props = {
onReturnPressed?: () => void,
validationError: boolean,
errorMessage: string,
- disabled?: boolean
+ disabled?: boolean,
+ helpText?: string
};
class InputField extends React.Component
{
@@ -33,15 +35,6 @@ class InputField extends React.Component {
this.props.onChange(event.target.value);
};
- renderLabel = () => {
- const label = this.props.label;
- if (label) {
- return ;
- }
- return "";
- };
-
-
handleKeyPress = (event: SyntheticKeyboardEvent) => {
const onReturnPressed = this.props.onReturnPressed;
if (!onReturnPressed) {
@@ -60,7 +53,9 @@ class InputField extends React.Component {
value,
validationError,
errorMessage,
- disabled
+ disabled,
+ label,
+ helpText
} = this.props;
const errorView = validationError ? "is-danger" : "";
const helper = validationError ? (
@@ -70,7 +65,7 @@ class InputField extends React.Component {
);
return (
- {this.renderLabel()}
+
{
diff --git a/scm-ui-components/packages/ui-components/src/forms/Select.js b/scm-ui-components/packages/ui-components/src/forms/Select.js
index 184359cc11..880b375999 100644
--- a/scm-ui-components/packages/ui-components/src/forms/Select.js
+++ b/scm-ui-components/packages/ui-components/src/forms/Select.js
@@ -1,5 +1,7 @@
//@flow
import React from "react";
+import classNames from "classnames";
+import { LabelWithHelpIcon } from "../index";
export type SelectItem = {
value: string,
@@ -10,7 +12,9 @@ type Props = {
label?: string,
options: SelectItem[],
value?: SelectItem,
- onChange: string => void
+ onChange: string => void,
+ loading?: boolean,
+ helpText?: string
};
class Select extends React.Component
{
@@ -28,21 +32,18 @@ class Select extends React.Component {
this.props.onChange(event.target.value);
};
- renderLabel = () => {
- const label = this.props.label;
- if (label) {
- return ;
- }
- return "";
- };
-
render() {
- const { options, value } = this.props;
+ const { options, value, label, helpText, loading } = this.props;
+ const loadingClass = loading ? "is-loading" : "";
+
return (
- {this.renderLabel()}
-
+
+