fix #3

MAIF · Mar 27, 2024 · cc4e51f · cc4e51f
1 parent a89cbb0
commit cc4e51f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/scala/io/otoroshi/wasm4s/scaladsl/wasm.scala b/src/main/scala/io/otoroshi/wasm4s/scaladsl/wasm.scala
@@ -221,13 +221,13 @@ object WasmSourceKind {
         ec: ExecutionContext
     ): Future[Either[JsValue, ByteString]] = {
       ic.wasmoSettings.flatMap {
-        case Some(settings @ WasmoSettings(url, _, _, kind, _)) => {
+        case Some(settings @ WasmoSettings(url, _, _, kind, _, tlsConfig)) => {
           val (apikeyHeader, apikey) = ApikeyHelper.generate(settings)
           val wasmoUrl = s"$url/wasm/$path"
           val followRedirect = opts.select("follow_redirect").asOpt[Boolean].getOrElse(true)
           val timeout = opts.select("timeout").asOpt[Long].map(_.millis).getOrElse(5.seconds)
           if (ic.logger.isDebugEnabled) ic.logger.debug(s"[WasmSourceKind Wasmo] fetching wasm from source at GET ${wasmoUrl}")
-          ic.url(wasmoUrl)
+          ic.url(wasmoUrl, tlsConfig)
             .withFollowRedirects(followRedirect)
             .withRequestTimeout(timeout)
             .withHttpHeaders(

diff --git a/src/main/scala/io/otoroshi/wasm4s/scaladsl/wasmo.scala b/src/main/scala/io/otoroshi/wasm4s/scaladsl/wasmo.scala
@@ -1,6 +1,7 @@
 package io.otoroshi.wasm4s.scaladsl
 
 import io.otoroshi.wasm4s.scaladsl.implicits._
+import io.otoroshi.wasm4s.scaladsl.security.TlsConfig
 import play.api.libs.json._
 
 import scala.util.{Failure, Success, Try}
@@ -11,6 +12,7 @@ case class WasmoSettings(
   clientSecret: String = "admin-api-apikey-secret",
   pluginsFilter: Option[String] = Some("*"),
   legacyAuth: Boolean = false,
+  tlsConfig: Option[TlsConfig] = None,
 ) {
   def json: JsValue = WasmoSettings.format.writes(this)
 }
@@ -24,6 +26,7 @@ object WasmoSettings {
         "clientSecret"  -> o.clientSecret,
         "legacyAuth"  -> o.legacyAuth,
         "pluginsFilter" -> o.pluginsFilter.map(JsString).getOrElse(JsNull).as[JsValue],
+        "tlsConfig" -> o.tlsConfig.map(_.json).getOrElse(JsNull).as[JsValue],
       )
 
     override def reads(json: JsValue): JsResult[WasmoSettings] =
@@ -34,6 +37,7 @@ object WasmoSettings {
           clientSecret = (json \ "clientSecret").asOpt[String].getOrElse("admin-api-apikey-secret"),
           legacyAuth = (json \ "legacyAuth").asOpt[Boolean].getOrElse(false),
           pluginsFilter = (json \ "pluginsFilter").asOpt[String].getOrElse("*").some,
+          tlsConfig = json.select("tls").asOpt(TlsConfig.format).orElse(json.select("tls_config").asOpt(TlsConfig.format))
         )
       } match {
         case Failure(e)  => JsError(e.getMessage)