Merge pull request #708 from armanbilge/feature/cross-platform-trusted

Cross-platform `SSL.Trusted`
typelevel · Sep 22, 2022 · 5e3d234 · 5e3d234
2 parents e45a079 + d79b7ef
commit 5e3d234
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 64 deletions.
diff --git a/modules/core/jvm/src/main/scala/SSLPlatform.scala b/modules/core/jvm/src/main/scala/SSLPlatform.scala
@@ -13,12 +13,6 @@ import fs2.io.net.Network
 import fs2.io.net.tls.TLSContext
 
 private[skunk] trait SSLCompanionPlatform { this: SSL.type =>
-
-  /** `SSL` which trusts all certificates. */
-  object Trusted extends SSL {
-    def tlsContext[F[_]: Network](implicit ev: ApplicativeError[F, Throwable]): F[TLSContext[F]] =
-      Network[F].tlsContext.insecure
-  }
 
   /** Creates a `SSL` from an `SSLContext`. */
   def fromSSLContext(ctx: SSLContext): SSL =

diff --git a/modules/core/shared/src/main/scala/SSL.scala b/modules/core/shared/src/main/scala/SSL.scala
@@ -50,6 +50,12 @@ object SSL extends SSLCompanionPlatform {
     override def withTLSParameters(tlsParameters: TLSParameters): SSL = this
   }
 
+  /** `SSL` which trusts all certificates. */
+  object Trusted extends SSL {
+    def tlsContext[F[_]: Network](implicit ev: ApplicativeError[F, Throwable]): F[TLSContext[F]] =
+      Network[F].tlsContext.insecure
+  }
+
   /** `SSL` from the system default `SSLContext`. */
   object System extends SSL {
     def tlsContext[F[_]: Network](implicit ev: ApplicativeError[F, Throwable]): F[TLSContext[F]] =

diff --git a/modules/tests/js/src/test/scala/SslTestPlatform.scala b/modules/tests/js/src/test/scala/SslTestPlatform.scala
diff --git a/modules/tests/jvm/src/test/scala/SslTestPlatform.scala b/modules/tests/jvm/src/test/scala/SslTestPlatform.scala
diff --git a/modules/tests/shared/src/test/scala/SslTest.scala b/modules/tests/shared/src/test/scala/SslTest.scala
@@ -5,20 +5,28 @@
 package tests
 
 import cats.effect._
-import cats.syntax.all._
 import fs2.io.net.tls.SSLException
 import natchez.Trace.Implicits.noop
 import skunk._
-import fs2.CompositeFailure
 
-class SslTest extends ffstest.FTest with SslTestPlatform {
+class SslTest extends ffstest.FTest {
 
   object Port {
     val Invalid = 5431
     val MD5     = 5432
     val Trust   = 5433
   }
 
+  test("successful login with SSL.Trusted (ssl available)") {
+    Session.single[IO](
+      host     = "localhost",
+      user     = "jimmy",
+      database = "world",
+      password = Some("banana"),
+      ssl      = SSL.Trusted,
+    ).use(_ => IO.unit)
+  }
+
   test("successful login with SSL.None (ssl available)") {
     Session.single[IO](
       host     = "localhost",
@@ -36,12 +44,27 @@ class SslTest extends ffstest.FTest with SslTestPlatform {
       database = "world",
       password = Some("banana"),
       ssl      = SSL.System,
+    ).use(_ => IO.unit).assertFailsWith[SSLException].as("sigh") // TODO! Better failure!
+  }
+
+  test("failed login with SSL.Trusted (ssl not available)") {
+    Session.single[IO](
+      host     = "localhost",
+      user     = "postgres",
+      database = "world",
+      ssl      = SSL.Trusted,
+      port     = Port.Trust
+    ).use(_ => IO.unit).assertFailsWith[Exception].as("ok") // TODO! Better failure!
+  }
+
+  test("successful login with SSL.Trusted.withFallback(true) (ssl not available)") {
+    Session.single[IO](
+      host     = "localhost",
+      user     = "postgres",
+      database = "world",
+      ssl      = SSL.Trusted.withFallback(true),
+      port     = Port.Trust
     ).use(_ => IO.unit)
-      .adaptError {
-        case ex @ CompositeFailure(head, tail) =>
-          tail.prepend(head).collectFirst({ case ex: SSLException => ex }).getOrElse(ex)
-        }
-      .assertFailsWith[SSLException].as("sigh") // TODO! Better failure!
   }
 
   test("successful login with SSL.None (ssl not available)") {

diff --git a/.../tests/jvm/src/test/scala/issue/238.scala → ...sts/shared/src/test/scala/issue/238.scala b/.../tests/jvm/src/test/scala/issue/238.scala → ...sts/shared/src/test/scala/issue/238.scala