Merge branch 'develop' into feature/import_git_from_url

scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java

@@ -354,7 +354,7 @@ public class BranchRootResource {
                          @PathParam("name") String name,
                          @PathParam("branch") String branch) {
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
-      RepositoryPermissions.modify(repositoryService.getRepository()).check();
+      RepositoryPermissions.push(repositoryService.getRepository()).check();
 
       Optional<Branch> branchToBeDeleted = repositoryService.getBranchesCommand().getBranches().getBranches().stream()
         .filter(b -> b.getName().equalsIgnoreCase(branch))

scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java

@@ -34,6 +34,7 @@ import sonia.scm.repository.Changeset;
 import sonia.scm.repository.Contributor;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.Repository;
+import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.repository.Signature;
 import sonia.scm.repository.api.Command;
 import sonia.scm.repository.api.RepositoryService;
@@ -116,6 +117,9 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa
       if (repositoryService.isSupported(Command.TAGS)) {
         embeddedBuilder.with("tags", tagCollectionToDtoMapper.getMinimalEmbeddedTagDtoList(namespace, name, source.getTags()));
       }
+      if (repositoryService.isSupported(Command.TAG) && RepositoryPermissions.push(repository).isPermitted()) {
+        linksBuilder.single(link("tag", resourceLinks.tag().create(namespace, name)));
+      }
       if (repositoryService.isSupported(Command.BRANCHES)) {
         embeddedBuilder.with("branches", branchCollectionToDtoMapper.getBranchDtoList(repository,
           getListOfObjects(source.getBranches(), branchName -> Branch.normalBranch(branchName, source.getId()))));

scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java

@@ -451,6 +451,14 @@ class ResourceLinks {
       return tagLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("tags").parameters().method("get").parameters(tagName).href();
     }
 
+    String delete(String namespace, String name, String tagName) {
+      return tagLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("tags").parameters().method("delete").parameters(tagName).href();
+    }
+
+    String create(String namespace, String name) {
+      return tagLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("tags").parameters().method("create").parameters().href();
+    }
+
     String all(String namespace, String name) {
       return tagLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("tags").parameters().method("getAll").parameters().href();
     }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagCollectionToDtoMapper.java

@@ -28,7 +28,7 @@ import com.google.inject.Inject;
 import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
-import sonia.scm.repository.NamespaceAndName;
+import sonia.scm.repository.Repository;
 import sonia.scm.repository.Tag;
 
 import java.util.Collection;
@@ -40,7 +40,6 @@ import static java.util.stream.Collectors.toList;
 
 public class TagCollectionToDtoMapper {
 
-
   private final ResourceLinks resourceLinks;
   private final TagToTagDtoMapper tagToTagDtoMapper;
 
@@ -50,12 +49,12 @@ public class TagCollectionToDtoMapper {
     this.tagToTagDtoMapper = tagToTagDtoMapper;
   }
 
-  public HalRepresentation map(String namespace, String name, Collection<Tag> tags) {
-    return new HalRepresentation(createLinks(namespace, name), embedDtos(getTagDtoList(namespace, name, tags)));
+  public HalRepresentation map(Collection<Tag> tags, Repository repository) {
+    return new HalRepresentation(createLinks(repository.getNamespace(), repository.getName()), embedDtos(getTagDtoList(tags, repository)));
   }
 
-  public List<TagDto> getTagDtoList(String namespace, String name, Collection<Tag> tags) {
-    return tags.stream().map(tag -> tagToTagDtoMapper.map(tag, new NamespaceAndName(namespace, name))).collect(toList());
+  public List<TagDto> getTagDtoList(Collection<Tag> tags, Repository repository) {
+    return tags.stream().map(tag -> tagToTagDtoMapper.map(tag, repository)).collect(toList());
   }
 
   public List<TagDto> getMinimalEmbeddedTagDtoList(String namespace, String name, Collection<String> tags) {

scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagDto.java

@@ -33,6 +33,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.time.Instant;
+import java.util.List;
 
 @Getter
 @Setter
@@ -46,6 +47,8 @@ public class TagDto extends HalRepresentation {
   @JsonInclude(JsonInclude.Include.NON_NULL)
   private Instant date;
 
+  private List<SignatureDto> signatures;
+
   TagDto(Links links) {
     super(links);
   }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRequestDto.java

@@ -0,0 +1,49 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package sonia.scm.api.v2.resources;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+
+import static sonia.scm.repository.Branch.VALID_BRANCH_NAMES;
+import static sonia.scm.repository.Tag.VALID_REV;
+
+@Getter
+@Setter
+public class TagRequestDto {
+  @Pattern(regexp = VALID_REV)
+  @NotEmpty
+  @Length(min = 1, max = 100)
+  private String revision;
+
+  @Pattern(regexp = VALID_BRANCH_NAMES)
+  @NotEmpty
+  @Length(min = 1, max = 100)
+  private String name;
+}

scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java

@@ -21,12 +21,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-    
+
 package sonia.scm.api.v2.resources;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.headers.Header;
 import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
 import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
@@ -36,16 +39,22 @@ import sonia.scm.repository.Tag;
 import sonia.scm.repository.Tags;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
+import sonia.scm.repository.api.TagCommandBuilder;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.validation.Valid;
+import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
+import java.net.URI;
 
+import static sonia.scm.AlreadyExistsException.alreadyExists;
 import static sonia.scm.ContextEntry.ContextBuilder.entity;
 import static sonia.scm.NotFoundException.notFound;
 
@@ -54,14 +63,17 @@ public class TagRootResource {
   private final RepositoryServiceFactory serviceFactory;
   private final TagCollectionToDtoMapper tagCollectionToDtoMapper;
   private final TagToTagDtoMapper tagToTagDtoMapper;
+  private final ResourceLinks resourceLinks;
 
   @Inject
   public TagRootResource(RepositoryServiceFactory serviceFactory,
                          TagCollectionToDtoMapper tagCollectionToDtoMapper,
-                         TagToTagDtoMapper tagToTagDtoMapper) {
+                         TagToTagDtoMapper tagToTagDtoMapper,
+                         ResourceLinks resourceLinks) {
     this.serviceFactory = serviceFactory;
     this.tagCollectionToDtoMapper = tagCollectionToDtoMapper;
     this.tagToTagDtoMapper = tagToTagDtoMapper;
+    this.resourceLinks = resourceLinks;
   }
 
   @GET
@@ -89,7 +101,7 @@ public class TagRootResource {
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       Tags tags = getTags(repositoryService);
       if (tags != null && tags.getTags() != null) {
-        return Response.ok(tagCollectionToDtoMapper.map(namespace, name, tags.getTags())).build();
+        return Response.ok(tagCollectionToDtoMapper.map(tags.getTags(), repositoryService.getRepository())).build();
       } else {
         return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
           .entity("Error on getting tag from repository.")
@@ -98,6 +110,66 @@ public class TagRootResource {
     }
   }
 
+  @POST
+  @Path("")
+  @Produces(VndMediaType.TAG_REQUEST)
+  @Operation(summary = "Create tag",
+    description = "Creates a new tag.",
+    tags = "Repository",
+    requestBody = @RequestBody(
+      content = @Content(
+        mediaType = VndMediaType.TAG_REQUEST,
+        schema = @Schema(implementation = TagRequestDto.class),
+        examples = @ExampleObject(
+          name = "Create a new tag for a revision",
+          value = "{\n  \"revision\":\"734713bc047d87bf7eac9674765ae793478c50d3\",\n  \"name\":\"v1.1.0\"\n}",
+          summary = "Create a tag"
+        )
+      )
+    ))
+  @ApiResponse(
+    responseCode = "201",
+    description = "create success",
+    headers = @Header(
+      name = "Location",
+      description = "uri to the created tag",
+      schema = @Schema(type = "string")
+    )
+  )
+  @ApiResponse(responseCode = "401", description = "not authenticated / invalid credentials")
+  @ApiResponse(responseCode = "403", description = "not authorized, the current user has no privileges to read the tags")
+  @ApiResponse(
+    responseCode = "404",
+    description = "not found, no tag with the specified name available in the repository",
+    content = @Content(
+      mediaType = VndMediaType.ERROR_TYPE,
+      schema = @Schema(implementation = ErrorDto.class)
+    ))
+  @ApiResponse(
+    responseCode = "500",
+    description = "internal server error",
+    content = @Content(
+      mediaType = VndMediaType.ERROR_TYPE,
+      schema = @Schema(implementation = ErrorDto.class)
+    ))
+  public Response create(@PathParam("namespace") String namespace, @PathParam("name") String name, @Valid TagRequestDto tagRequest) throws IOException {
+    NamespaceAndName namespaceAndName = new NamespaceAndName(namespace, name);
+    String revision = tagRequest.getRevision();
+    String tagName = tagRequest.getName();
+    try (RepositoryService repositoryService = serviceFactory.create(namespaceAndName)) {
+      if (tagExists(tagName, repositoryService)) {
+        throw alreadyExists(entity(Tag.class, tagName).in(repositoryService.getRepository()));
+      }
+      Repository repository = repositoryService.getRepository();
+      RepositoryPermissions.push(repository).check();
+      TagCommandBuilder tagCommandBuilder = repositoryService.getTagCommand();
+      final Tag newTag = tagCommandBuilder.create()
+        .setRevision(revision)
+        .setName(tagName)
+        .execute();
+      return Response.created(URI.create(resourceLinks.tag().self(namespace, name, newTag.getName()))).build();
+    }
+  }
 
   @GET
   @Path("{tagName}")
@@ -136,7 +208,7 @@ public class TagRootResource {
           .filter(t -> tagName.equals(t.getName()))
           .findFirst()
           .orElseThrow(() -> createNotFoundException(namespace, name, tagName));
-        return Response.ok(tagToTagDtoMapper.map(tag, namespaceAndName)).build();
+        return Response.ok(tagToTagDtoMapper.map(tag, repositoryService.getRepository())).build();
       } else {
         return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
           .entity("Error on getting tag from repository.")
@@ -145,6 +217,45 @@ public class TagRootResource {
     }
   }
 
+  @DELETE
+  @Path("{tagName}")
+  @Produces(VndMediaType.TAG)
+  @Operation(summary = "Delete tag", description = "Deletes the tag provided in the path", tags = "Repository")
+  @ApiResponse(
+    responseCode = "200",
+    description = "success"
+  )
+  @ApiResponse(responseCode = "401", description = "not authenticated / invalid credentials")
+  @ApiResponse(responseCode = "403", description = "not authorized, the current user has no privileges to read the tags")
+  @ApiResponse(
+    responseCode = "404",
+    description = "not found, no tag with the specified name available in the repository",
+    content = @Content(
+      mediaType = VndMediaType.ERROR_TYPE,
+      schema = @Schema(implementation = ErrorDto.class)
+    ))
+  @ApiResponse(
+    responseCode = "500",
+    description = "internal server error",
+    content = @Content(
+      mediaType = VndMediaType.ERROR_TYPE,
+      schema = @Schema(implementation = ErrorDto.class)
+    ))
+  public Response delete(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("tagName") String tagName) throws IOException {
+    NamespaceAndName namespaceAndName = new NamespaceAndName(namespace, name);
+    try (RepositoryService repositoryService = serviceFactory.create(namespaceAndName)) {
+      RepositoryPermissions.push(repositoryService.getRepository()).check();
+
+      if (tagExists(tagName, repositoryService)) {
+        repositoryService.getTagCommand().delete()
+          .setName(tagName)
+          .execute();
+      }
+
+      return Response.noContent().build();
+    }
+  }
+
   private NotFoundException createNotFoundException(String namespace, String name, String tagName) {
     return notFound(entity("Tag", tagName).in("Repository", namespace + "/" + name));
   }
@@ -155,5 +266,9 @@ public class TagRootResource {
     return repositoryService.getTagsCommand().getTags();
   }
 
+  private boolean tagExists(String tagName, RepositoryService repositoryService) throws IOException {
+    return getTags(repositoryService)
+      .getTagByName(tagName) != null;
+  }
 
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagToTagDtoMapper.java

@@ -31,12 +31,12 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 import org.mapstruct.ObjectFactory;
-import sonia.scm.repository.NamespaceAndName;
+import sonia.scm.repository.Repository;
+import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.repository.Tag;
 import sonia.scm.web.EdisonHalAppender;
 
 import javax.inject.Inject;
-
 import java.time.Instant;
 import java.util.Optional;
 
@@ -52,17 +52,23 @@ public abstract class TagToTagDtoMapper extends HalAppenderMapper {
 
   @Mapping(target = "date", source = "date", qualifiedByName = "mapDate")
   @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
-  public abstract TagDto map(Tag tag, @Context NamespaceAndName namespaceAndName);
+  @Mapping(target = "signatures")
+  public abstract TagDto map(Tag tag, @Context Repository repository);
 
   @ObjectFactory
-  TagDto createDto(@Context NamespaceAndName namespaceAndName, Tag tag) {
+  TagDto createDto(@Context Repository repository, Tag tag) {
     Links.Builder linksBuilder = linkingTo()
-      .self(resourceLinks.tag().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), tag.getName()))
-      .single(link("sources", resourceLinks.source().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), tag.getRevision())))
-      .single(link("changeset", resourceLinks.changeset().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), tag.getRevision())));
+      .self(resourceLinks.tag().self(repository.getNamespace(), repository.getName(), tag.getName()))
+      .single(link("sources", resourceLinks.source().self(repository.getNamespace(), repository.getName(), tag.getRevision())))
+      .single(link("changeset", resourceLinks.changeset().self(repository.getNamespace(), repository.getName(), tag.getRevision())));
+
+    if (tag.getDeletable() && RepositoryPermissions.push(repository).isPermitted()) {
+      linksBuilder
+        .single(link("delete", resourceLinks.tag().delete(repository.getNamespace(), repository.getName(), tag.getName())));
+    }
 
     Embedded.Builder embeddedBuilder = embeddedBuilder();
-    applyEnrichers(new EdisonHalAppender(linksBuilder, embeddedBuilder), tag, namespaceAndName);
+    applyEnrichers(new EdisonHalAppender(linksBuilder, embeddedBuilder), tag, repository);
 
     return new TagDto(linksBuilder.build(), embeddedBuilder.build());
   }