implementation and unit tests

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/ScmGpgSigner.java

@@ -1,5 +1,4 @@
 /*
- *
  * MIT License
  *
  * Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -46,7 +45,7 @@ public class ScmGpgSigner extends GpgSigner {
   }
 
   @Override
-  public void sign(CommitBuilder commitBuilder, String s, PersonIdent personIdent, CredentialsProvider credentialsProvider) throws CanceledException {
+  public void sign(CommitBuilder commitBuilder, String keyId, PersonIdent personIdent, CredentialsProvider credentialsProvider) throws CanceledException {
     try {
       final byte[] signature = this.gpg.getPrivateKey().sign(commitBuilder.build());
       commitBuilder.setGpgSignature(new GpgSignature(signature));
@@ -56,7 +55,7 @@ public class ScmGpgSigner extends GpgSigner {
   }
 
   @Override
-  public boolean canLocateSigningKey(String s, PersonIdent personIdent, CredentialsProvider credentialsProvider) throws CanceledException {
+  public boolean canLocateSigningKey(String keyId, PersonIdent personIdent, CredentialsProvider credentialsProvider) throws CanceledException {
     return true;
   }
 }

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/ScmGpgSignerInitializer.java

@@ -1,5 +1,4 @@
 /*
- *
  * MIT License
  *
  * Copyright (c) 2020-present Cloudogu GmbH and Contributors

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java

@@ -63,11 +63,9 @@ import static sonia.scm.NotFoundException.notFound;
 //~--- JDK imports ------------------------------------------------------------
 
 /**
- *
  * @author Sebastian Sdorra
  */
-class AbstractGitCommand
-{
+class AbstractGitCommand {
 
   /**
    * the logger for AbstractGitCommand
@@ -77,11 +75,9 @@ class AbstractGitCommand
   /**
    * Constructs ...
    *
-   *  @param context
-   *
+   * @param context
    */
-  AbstractGitCommand(GitContext context)
-  {
+  AbstractGitCommand(GitContext context) {
     this.repository = context.getRepository();
     this.context = context;
   }
@@ -91,19 +87,16 @@ class AbstractGitCommand
   /**
    * Method description
    *
-   *
    * @return
-   *
    * @throws IOException
    */
-  Repository open() throws IOException
-  {
+  Repository open() throws IOException {
     return context.open();
   }
 
   ObjectId getCommitOrDefault(Repository gitRepository, String requestedCommit) throws IOException {
     ObjectId commit;
-    if ( Strings.isNullOrEmpty(requestedCommit) ) {
+    if (Strings.isNullOrEmpty(requestedCommit)) {
       commit = getDefaultBranch(gitRepository);
     } else {
       commit = gitRepository.resolve(requestedCommit);
@@ -121,7 +114,7 @@ class AbstractGitCommand
   }
 
   Ref getBranchOrDefault(Repository gitRepository, String requestedBranch) throws IOException {
-    if ( Strings.isNullOrEmpty(requestedBranch) ) {
+    if (Strings.isNullOrEmpty(requestedBranch)) {
       String defaultBranchName = context.getConfig().getDefaultBranch();
       if (!Strings.isNullOrEmpty(defaultBranchName)) {
         return GitUtil.getBranchId(gitRepository, defaultBranchName);
@@ -226,7 +219,7 @@ class AbstractGitCommand
       }
     }
 
-    Optional<RevCommit> doCommit(String message, Person author) {
+    Optional<RevCommit> doCommit(String message, Person author, boolean signingDisabled) {
       Person authorToUse = determineAuthor(author);
       try {
         Status status = clone.status().call();
@@ -235,6 +228,8 @@ class AbstractGitCommand
             .setAuthor(authorToUse.getName(), authorToUse.getMail())
             .setCommitter("SCM-Manager", "noreply@scm-manager.org")
             .setMessage(message)
+            .setSign(!signingDisabled)
+            .setSigningKey(signingDisabled ? null : "SCM-MANAGER-DEFAULT-KEY")
             .call());
         } else {
           return empty();
@@ -294,9 +289,13 @@ class AbstractGitCommand
 
   //~--- fields ---------------------------------------------------------------
 
-  /** Field description */
+  /**
+   * Field description
+   */
   protected GitContext context;
 
-  /** Field description */
+  /**
+   * Field description
+   */
   protected sonia.scm.repository.Repository repository;
 }

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java

@@ -56,6 +56,7 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
   private final ObjectId revisionToMerge;
   private final Person author;
   private final String messageTemplate;
+  private final boolean signingDisabled;
 
   GitMergeStrategy(Git clone, MergeCommandRequest request, GitContext context, sonia.scm.repository.Repository repository) {
     super(clone, context, repository);
@@ -63,6 +64,7 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
     this.branchToMerge = request.getBranchToMerge();
     this.author = request.getAuthor();
     this.messageTemplate = request.getMessageTemplate();
+    this.signingDisabled = request.isSigningDisabled();
     try {
       this.targetRevision = resolveRevision(request.getTargetBranch());
       this.revisionToMerge = resolveRevision(request.getBranchToMerge());
@@ -88,7 +90,7 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
 
   Optional<RevCommit> doCommit() {
     logger.debug("merged branch {} into {}", branchToMerge, targetBranch);
-    return doCommit(MessageFormat.format(determineMessageTemplate(), branchToMerge, targetBranch), author);
+    return doCommit(MessageFormat.format(determineMessageTemplate(), branchToMerge, targetBranch), author, signingDisabled);
   }
 
   MergeCommandResult createSuccessResult(String newRevision) {

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModifyCommand.java

@@ -38,6 +38,7 @@ import sonia.scm.repository.GitRepositoryHandler;
 import sonia.scm.repository.GitWorkingCopyFactory;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Repository;
+import sonia.scm.security.GPG;
 import sonia.scm.web.lfs.LfsBlobStoreFactory;
 
 import javax.inject.Inject;
@@ -93,7 +94,7 @@ public class GitModifyCommand extends AbstractGitCommand implements ModifyComman
         r.execute(this);
       }
       failIfNotChanged(() -> new NoChangesMadeException(repository, ModifyWorker.this.request.getBranch()));
-      Optional<RevCommit> revCommit = doCommit(request.getCommitMessage(), request.getAuthor());
+      Optional<RevCommit> revCommit = doCommit(request.getCommitMessage(), request.getAuthor(), request.isSigningDisabled());
       push();
       return revCommit.orElseThrow(() -> new NoChangesMadeException(repository, ModifyWorker.this.request.getBranch())).name();
     }