Updates request log plugins to consider URLs to watch. Closes #1081 (#1084)

waldekmastykarz · web-flow · commit 572449446149 · 2025-03-29T09:44:26.000+01:00
diff --git a/dev-proxy-plugins/RequestLogs/ApiCenterMinimalPermissionsPlugin.cs b/dev-proxy-plugins/RequestLogs/ApiCenterMinimalPermissionsPlugin.cs
@@ -95,6 +95,7 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
                 l.MessageType == MessageType.InterceptedRequest &&
                 !l.Message.StartsWith("OPTIONS") &&
                 l.Context?.Session is not null &&
+                ProxyUtils.MatchesUrlToWatch(UrlsToWatch, l.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri) &&
                 l.Context.Session.HttpClient.Request.Headers.Any(h => h.Name.Equals("authorization", StringComparison.OrdinalIgnoreCase))
             );
         if (!interceptedRequests.Any())
diff --git a/dev-proxy-plugins/RequestLogs/ApiCenterOnboardingPlugin.cs b/dev-proxy-plugins/RequestLogs/ApiCenterOnboardingPlugin.cs
@@ -118,7 +118,8 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
                 var methodAndUrl = request.Message.Split(' ');
                 return (method: methodAndUrl[0], url: methodAndUrl[1]);
             })
-            .Where(r => !r.method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))
+            .Where(r => !r.method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase) &&
+                ProxyUtils.MatchesUrlToWatch(UrlsToWatch, r.url))
             .Distinct();
 
         var existingApis = new List<ApiCenterOnboardingPluginReportExistingApiInfo>();
diff --git a/dev-proxy-plugins/RequestLogs/ApiCenterProductionVersionPlugin.cs b/dev-proxy-plugins/RequestLogs/ApiCenterProductionVersionPlugin.cs
@@ -90,7 +90,8 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
         var interceptedRequests = e.RequestLogs
             .Where(
                 l => l.MessageType == MessageType.InterceptedRequest &&
-                l.Context?.Session is not null
+                l.Context?.Session is not null &&
+                ProxyUtils.MatchesUrlToWatch(UrlsToWatch, l.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri)
             );
         if (!interceptedRequests.Any())
         {
diff --git a/dev-proxy-plugins/RequestLogs/GraphMinimalPermissionsGuidancePlugin.cs b/dev-proxy-plugins/RequestLogs/GraphMinimalPermissionsGuidancePlugin.cs
@@ -94,6 +94,12 @@ private async Task AfterRecordingStopAsync(object? sender, RecordingArgs e)
             {
                 continue;
             }
+
+            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.url))
+            {
+                Logger.LogDebug("URL not matched: {url}", methodAndUrl.url);
+                continue;
+            }
             
             var requestsFromBatch = Array.Empty<(string method, string url)>();
 
diff --git a/dev-proxy-plugins/RequestLogs/GraphMinimalPermissionsPlugin.cs b/dev-proxy-plugins/RequestLogs/GraphMinimalPermissionsPlugin.cs
@@ -64,6 +64,12 @@ private async Task AfterRecordingStopAsync(object? sender, RecordingArgs e)
                 continue;
             }
 
+            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.url))
+            {
+                Logger.LogDebug("URL not matched: {url}", methodAndUrl.url);
+                continue;
+            }
+
             var uri = new Uri(methodAndUrl.url);
             if (!ProxyUtils.IsGraphUrl(uri))
             {
diff --git a/dev-proxy-plugins/RequestLogs/HttpFileGeneratorPlugin.cs b/dev-proxy-plugins/RequestLogs/HttpFileGeneratorPlugin.cs
@@ -139,7 +139,8 @@ private async Task<HttpFile> GetHttpRequestsAsync(IEnumerable<RequestLog> reques
         {
             if (request.MessageType != MessageType.InterceptedResponse ||
               request.Context is null ||
-              request.Context.Session is null)
+              request.Context.Session is null ||
+              !ProxyUtils.MatchesUrlToWatch(UrlsToWatch, request.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri))
             {
                 continue;
             }
diff --git a/dev-proxy-plugins/RequestLogs/MinimalCsomPermissionsPlugin.cs b/dev-proxy-plugins/RequestLogs/MinimalCsomPermissionsPlugin.cs
@@ -74,7 +74,6 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
             .Where(l =>
                 l.MessageType == MessageType.InterceptedRequest &&
                 l.Message.StartsWith("POST") &&
-                l.Message.Contains(".sharepoint.com", StringComparison.InvariantCultureIgnoreCase) &&
                 l.Message.Contains("/_vti_bin/client.svc/ProcessQuery", StringComparison.InvariantCultureIgnoreCase)
             );
         if (!interceptedRequests.Any())
@@ -95,6 +94,12 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
                 continue;
             }
 
+            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, request.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri))
+            {
+                Logger.LogDebug("URL not matched: {url}", request.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri);
+                continue;
+            }
+
             var requestBody = await request.Context.Session.GetRequestBodyAsString();
             if (string.IsNullOrEmpty(requestBody))
             {
diff --git a/dev-proxy-plugins/RequestLogs/MinimalPermissionsGuidancePlugin.cs b/dev-proxy-plugins/RequestLogs/MinimalPermissionsGuidancePlugin.cs
@@ -71,6 +71,7 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
                 l.MessageType == MessageType.InterceptedRequest &&
                 !l.Message.StartsWith("OPTIONS") &&
                 l.Context?.Session is not null &&
+                ProxyUtils.MatchesUrlToWatch(UrlsToWatch, l.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri) &&
                 l.Context.Session.HttpClient.Request.Headers.Any(h => h.Name.Equals("authorization", StringComparison.OrdinalIgnoreCase))
             );
         if (!interceptedRequests.Any())
diff --git a/dev-proxy-plugins/RequestLogs/MinimalPermissionsPlugin.cs b/dev-proxy-plugins/RequestLogs/MinimalPermissionsPlugin.cs
@@ -68,7 +68,8 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
             .Where(l =>
                 l.MessageType == MessageType.InterceptedRequest &&
                 !l.Message.StartsWith("OPTIONS") &&
-                l.Context?.Session is not null
+                l.Context?.Session is not null &&
+                ProxyUtils.MatchesUrlToWatch(UrlsToWatch, l.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri)
             );
         if (!interceptedRequests.Any())
         {
diff --git a/dev-proxy-plugins/RequestLogs/MockGeneratorPlugin.cs b/dev-proxy-plugins/RequestLogs/MockGeneratorPlugin.cs
@@ -39,7 +39,8 @@ private async Task AfterRecordingStopAsync(object? sender, RecordingArgs e)
         {
             if (request.MessageType != MessageType.InterceptedResponse ||
               request.Context is null ||
-              request.Context.Session is null)
+              request.Context.Session is null ||
+              !ProxyUtils.MatchesUrlToWatch(UrlsToWatch, request.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri))
             {
                 continue;
             }
diff --git a/dev-proxy-plugins/RequestLogs/OpenApiSpecGeneratorPlugin.cs b/dev-proxy-plugins/RequestLogs/OpenApiSpecGeneratorPlugin.cs
@@ -331,7 +331,8 @@ private async Task AfterRecordingStopAsync(object? sender, RecordingArgs e)
         {
             if (request.MessageType != MessageType.InterceptedResponse ||
               request.Context is null ||
-              request.Context.Session is null)
+              request.Context.Session is null ||
+              !ProxyUtils.MatchesUrlToWatch(UrlsToWatch, request.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri))
             {
                 continue;
             }
diff --git a/dev-proxy-plugins/RequestLogs/UrlDiscoveryPlugin.cs b/dev-proxy-plugins/RequestLogs/UrlDiscoveryPlugin.cs
@@ -35,9 +35,12 @@ private Task AfterRecordingStopAsync(object? sender, RecordingArgs e)
             return Task.CompletedTask;
         }
 
+        var requestLogs = e.RequestLogs
+            .Where(l => ProxyUtils.MatchesUrlToWatch(UrlsToWatch, l.Context?.Session.HttpClient.Request.RequestUri.AbsoluteUri ?? ""));            
+
         UrlDiscoveryPluginReport report = new()
         {
-            Data = [.. e.RequestLogs.Select(log => log.Context?.Session.HttpClient.Request.RequestUri.ToString()).Distinct().Order()]
+            Data = [.. requestLogs.Select(log => log.Context?.Session.HttpClient.Request.RequestUri.ToString()).Distinct().Order()]
         };
 
         StoreReport(report, e);

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,12 @@ private async Task AfterRecordingStopAsync(object? sender, RecordingArgs e)`
`94`	`94`	`{`
`95`	`95`	`continue;`
`96`	`96`	`}`
	`97`	`+`
	`98`	`+ if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.url))`
	`99`	`+ {`
	`100`	`+ Logger.LogDebug("URL not matched: {url}", methodAndUrl.url);`
	`101`	`+ continue;`
	`102`	`+ }`
`97`	`103`
`98`	`104`	`var requestsFromBatch = Array.Empty<(string method, string url)>();`
`99`	`105`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,12 @@ private async Task AfterRecordingStopAsync(object? sender, RecordingArgs e)`
`64`	`64`	`continue;`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.url))`
	`68`	`+ {`
	`69`	`+ Logger.LogDebug("URL not matched: {url}", methodAndUrl.url);`
	`70`	`+ continue;`
	`71`	`+ }`
	`72`	`+`
`67`	`73`	`var uri = new Uri(methodAndUrl.url);`
`68`	`74`	`if (!ProxyUtils.IsGraphUrl(uri))`
`69`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,8 @@ private async Task<HttpFile> GetHttpRequestsAsync(IEnumerable<RequestLog> reques`
`139`	`139`	`{`
`140`	`140`	`if (request.MessageType != MessageType.InterceptedResponse \|\|`
`141`	`141`	`request.Context is null \|\|`
`142`		`- request.Context.Session is null)`
	`142`	`+ request.Context.Session is null \|\|`
	`143`	`+ !ProxyUtils.MatchesUrlToWatch(UrlsToWatch, request.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri))`
`143`	`144`	`{`
`144`	`145`	`continue;`
`145`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ private async Task AfterRecordingStopAsync(object? sender, RecordingArgs e)`
`39`	`39`	`{`
`40`	`40`	`if (request.MessageType != MessageType.InterceptedResponse \|\|`
`41`	`41`	`request.Context is null \|\|`
`42`		`- request.Context.Session is null)`
	`42`	`+ request.Context.Session is null \|\|`
	`43`	`+ !ProxyUtils.MatchesUrlToWatch(UrlsToWatch, request.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri))`
`43`	`44`	`{`
`44`	`45`	`continue;`
`45`	`46`	`}`