Harden KeyContent against different line-delimiters

bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/KeyContent.java

@@ -12,9 +12,12 @@
  *******************************************************************************/
 package org.eclipse.passage.lic.base.io;
 
-import java.io.ByteArrayOutputStream;
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.stream.Collectors;
 
 import org.eclipse.passage.lic.api.LicensingException;
 import org.eclipse.passage.lic.api.io.KeyKeeper;
@@ -31,13 +34,11 @@ public KeyContent(KeyKeeper keeper) {
 	}
 
 	public byte[] get() throws LicensingException {
-		try (InputStream in = keeper.productPublicKey(); ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-			int acquired = -1;
-			byte[] buffer = new byte[1024];
-			while ((acquired = in.read(buffer)) != -1) {
-				out.write(buffer, 0, acquired);
-			}
-			return out.toByteArray();
+		try (InputStream in = keeper.productPublicKey();
+				BufferedReader reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.US_ASCII))) {
+			return reader.lines() //
+					.collect(Collectors.joining()) // filter out line-delimiters
+					.getBytes(StandardCharsets.US_ASCII);
 		} catch (IOException e) {
 			throw new LicensingException("Failed to read public key ", e); //$NON-NLS-1$
 		}

tests/org.eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/KeyKeeperWithOppositeLineDelimiterFactory.java

@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2022 IILS mbH
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0/.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IILS mbH (Hannes Wellmann) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.net.tests.io;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.eclipse.passage.lic.api.LicensingException;
+import org.eclipse.passage.lic.api.io.KeyKeeper;
+import org.eclipse.passage.lic.base.io.FileKeyKeeper;
+
+final class KeyKeeperWithOppositeLineDelimiterFactory extends TestKeyKeeperFactory {
+
+	@Override
+	public KeyKeeper get() throws LicensingException, IOException {
+		Path file = SafePayloadTest.folder.newFile("key.pub").toPath(); //$NON-NLS-1$
+		byte[] content = publicKeyLines() //
+				.collect(Collectors.joining(oppositeLineSeparator())) //
+				.getBytes(StandardCharsets.UTF_8);
+		Files.write(file, content);
+		return new FileKeyKeeper(file);
+	}
+
+	private Stream<String> publicKeyLines() throws IOException {
+		return Files.lines(publicKey());
+	}
+
+	private String oppositeLineSeparator() {
+		return "\r\n".equals(System.lineSeparator()) ? "\n" : "\r\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	}
+}

tests/org.eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/SafePayloadTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 ArSysOp
+ * Copyright (c) 2021, 2022 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,40 +9,54 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     IILS mbH (Hannes Wellmann) - Harden KeyContent against different line-delimiters
  *******************************************************************************/
 package org.eclipse.passage.lic.net.tests.io;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
 
 import org.eclipse.passage.lic.api.LicensingException;
 import org.eclipse.passage.lic.api.io.KeyKeeper;
-import org.eclipse.passage.lic.base.io.FileKeyKeeper;
 import org.eclipse.passage.lic.base.io.MD5Hashes;
 import org.eclipse.passage.lic.internal.net.io.SafePayload;
+import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public final class SafePayloadTest {
+	@ClassRule
+	public static TemporaryFolder folder = new TemporaryFolder();
+
+	@Parameter
+	public TestKeyKeeperFactory factory;
+
+	@Parameters
+	public static List<TestKeyKeeperFactory> keyKeepers() {
+		return Arrays.asList(new SimpleKeyKeeperFactory(), new KeyKeeperWithOppositeLineDelimiterFactory());
+	}
 
 	@Test
-	public void symmetric() {
+	public void symmetric() throws Throwable {
 		String original = "S0me sophisticäted Str!ng"; //$NON-NLS-1$
 		try {
-			byte[] encoded = new SafePayload(keerper(), new MD5Hashes()).encode(original.getBytes());
+			KeyKeeper keeper = new SimpleKeyKeeperFactory().get();
+			byte[] encoded = new SafePayload(keeper, new MD5Hashes()).encode(original.getBytes());
 			assertTrue(encoded.length > 0);
-			System.out.println(new String(encoded));
-			byte[] decoded = new SafePayload(keerper(), new MD5Hashes()).decode(encoded);
+			byte[] decoded = new SafePayload(this.factory.get(), new MD5Hashes()).decode(encoded);
 			assertTrue(decoded.length > 0);
 			assertEquals(original, new String(decoded));
 		} catch (LicensingException e) {
 			fail("Not intended to fail on valid data"); //$NON-NLS-1$
 		}
 	}
-
-	private KeyKeeper keerper() throws LicensingException {
-		return new FileKeyKeeper(Paths.get("resource").resolve("io").resolve("key.pub")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
 }

tests/org.eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/SimpleKeyKeeperFactory.java

@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2022 IILS mbH
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0/.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IILS mbH (Hannes Wellmann) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.net.tests.io;
+
+class SimpleKeyKeeperFactory extends TestKeyKeeperFactory {
+
+}

tests/org.eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/TestKeyKeeperFactory.java

@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2022 IILS mbH
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0/.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IILS mbH (Hannes Wellmann) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.net.tests.io;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.eclipse.passage.lic.api.LicensingException;
+import org.eclipse.passage.lic.api.io.KeyKeeper;
+import org.eclipse.passage.lic.base.io.FileKeyKeeper;
+
+abstract class TestKeyKeeperFactory {
+
+	public KeyKeeper get() throws LicensingException, IOException {
+		return new FileKeyKeeper(publicKey());
+	}
+
+	protected Path publicKey() {
+		return Paths.get("resource").resolve("io").resolve("key.pub"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	}
+}