[MGPG-136] Windows passphrase corruption

src/main/java/org/apache/maven/plugins/gpg/AbstractGpgMojo.java

@@ -270,6 +270,26 @@ public abstract class AbstractGpgMojo extends AbstractMojo {
     @Parameter(property = "gpg.bestPractices", defaultValue = "false")
     private boolean bestPractices;
 
+    /**
+     * Whether to append the passphrase with LF character or not, as on some systems and some GPG executable combinations
+     * lack of this character may cause some issues. Since 3.2.0 this character was appended, but as
+     * {@link System#lineSeparator()} which in turn causes issues in binary handling of stdin (as I assume GPG does),
+     * since on windows this is {@code "\r\n"} (while on Unix-relatives is only {@code "\n"}, and GPG handles only
+     * {@code "\n"}. This may lead to "corruption" of passphrase with one extra {@code "\r"} character. This parameter
+     * affects ONLY the GPG signer, not the BC signer.
+     * <p>
+     * By default, this parameter is {@code null} and plugin will behave as pre-3.2.7 versions. If this parameter is
+     * explicitly set to {@code true}, it will append passphrase with {@code "\n"} character ONLY (as opposed to pre-3.2.7
+     * behaviour where it used {@link System#lineSeparator()} and used {@code "\r\n"}. If this parameter is
+     * explicitly set to {@code false}, the passphrase is used as-is, nothing is appended.
+     *
+     * @since 3.2.7
+     * @see <a href="https://issues.apache.org/jira/browse/MGPG-99">MGPG-99</a>
+     * @see <a href="https://issues.apache.org/jira/browse/MGPG-136">MGPG-136</a>
+     */
+    @Parameter(property = "gpg.passphraseLf")
+    private Boolean passphraseLf;
+
     /**
      * Current user system settings for use in Maven.
      *
@@ -345,6 +365,7 @@ protected AbstractGpgSigner newSigner(MavenProject mavenProject) throws MojoFail
         signer.setPublicKeyring(publicKeyring);
         signer.setLockMode(lockMode);
         signer.setArgs(gpgArguments);
+        signer.setPassphraseLf(passphraseLf);
 
         // "new way": env prevails
         String passphrase =

src/main/java/org/apache/maven/plugins/gpg/AbstractGpgSigner.java

@@ -46,6 +46,8 @@ public abstract class AbstractGpgSigner {
 
     protected String passphrase;
 
+    protected Boolean passphraseLf;
+
     private File outputDir;
 
     private File buildDir;
@@ -98,6 +100,10 @@ public void setPassPhrase(String s) {
         passphrase = s;
     }
 
+    public void setPassphraseLf(Boolean b) {
+        this.passphraseLf = b;
+    }
+
     public void setOutputDirectory(File out) {
         outputDir = out;
     }

src/main/java/org/apache/maven/plugins/gpg/GpgSigner.java

@@ -112,11 +112,20 @@ protected void generateSignatureForFile(File file, File signature) throws MojoEx
             cmd.createArg().setValue("--passphrase-fd");
             cmd.createArg().setValue("0");
 
-            // Prepare the input stream which will be used to pass the passphrase to the executable
-            if (!passphrase.endsWith(System.lineSeparator())) {
-                in = new ByteArrayInputStream((passphrase + System.lineSeparator()).getBytes());
+            // obey passphraseLf
+            if (passphraseLf != null) {
+                if (passphraseLf) {
+                    in = new ByteArrayInputStream((passphrase + '\n').getBytes());
+                } else {
+                    in = new ByteArrayInputStream((passphrase).getBytes());
+                }
             } else {
-                in = new ByteArrayInputStream(passphrase.getBytes());
+                // Prepare the input stream which will be used to pass the passphrase to the executable
+                if (!passphrase.endsWith(System.lineSeparator())) {
+                    in = new ByteArrayInputStream((passphrase + System.lineSeparator()).getBytes());
+                } else {
+                    in = new ByteArrayInputStream(passphrase.getBytes());
+                }
             }
         }