Merge pull request #3971 from cisagov/fix-pipeline-config

Fix Pipeline Config Rewrite
cisagov · Jun 20, 2024 · de7cdf6 · de7cdf6
2 parents 54cb571 + 1267e59
commit de7cdf6
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AngularConfigController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AngularConfigController.cs
@@ -141,8 +141,7 @@ Newtonsoft.Json.Linq.JObject processUpdatedJson(HttpRequest context)
                 document.Add("rewrittenByRedirect", "true");
 
                 JToken element = document["app"];
-
-                element["url"] = context.Host.Host;
+                element["host"] = context.Host.Host;
                 if (String.IsNullOrWhiteSpace(context.Headers["X-Forwarded-Proto"]))
                 {
                     element["protocol"] = context.Scheme;
@@ -160,7 +159,24 @@ Newtonsoft.Json.Linq.JObject processUpdatedJson(HttpRequest context)
                 }
 
                 element = document["api"];
-                element["url"] = context.Host.Host;
+                element["host"] = context.Host.Host;
+                if (String.IsNullOrWhiteSpace(context.Headers["X-Forwarded-Proto"]))
+                {
+                    element["protocol"] = context.Scheme;
+                    string port = "443";
+                    if ((context.Host.Port == 80) || (context.Host.Port == 443))
+                        port = "";
+                    else
+                        port = (context.Host.Port == null) ? "" : context.Host.Port.ToString();
+                    element["port"] = port;
+                }
+                else
+                {
+                    element["protocol"] = context.Headers["X-Forwarded-Proto"].ToString();
+                    element["port"] = context.Headers["X-Forwarded-Port"].ToString();
+                }
+
+                element = document["library"];
                 if (String.IsNullOrWhiteSpace(context.Headers["X-Forwarded-Proto"]))
                 {
                     element["protocol"] = context.Scheme;