SslOptions.x509() method doesn't allow for absolute paths fix jooby-project#2303

jknack · jknack · commit a6d93615027e · 2022-04-24T21:06:01.000-03:00
diff --git a/jooby/src/main/java/io/jooby/SslOptions.java b/jooby/src/main/java/io/jooby/SslOptions.java
@@ -11,6 +11,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
@@ -233,8 +235,21 @@ public String getType() {
    */
   public @Nonnull InputStream getResource(@Nonnull ClassLoader loader, @Nonnull String path)
       throws IOException {
-    InputStream resource = Stream
-        .of(Paths.get(path), Paths.get(System.getProperty("user.dir"), path))
+    Path filepath = Paths.get(path);
+    Stream<Path> paths;
+    if (Files.exists(filepath)) {
+      // absolute file:
+      paths = Stream.of(filepath);
+    } else {
+      try {
+        // Try relative to current dir:
+        paths = Stream.of(Paths.get(System.getProperty("user.dir"), path));
+      } catch (InvalidPathException cause) {
+        // Try with classloader:
+        paths = Stream.empty();
+      }
+    }
+    InputStream resource = paths
         .map(it -> it.normalize().toAbsolutePath())
         .filter(Files::exists)
         .findFirst()
diff --git a/jooby/src/test/java/io/jooby/Issue2303.java b/jooby/src/test/java/io/jooby/Issue2303.java
@@ -0,0 +1,48 @@
+package io.jooby;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class Issue2303 {
+
+  @Test
+  public void shouldLoadAbsoluteFile() throws IOException {
+    String crt = file("ssl", "test.crt");
+    String key = file("ssl", "test.key");
+    SslOptions ssl = SslOptions.x509(crt, key);
+    assertNotNull(ssl);
+    withResource(ssl, ssl.getCert(), Assertions::assertNotNull);
+    withResource(ssl, ssl.getPrivateKey(), Assertions::assertNotNull);
+  }
+
+  private void withResource(SslOptions ssl, String file,
+      SneakyThrows.Consumer<InputStream> consumer) throws IOException {
+    try (InputStream crtFile = ssl.getResource(getClass().getClassLoader(), file)) {
+      consumer.accept(crtFile);
+    }
+  }
+
+  private String file(String... path) {
+    Path basedir = Paths.get(System.getProperty("user.dir"));
+    if (Files.exists(basedir.resolve("jooby"))) {
+      // maven vs IDE
+      basedir = basedir.resolve("jooby");
+    }
+    Path result = basedir.resolve("src").resolve("test").resolve("resources");
+    for (String segment : path) {
+      result = result.resolve(segment);
+    }
+    result = result.normalize().toAbsolutePath();
+    assertTrue(Files.exists(result), result.toString());
+    return result.toString();
+  }
+}
