Fix different line endings causing failure and bump version

Author: Tostino

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.wedjaa.ansible.vault</groupId>
     <artifactId>vault-utilities</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3</version>
     <build>
         <plugins>
             <plugin>

src/main/java/net/wedjaa/ansible/vault/crypto/VaultHandler.java

@@ -66,7 +66,8 @@ public static void encrypt(InputStream clearText, OutputStream cipherText, Strin
     public static void decrypt(InputStream encryptedVault, OutputStream decryptedVault, String password) throws IOException
     {
         String encryptedValue = IOUtils.toString(encryptedVault, CHAR_ENCODING);
-        decryptedVault.write(decrypt(encryptedValue.getBytes(), password));
+        String cleanedValue = Util.cleanupInput(encryptedValue);
+        decryptedVault.write(decrypt(cleanedValue.getBytes(), password));
     }
 
     public static byte[] decrypt(byte[] encrypted, String password) throws IOException

src/main/java/net/wedjaa/ansible/vault/crypto/data/Util.java

@@ -80,6 +80,15 @@ public static VaultInfo getVaultInfo(byte [] vaultData)
         return getVaultInfo(new String(vaultData));
     }
 
+    public static String cleanupInput(String input)
+    {
+        String val = input;
+        val = val.replaceAll("\\r\\n", "\n");
+        val = val.replaceAll("\\r", "\n");
+        val = val.replaceAll("\\n", System.lineSeparator());
+        return val;
+    }
+
     public static String cleanupData(String vaultData)
     {
         return vaultData.substring(vaultData.indexOf(System.lineSeparator()));

src/test/java/net/wedjaa/ansible/vault/crypto/VaultHandlerTest.java

@@ -111,4 +111,36 @@ public void testStreamInvalidVault()
         }
     }
 
+    @Test
+    public void testStreamValidVaultLF()
+    {
+        logger.info("Testing decoding vault Stream with lf - Valid password ");
+        try
+        {
+            ByteArrayOutputStream decodedStream = new ByteArrayOutputStream();
+            InputStream encodedStream = getClass().getClassLoader().getResourceAsStream("test-vault-lf.yml");
+            VaultHandler.decrypt(encodedStream, decodedStream, TEST_PASSWORD);
+            String decoded = new String(decodedStream.toByteArray());
+            assertEquals(DECODED_VAULT, decoded);
+        } catch(Exception ex) {
+            fail("Failed to decode the test vault from stream: " + ex.getMessage());
+        }
+    }
+
+    @Test
+    public void testStreamValidVaultCR()
+    {
+        logger.info("Testing decoding vault Stream with cr - Valid password ");
+        try
+        {
+            ByteArrayOutputStream decodedStream = new ByteArrayOutputStream();
+            InputStream encodedStream = getClass().getClassLoader().getResourceAsStream("test-vault-cr.yml");
+            VaultHandler.decrypt(encodedStream, decodedStream, TEST_PASSWORD);
+            String decoded = new String(decodedStream.toByteArray());
+            assertEquals(DECODED_VAULT, decoded);
+        } catch(Exception ex) {
+            fail("Failed to decode the test vault from stream: " + ex.getMessage());
+        }
+    }
+
 }

src/test/resources/test-vault-cr.yml

@@ -0,0 +1 @@
+$ANSIBLE_VAULT;1.1;AES256336431353561373531333730353765643162396335623634306366653731333761316333646333663561306635333832356137313239643335303631323662330a303464373738373932333564353634316536663063373566653437366431366562643535346431396263336536303332353064303938323231643966373262650a653664663237616138303932313663643939393539343734366662343365633765656431653865383261383966323335663562663335386363353961323161613135383961376662303266353765663637316430376362353833366566646638656234393430373531313566303066616130346130303063663636306537613334663661616361636235666361613462373066363565346436656630306363333132376138616266653264623132393535323135353032646463616137343133376234363831636436363265386135613533633335666230373263396233613334356339643239353065393238666334396232653034613263346566343639333163656633626436636364313932313436663431643964396366633264306633

src/test/resources/test-vault-lf.yml

@@ -0,0 +1,12 @@
+$ANSIBLE_VAULT;1.1;AES256
+33643135356137353133373035376564316239633562363430636665373133376131633364633366
+3561306635333832356137313239643335303631323662330a303464373738373932333564353634
+31653666306337356665343736643136656264353534643139626333653630333235306430393832
+3231643966373262650a653664663237616138303932313663643939393539343734366662343365
+63376565643165386538326138396632333566356266333538636335396132316161313538396137
+66623032663537656636373164303763623538333665666466386562343934303735313135663030
+66616130346130303063663636306537613334663661616361636235666361613462373066363565
+34643665663030636333313237613861626665326462313239353532313535303264646361613734
+31333762343638316364363632653861356135336333356662303732633962336133343563396432
+39353065393238666334396232653034613263346566343639333163656633626436636364313932
+313436663431643964396366633264306633