merge branch heads of 2.0.0-m3

2025-11-13 17:05:43 +01:00 · 2018-07-16 15:21:29 +02:00
parent 187384088b 1be689da67
commit 90aff6b31f
58 changed files with 1294 additions and 2402 deletions
--- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
@@ -194,7 +194,9 @@ public class ScmServletModule extends ServletModule

    ScmConfiguration config = getScmConfiguration();
    CipherUtil cu = CipherUtil.getInstance();
-    
+
+    bind(NamespaceStrategy.class).toProvider(NamespaceStrategyProvider.class);
+
    // bind repository provider
    ThrowingProviderBinder.create(binder()).bind(
      RepositoryProvider.class, Repository.class).to(
@@ -311,10 +313,10 @@ public class ScmServletModule extends ServletModule
    // bind events
    // bind(LastModifiedUpdateListener.class);

-    Class<? extends NamespaceStrategy> namespaceStrategy = extensionProcessor.byExtensionPoint(NamespaceStrategy.class).iterator().next();
-    bind(NamespaceStrategy.class, namespaceStrategy);
+
  }

+
  /**
   * Method description
   *
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
@@ -543,7 +543,8 @@ public class RepositoryImportResource

    try
    {
-      repository = new Repository(null, type, name);
+      // TODO #8783
+//      repository = new Repository(null, type, name);
      manager.create(repository);
    }
    catch (RepositoryAlreadyExistsException ex)
@@ -738,7 +739,8 @@ public class RepositoryImportResource
        {
          for (String repositoryName : repositoryNames)
          {
-            Repository repository = manager.get(type, repositoryName);
+            // TODO #8783
+            /*Repository repository = null; //manager.get(type, repositoryName);

            if (repository != null)
            {
@@ -748,7 +750,7 @@ public class RepositoryImportResource
            {
              logger.warn("could not find imported repository {}",
                repositoryName);
-            }
+            }*/
          }
        }
      }
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
@@ -556,42 +556,6 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
    return response;
  }

-  /**
-   * Returns the {@link Repository} with the specified type and name.
-   *
-   * @param type the type of the repository
-   * @param name the name of the repository
-   *
-   * @return the {@link Repository} with the specified type and name
-   */
-  @GET
-  @Path("{type: [a-z]+}/{name: .*}")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 404, condition = "not found, no repository with the specified type and name available"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(Repository.class)
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response getByTypeAndName(@PathParam("type") String type,
-    @PathParam("name") String name)
-  {
-    Response response;
-    Repository repository = repositoryManager.get(type, name);
-
-    if (repository != null)
-    {
-      prepareForReturn(repository);
-      response = Response.ok(repository).build();
-    }
-    else
-    {
-      response = Response.status(Response.Status.NOT_FOUND).build();
-    }
-
-    return response;
-  }
-
  /**
   * Returns the {@link Changeset} from the given repository
   * with the specified revision.
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceStrategy.java
@@ -1,11 +1,17 @@
 package sonia.scm.repository;

+import org.apache.shiro.SecurityUtils;
 import sonia.scm.plugin.Extension;

+/**
+ * The DefaultNamespaceStrategy returns the username of the currently logged in user as namespace.
+ * @since 2.0.0
+ */
@Extension
-public class DefaultNamespaceStrategy implements NamespaceStrategy{
+public class DefaultNamespaceStrategy implements NamespaceStrategy {
+
  @Override
  public String getNamespace() {
-    return "42";
+    return SecurityUtils.getSubject().getPrincipal().toString();
  }
 }
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
@@ -126,7 +126,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {


  @Override
-  public void close() throws IOException {
+  public void close() {
    executorService.shutdown();

    for (RepositoryHandler handler : handlerMap.values()) {
@@ -177,40 +177,16 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
    getHandler(toDelete).delete(toDelete);
  }

-  /**
-   * Method description
-   *
-   *
-   * @param repository
-   *
-   * @throws IOException
-   * @throws RepositoryException
-   */
  @Override
  public void importRepository(Repository repository)
    throws RepositoryException, IOException {
    create(repository, false);
  }

-  /**
-   * Method description
-   *
-   *
-   * @param context
-   */
  @Override
  public void init(SCMContextProvider context) {
  }

-  /**
-   * Method description
-   *
-   *
-   * @param repository
-   *
-   * @throws IOException
-   * @throws RepositoryException
-   */
  @Override
  public void modify(Repository repository) throws RepositoryException {
    logger.info("modify repository {} of type {}", repository.getName(), repository.getType());
@@ -226,23 +202,13 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
    );
  }

-  /**
-   * Method description
-   *
-   *
-   * @param repository
-   *
-   * @throws IOException
-   * @throws RepositoryException
-   */
  @Override
  public void refresh(Repository repository)
    throws RepositoryException {
    AssertUtil.assertIsNotNull(repository);
    RepositoryPermissions.read(repository).check();

-    Repository fresh = repositoryDAO.get(repository.getType(),
-      repository.getName());
+    Repository fresh = repositoryDAO.get(repository.getNamespaceAndName());

    if (fresh != null) {
      fresh.copyProperties(repository);
@@ -251,16 +217,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
    }
  }

-  //~--- get methods ----------------------------------------------------------

-  /**
-   * Method description
-   *
-   *
-   * @param id
-   *
-   * @return
-   */
  @Override
  public Repository get(String id) {
    AssertUtil.assertIsNotEmpty(id);
@@ -276,21 +233,13 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
    return repository;
  }

-  /**
-   * Method description
-   *
-   *
-   * @param type
-   * @param name
-   *
-   * @return
-   */
  @Override
-  public Repository get(String type, String name) {
-    AssertUtil.assertIsNotEmpty(type);
-    AssertUtil.assertIsNotEmpty(name);
+  public Repository get(NamespaceAndName namespaceAndName) {
+    AssertUtil.assertIsNotNull(namespaceAndName);
+    AssertUtil.assertIsNotEmpty(namespaceAndName.getNamespace());
+    AssertUtil.assertIsNotEmpty(namespaceAndName.getName());

-    Repository repository = repositoryDAO.get(type, name);
+    Repository repository = repositoryDAO.get(namespaceAndName);

    if (repository != null) {
      RepositoryPermissions.read(repository).check();
@@ -300,14 +249,6 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
    return repository;
  }

-  /**
-   * Method description
-   *
-   *
-   *
-   * @param comparator
-   * @return
-   */
  @Override
  public Collection<Repository> getAll(Comparator<Repository> comparator) {
    List<Repository> repositories = Lists.newArrayList();
@@ -330,28 +271,12 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
    return repositories;
  }

-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
  @Override
  public Collection<Repository> getAll() {
    return getAll(null);
  }

-  /**
-   * Method description
-   *
-   *
-   *
-   * @param comparator
-   * @param start
-   * @param limit
-   *
-   * @return
-   */
+
  @Override
  public Collection<Repository> getAll(Comparator<Repository> comparator,
                                       int start, int limit) {
@@ -369,26 +294,11 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
      }, start, limit);
  }

-  /**
-   * Method description
-   *
-   *
-   * @param start
-   * @param limit
-   *
-   * @return
-   */
  @Override
  public Collection<Repository> getAll(int start, int limit) {
    return getAll(null, start, limit);
  }

-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
  @Override
  public Collection<Type> getConfiguredTypes() {
    List<Type> validTypes = Lists.newArrayList();
@@ -402,14 +312,6 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
    return validTypes;
  }

-  /**
-   * Method description
-   *
-   *
-   * @param request
-   *
-   * @return
-   */
  @Override
  public Repository getFromRequest(HttpServletRequest request) {
    AssertUtil.assertIsNotNull(request);
@@ -417,17 +319,28 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
    return getFromUri(HttpUtil.getStrippedURI(request));
  }

-  /**
-   * Method description
-   *
-   *
-   * @param type
-   * @param uri
-   *
-   * @return
-   */
  @Override
-  public Repository getFromTypeAndUri(String type, String uri) {
+  public Repository getFromUri(String uri) {
+    AssertUtil.assertIsNotEmpty(uri);
+
+    if (uri.startsWith(HttpUtil.SEPARATOR_PATH)) {
+      uri = uri.substring(1);
+    }
+
+    int typeSeparator = uri.indexOf(HttpUtil.SEPARATOR_PATH);
+    Repository repository = null;
+
+    if (typeSeparator > 0) {
+      String type = uri.substring(0, typeSeparator);
+
+      uri = uri.substring(typeSeparator + 1);
+      repository = getFromTypeAndUri(type, uri);
+    }
+
+    return repository;
+  }
+
+  private Repository getFromTypeAndUri(String type, String uri) {
    if (Strings.isNullOrEmpty(type)) {
      throw new ArgumentIsInvalidException("argument type is required");
    }
@@ -464,80 +377,21 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
    return repository;
  }

-  /**
-   * Method description
-   *
-   *
-   * @param uri
-   *
-   * @return
-   */
-  @Override
-  public Repository getFromUri(String uri) {
-    AssertUtil.assertIsNotEmpty(uri);
-
-    if (uri.startsWith(HttpUtil.SEPARATOR_PATH)) {
-      uri = uri.substring(1);
-    }
-
-    int typeSeperator = uri.indexOf(HttpUtil.SEPARATOR_PATH);
-    Repository repository = null;
-
-    if (typeSeperator > 0) {
-      String type = uri.substring(0, typeSeperator);
-
-      uri = uri.substring(typeSeperator + 1);
-      repository = getFromTypeAndUri(type, uri);
-    }
-
-    return repository;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param type
-   *
-   * @return
-   */
  @Override
  public RepositoryHandler getHandler(String type) {
    return handlerMap.get(type);
  }

-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
  @Override
  public Long getLastModified() {
    return repositoryDAO.getLastModified();
  }

-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
  @Override
  public Collection<Type> getTypes() {
    return types;
  }

-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   *
-   * @param contextProvider
-   * @param handler
-   */
  private void addHandler(SCMContextProvider contextProvider,
                          RepositoryHandler handler) {
    AssertUtil.assertIsNotNull(handler);
@@ -561,19 +415,6 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
    types.add(type);
  }

-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param repository
-   *
-   * @return
-   *
-   *
-   * @throws RepositoryException
-   */
  private RepositoryHandler getHandler(Repository repository)
    throws RepositoryException {
    String type = repository.getType();
--- a/scm-webapp/src/main/java/sonia/scm/repository/LastModifiedUpdateListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/LastModifiedUpdateListener.java
@@ -33,7 +33,7 @@ package sonia.scm.repository;

 //~--- non-JDK imports --------------------------------------------------------

-import com.google.common.eventbus.Subscribe;
+import com.github.legman.Subscribe;
 import com.google.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
--- a/scm-webapp/src/main/java/sonia/scm/repository/RepositoryMatcher.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/RepositoryMatcher.java
@@ -32,14 +32,15 @@

 package sonia.scm.repository;

-import com.google.common.collect.Maps;
-import java.util.Map;
-import java.util.Set;
-import javax.inject.Inject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sonia.scm.util.HttpUtil;
-import sonia.scm.util.Util;
+ import com.google.common.collect.Maps;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ import sonia.scm.util.HttpUtil;
+ import sonia.scm.util.Util;
+
+ import javax.inject.Inject;
+ import java.util.Map;
+ import java.util.Set;

 /**
 * RepositoryMatcher is able to check if a repository matches the requested path.
@@ -83,9 +84,24 @@ public final class RepositoryMatcher {
  }
  
  private boolean isPathMatching(Repository repository, String path) {
-    return getPathMatcherForType(repository.getType()).isPathMatching(repository, path);
+
+    String namespace = extractNamespace(path);
+    String remainingPath = path.substring(namespace.length() + 1);
+
+    return getPathMatcherForType(repository.getType()).isPathMatching(repository, remainingPath);
  }
-  
+
+  private String extractNamespace(String path) {
+    if (path.startsWith(HttpUtil.SEPARATOR_PATH)) {
+      path = path.substring(1);
+    }
+    int namespaceSeparator = path.indexOf(HttpUtil.SEPARATOR_PATH);
+    if (namespaceSeparator > 0) {
+      return path.substring(0, namespaceSeparator);
+    }
+    throw new IllegalArgumentException("no namespace in path " + path);
+  }
+
  private RepositoryPathMatcher getPathMatcherForType(String type) {
    RepositoryPathMatcher pathMatcher = pathMatchers.get(type);
    if (pathMatcher == null) {
--- a/scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java
@@ -30,8 +30,8 @@
 */
 package sonia.scm.security;

+import com.github.legman.Subscribe;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.EagerSingleton;