Merge pull request #13 from kdesao-devops/keycloack-migration

Keycloack migration
BCDevOps · Feb 8, 2023 · d60f184 · d60f184
2 parents 5b520ae + ff4a801
commit d60f184
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lambda/samlpost/index.html b/lambda/samlpost/index.html
@@ -194,9 +194,12 @@
         decodedSAMLResponse
       )}/protocol/saml/clients/amazon-aws`;
 
-      const logoutURL = `${getSAMLIssuer(
-        decodedSAMLResponse
-      )}/protocol/openid-connect/logout`;
+      const samlIssuerURL = getSAMLIssuer(decodedSAMLResponse)
+      const CaptureURLRegex = new RegExp(
+        "((http[s]):\\/?\\/?[^:\\/\\s]+)(\\/\\w+)*\\/[\\w\\-\\.]+[^#?\\s]+.*?(#[\\w\\-]+)?$"
+      )
+      let ParsedURL = samlIssuerURL.match(CaptureURLRegex)
+      const logoutURL = `${ParsedURL[1]}/auth/realms/standard/protocol/openid-connect/logout`
 
       $("#logout").html(
         `<a href="${logoutURL}?redirect_uri=${encodeURIComponent(
@@ -406,7 +409,7 @@
     function parseSAMLResponse(samlResponse) {
       //let capturingRegex = new RegExp(">(?<provider>arn:aws:iam::\\d+:saml-provider/\\S+),(?<role>arn:aws::iam::(?<accountid>\\d+):role/(?<rolename>\\w+))<");
       let capturingRegex = new RegExp(
-        ">(arn:aws:iam::\\d+:saml-provider/\\S+),(arn:aws:iam::(\\d+):role/(\\w+))<",
+        ">(arn:aws:iam::\\d+:saml-provider/[a-zA-Z0-9-_@=+.]+),(arn:aws:iam::(\\d+):role/([a-zA-Z0-9-_@=+.]+))<",
         "gi"
       );
       ///>(arn:aws:iam::\d+:saml-provider\/\S+),(arn:aws:iam::(\d+):role\/(\w+))</gi

diff --git a/lambda/samlpost/index.js b/lambda/samlpost/index.js
@@ -221,7 +221,7 @@ exports.handler = function (event, context, callback) {
 
 function parseSAMLResponse(samlResponse) {
     //let capturingRegex = new RegExp(">(?<provider>arn:aws:iam::\\d+:saml-provider/\\S+),(?<role>arn:aws::iam::(?<accountid>\\d+):role/(?<rolename>\\w+))<");
-    let capturingRegex = new RegExp(">(arn:aws:iam::\\d+:saml-provider/\\S+),(arn:aws:iam::(\\d+):role/(\\w+))<", "gi");
+    let capturingRegex = new RegExp(">(arn:aws:iam::\\d+:saml-provider/[a-zA-Z0-9-_@=+.]+),(arn:aws:iam::(\\d+):role/([a-zA-Z0-9-_@=+.]+))<", "gi");
     ///>(arn:aws:iam::\d+:saml-provider\/\S+),(arn:aws:iam::(\d+):role\/(\w+))</gi
     let matches = samlResponse.matchAll(capturingRegex);