HTTP ResponseStatusCode

azure-ad-b2c · Jan 1, 2024 · 1c4d67c · 1c4d67c
1 parent 44f4ca6
commit 1c4d67c
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 33 deletions.
diff --git a/Areas/oauth2/Controllers/AuthorizeController.cs b/Areas/oauth2/Controllers/AuthorizeController.cs
@@ -69,7 +69,7 @@ public RedirectResult SignIn(string tenantId, string email, string password, str
             if (client_id == "default")
                 URL = URL + $"&id_token={id_token}";
 
-            Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, URL);
+            Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, null, URL);
             return Redirect(URL);
 
         }

diff --git a/Areas/oauth2/Controllers/OpenIdConfigurationController.cs b/Areas/oauth2/Controllers/OpenIdConfigurationController.cs
@@ -42,7 +42,7 @@ public IActionResult Index(string tenantId)
             // Check if service availble
             if (!settings.GetOAuth2Settings().OpenIdConfiguration.Enabled)
             {
-                Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, JsonSerializer.Serialize(new { error = "Service unavailable" }));
+                Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, null, null, JsonSerializer.Serialize(new { error = "Service unavailable" }));
                 return BadRequest(new { error = "Service unavailable" });
             }
 
@@ -72,7 +72,7 @@ public IActionResult Index(string tenantId)
                 IdTokenSigningAlgValuesSupported = new[] { OpenIdConfigurationController.SigningCredentials.Value.Algorithm }
             };
 
-            Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, JsonSerializer.Serialize(payload));
+            Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, null, JsonSerializer.Serialize(payload));
 
             return Ok(payload);
         }

diff --git a/Areas/oauth2/Controllers/OpenIdKeysController.cs b/Areas/oauth2/Controllers/OpenIdKeysController.cs
@@ -42,7 +42,7 @@ public ActionResult Index(string tenantId)
             // Check if service availble
             if (!settings.GetOAuth2Settings().JWKs.Enabled)
             {
-                Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, JsonSerializer.Serialize(new { error = "Service unavailable" }));
+                Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, null, JsonSerializer.Serialize(new { error = "Service unavailable" }));
                 return BadRequest(new { error = "Service unavailable" });
             }
 

diff --git a/Areas/oauth2/Controllers/TokenController.cs b/Areas/oauth2/Controllers/TokenController.cs
@@ -43,7 +43,7 @@ public async Task<IActionResult> IndexAsyncGet(string tenantId, string code)
             // Check if HTTP GET is allowed
             if (!settings.GetOAuth2Settings().Token.HttpMethods.GET)
             {
-                await Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, JsonSerializer.Serialize(new { error = "GET request is not allowed." }));
+                await Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, null, JsonSerializer.Serialize(new { error = "GET request is not allowed." }));
                 return BadRequest(new { error = "GET request is not allowed." });
             }
 
@@ -141,7 +141,7 @@ private async Task<IActionResult> IndexCommonAsync(string tenantId, string code)
                     tenantId = tenantId
                 };
 
-                await Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, JsonSerializer.Serialize(payload));
+                await Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, null, JsonSerializer.Serialize(payload));
 
                 return new OkObjectResult(payload);
             }

diff --git a/Areas/oauth2/Controllers/UserInfoController.cs b/Areas/oauth2/Controllers/UserInfoController.cs
@@ -72,7 +72,7 @@ public IActionResult Index(string tenantId)
                 payload.Add(item.Type, item.Value);
             }
 
-            Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, JsonSerializer.Serialize(payload));
+            Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, null, JsonSerializer.Serialize(payload));
 
             return Ok(payload);
         }

diff --git a/Areas/proxy/Controllers/OpenIdConfigurationController.cs b/Areas/proxy/Controllers/OpenIdConfigurationController.cs
@@ -36,6 +36,8 @@ public OpenIdConfigurationController(ILogger<OpenIdConfigurationController> logg
         [ActionName("invoke")]
         public async Task<IActionResult> IndexGetAsync(string tenantId, string id)
         {
+            HttpResponseMessage response = null;
+
             // Get the tenant settings
             SettingsEntity settings = _settingsService.GetConfig(tenantId);
 
@@ -44,12 +46,12 @@ public async Task<IActionResult> IndexGetAsync(string tenantId, string id)
             // Check if HTTP GET is allowed
             if (string.IsNullOrEmpty(id))
             {
-                await Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, JsonSerializer.Serialize(new { error = "Target token URL is not configured." }));
+                await Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, null, JsonSerializer.Serialize(new { error = "Target token URL is not configured." }));
                 return BadRequest(new { error = "Cannot find the target identity provider well known configuration endpoint." });
             }
             try
             {
-                HttpResponseMessage response = await CallIdentityProviderAsync(tenantId, Uri.UnescapeDataString(id));
+                response = await CallIdentityProviderAsync(tenantId, Uri.UnescapeDataString(id));
 
                 // Read the input claims from the response body
                 string body = await response.Content.ReadAsStringAsync();
@@ -60,13 +62,13 @@ public async Task<IActionResult> IndexGetAsync(string tenantId, string id)
                 payload.TokenEndpoint = Url.ActionLink("Invoke", "Token", new { Area = "proxy", tenantId = tenantId }) + "/" + HttpRequestHelper.Base64Encode(payload.TokenEndpoint);
                 payload.UserInfoEndpoint = Url.ActionLink("Invoke", "UserInfo", new { Area = "proxy", tenantId = tenantId }) + "/" + HttpRequestHelper.Base64Encode(payload.UserInfoEndpoint);
 
-                Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT + "End", JsonSerializer.Serialize(payload)).Wait();
+                Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT + "End", response, JsonSerializer.Serialize(payload)).Wait();
 
                 return Ok(payload);
             }
             catch (System.Exception ex)
             {
-                Commons.LogError(Request, _telemetry, settings, tenantId, EVENT + "Error", ex.Message);
+                Commons.LogError(Request, _telemetry, settings, tenantId, EVENT + "Error", ex.Message, response);
                 return BadRequest(new { error = ex.Message });
             }
         }

diff --git a/Areas/proxy/Controllers/TokenController.cs b/Areas/proxy/Controllers/TokenController.cs
@@ -37,31 +37,34 @@ public TokenController(ILogger<TokenController> logger, TelemetryClient telemetr
         [ActionName("invoke")]
         public async Task<IActionResult> IndexGetAsync(string tenantId, string id)
         {
+            HttpResponseMessage response = null;
+
             // Get the tenant settings
             SettingsEntity settings = _settingsService.GetConfig(tenantId);
 
-            Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT + "Start", null, JsonSerializer.Serialize(new { Action = "Start reverse proxy", URL = id })).Wait();
+            Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT + "Start", null, null, JsonSerializer.Serialize(new { Action = "Start reverse proxy", URL = id })).Wait();
 
-            // Check if HTTP GET is allowed
+            // Check if the custom IDP tenant ID exists
             if (string.IsNullOrEmpty(id))
             {
-                await Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, JsonSerializer.Serialize(new { error = "Target token URL is not configured." }));
+                await Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, null, JsonSerializer.Serialize(new { error = "Target token URL is not configured." }));
                 return BadRequest(new { error = "Cannot find the target identity provider token endpoint." });
             }
+
             try
             {
-                HttpResponseMessage response = await CallIdentityProviderAsync(tenantId, id);
+                response = await CallIdentityProviderAsync(tenantId, id);
 
                 // Read the input claims from the response body
                 string body = await response.Content.ReadAsStringAsync();
 
-                Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT + "End", body).Wait();
+                Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT + "End", response, body).Wait();
 
                 return new HttpResponseMessageResult(response);
             }
             catch (System.Exception ex)
             {
-                Commons.LogError(Request, _telemetry, settings, tenantId, EVENT + "Error", ex.Message);
+                Commons.LogError(Request, _telemetry, settings, tenantId, EVENT + "Error", ex.Message, response);
                 return BadRequest(new { error = ex.Message });
             }
 

diff --git a/Areas/proxy/Controllers/UserInfoController.cs b/Areas/proxy/Controllers/UserInfoController.cs
@@ -37,31 +37,32 @@ public UserInfoController(ILogger<UserInfoController> logger, TelemetryClient te
         [ActionName("invoke")]
         public async Task<IActionResult> IndexGetAsync(string tenantId, string id)
         {
+            HttpResponseMessage response = null;
             // Get the tenant settings
             SettingsEntity settings = _settingsService.GetConfig(tenantId);
 
-            Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT + "Start", null, JsonSerializer.Serialize(new { Action = "Start reverse proxy", URL = id })).Wait();
+            Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT + "Start", null, null, JsonSerializer.Serialize(new { Action = "Start reverse proxy", URL = id })).Wait();
 
             // Check if HTTP GET is allowed
             if (string.IsNullOrEmpty(id))
             {
-                await Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, JsonSerializer.Serialize(new { error = "Target token URL is not configured." }));
+                await Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT, null, JsonSerializer.Serialize(new { error = "Target token URL is not configured." }));
                 return BadRequest(new { error = "Cannot find the target identity provider token endpoint." });
             }
             try
             {
-                HttpResponseMessage response = await CallIdentityProviderAsync(tenantId, Uri.UnescapeDataString(id));
+                 response = await CallIdentityProviderAsync(tenantId, Uri.UnescapeDataString(id));
 
                 // Read the input claims from the response body
                 string body = await response.Content.ReadAsStringAsync();
 
-                Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT + "End", body).Wait();
+                Commons.LogRequestAsync(Request, _telemetry, settings, tenantId, EVENT + "End", response, body).Wait();
 
                 return new HttpResponseMessageResult(response);
             }
             catch (System.Exception ex)
             {
-                Commons.LogError(Request, _telemetry, settings, tenantId, EVENT + "Error", ex.Message);
+                Commons.LogError(Request, _telemetry, settings, tenantId, EVENT + "Error", ex.Message, response);
                 return BadRequest(new { error = ex.Message });
             }
         }

diff --git a/Commons.cs b/Commons.cs
@@ -71,12 +71,14 @@ public static string BuildJwtToken(X509SigningCredentials SigningCredentials, Ht
             return jwtHandler.WriteToken(token);
         }
 
-        public static async Task LogRequestAsync(HttpRequest Request,
+        public static async Task LogRequestAsync(
+            HttpRequest Request,
             TelemetryClient telemetry,
             SettingsEntity settings,
             string tenantId,
             string page,
-            string? response = null,
+            HttpResponseMessage Response = null,
+            string? responseBody = null,
             string? additionalData = null)
         {
             if (string.IsNullOrEmpty(settings.InstrumentationKey))
@@ -91,8 +93,8 @@ public static async Task LogRequestAsync(HttpRequest Request,
 
             Dictionary<string, string> log = new Dictionary<string, string>();
 
-            log.Add("Method", Request.Method);
-            log.Add("URL", $"{Request.Scheme}://{Request.Host}{Request.Path}{Request.QueryString}");
+            log.Add("RequestMethod", Request.Method);
+            log.Add("RequestURL", $"{Request.Scheme}://{Request.Host}{Request.Path}{Request.QueryString}");
             log.Add("TenantId", tenantId);
 
             // Get the target URL
@@ -105,7 +107,7 @@ public static async Task LogRequestAsync(HttpRequest Request,
 
             // Request headers
             string headers = JsonSerializer.Serialize(Request.Headers);
-            log.Add("Headers", headers);
+            log.Add("RequestHeaders", headers);
 
             // Request body
             try
@@ -116,7 +118,7 @@ public static async Task LogRequestAsync(HttpRequest Request,
                     using (StreamReader stream = new StreamReader(Request.Body))
                     {
                         body = await stream.ReadToEndAsync();
-                        log.Add("Body", body);
+                        log.Add("RequestBody", body);
                     }
                 }
             }
@@ -129,10 +131,16 @@ public static async Task LogRequestAsync(HttpRequest Request,
                 throw;
             }
 
+            // Response body
+            if (Response != null)
+            {
+                log.Add("ResponseStatusCode", Response.StatusCode.ToString());
+            }
 
-            if (!string.IsNullOrEmpty(response))
+            // Response body
+            if (!string.IsNullOrEmpty(responseBody))
             {
-                log.Add("Response", response);
+                log.Add("ResponseBody", responseBody);
             }
 
             if (!string.IsNullOrEmpty(additionalData))
@@ -143,7 +151,7 @@ public static async Task LogRequestAsync(HttpRequest Request,
             telemetry.TrackEvent($"{tenantId}_{page}", log);
             telemetry.Flush();
         }
-        public static void LogError(HttpRequest Request, TelemetryClient telemetry, SettingsEntity settings, string tenantId, string page, string error)
+        public static void LogError(HttpRequest Request, TelemetryClient telemetry, SettingsEntity settings, string tenantId, string page, string error, HttpResponseMessage Response = null)
         {
             if (string.IsNullOrEmpty(settings.InstrumentationKey))
             {
@@ -153,10 +161,17 @@ public static void LogError(HttpRequest Request, TelemetryClient telemetry, Sett
             telemetry.InstrumentationKey = settings.InstrumentationKey;
 
             Dictionary<string, string> log = new Dictionary<string, string>();
-            log.Add("Method", Request.Method);
-            log.Add("URL", $"{Request.Scheme}://{Request.Host}{Request.Path}{Request.QueryString}");
+            log.Add("RequestMethod", Request.Method);
+            log.Add("RequestURL", $"{Request.Scheme}://{Request.Host}{Request.Path}{Request.QueryString}");
             log.Add("Error", error);
             log.Add("TenantId", tenantId);
+
+            // Response body
+            if (Response != null)
+            {
+                log.Add("ResponseStatusCode", Response.StatusCode.ToString());
+            }
+
             telemetry.TrackEvent($"{tenantId}_{page}", log);
             telemetry.Flush();
         }