Merge pull request #1934 from aml-org/W-12689953

W-12689953: add SASL security schemes
aml-org · Feb 15, 2024 · 14ded7a · 14ded7a
2 parents 74a2bf1 + 943d921
commit 14ded7a
Show file tree

Hide file tree

Showing 5 changed files with 738 additions and 54 deletions.
diff --git a/...shared/src/main/scala/amf/apicontract/internal/spec/common/parser/SettingsProducers.scala b/...shared/src/main/scala/amf/apicontract/internal/spec/common/parser/SettingsProducers.scala
@@ -42,13 +42,17 @@ object Async2SettingsProducers extends SettingsProducers {
   override def `for`(scheme: WithSettings): Map[SettingsType, Option[SettingsProducer]] = {
     val common = OasLikeCommonSettingsProducers.`for`(scheme)
     val specific: Map[SettingsType, Option[SettingsProducer]] = Map(
-      "openIdConnect"        -> Some(scheme.withOpenIdConnectSettings),
-      "http"                 -> Some(scheme.withHttpSettings),
       "userPassword"         -> None,
       "X509"                 -> None,
       "symmetricEncryption"  -> None,
       "asymmetricEncryption" -> None,
-      "httpApiKey"           -> Some(scheme.withHttpApiKeySettings)
+      "httpApiKey"           -> Some(scheme.withHttpApiKeySettings),
+      "http"                 -> Some(scheme.withHttpSettings),
+      "openIdConnect"        -> Some(scheme.withOpenIdConnectSettings),
+      "plain"                -> None,
+      "scramSha256"          -> None,
+      "scramSha512"          -> None,
+      "gssapi"               -> None
     )
     common ++ specific
   }

diff --git a/...t/shared/src/main/scala/amf/apicontract/internal/validation/model/APIRawValidations.scala b/...t/shared/src/main/scala/amf/apicontract/internal/validation/model/APIRawValidations.scala
@@ -1087,7 +1087,7 @@ object APIRawValidations extends CommonValidationDefinitions {
         owlProperty = security("type"),
         constraint = sh("pattern"),
         value =
-          "^(Api\\sKey|OAuth\\s2.0|http|httpApiKey|openIdConnect|userPassword|X509|symmetricEncryption|asymmetricEncryption|x-.+)$"
+          "^(Api\\sKey|OAuth\\s2.0|http|httpApiKey|openIdConnect|userPassword|X509|symmetricEncryption|asymmetricEncryption|plain|scramSha256|scramSha512|gssapi|x-.+)$"
       )
     ) ++ baseApiValidations("AsyncAPI")