Fixes processing hosts and URLs to watch (#1107)

Author: waldekmastykarz

dev-proxy-abstractions/ProxyUtils.cs

@@ -356,9 +356,9 @@ public static void MergeHeaders(IList<MockResponseHeader> allHeaders, IList<Mock
 
     public static JsonSerializerOptions JsonSerializerOptions => jsonSerializerOptions;
 
-    public static bool MatchesUrlToWatch(ISet<UrlToWatch> watchedUrls, string url)
+    public static bool MatchesUrlToWatch(ISet<UrlToWatch> watchedUrls, string url, bool evaluateWildcards = false)
     {
-        if (url.Contains('*'))
+        if (evaluateWildcards && url.Contains('*'))
         {
             // url contains a wildcard, so convert it to regex and compare
             var match = watchedUrls.FirstOrDefault(r => {

dev-proxy-plugins/Mocks/CrudApiPlugin.cs

@@ -101,7 +101,7 @@ public override async Task RegisterAsync()
             _configuration.Auth = CrudApiAuthType.None;
         }
 
-        if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, _configuration.BaseUrl))
+        if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, _configuration.BaseUrl, true))
         {
             Logger.LogWarning(
                 "The base URL of the API {baseUrl} does not match any URL to watch. The {plugin} plugin will be disabled. To enable it, add {url}* to the list of URLs to watch and restart Dev Proxy.",

dev-proxy-plugins/Mocks/MockResponsePlugin.cs

@@ -137,7 +137,7 @@ private void ValidateMocks()
                 continue;
             }
 
-            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, mock.Request.Url))
+            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, mock.Request.Url, true))
             {
                 unmatchedMockUrls.Add(mock.Request.Url);
             }

dev-proxy-plugins/RandomErrors/GenericRandomErrorPlugin.cs

@@ -268,7 +268,7 @@ private void ValidateErrors()
                 continue;
             }
 
-            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, error.Request.Url))
+            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, error.Request.Url, true))
             {
                 unmatchedErrorUrls.Add(error.Request.Url);
             }

dev-proxy/ProxyEngine.cs

@@ -293,11 +293,6 @@ private void LoadHostNamesFromUrls()
     {
         foreach (var urlToWatch in _urlsToWatch)
         {
-            if (urlToWatch.Exclude)
-            {
-                continue;
-            }
-
             // extract host from the URL
             string urlToWatchPattern = Regex.Unescape(urlToWatch.Url.ToString())
                 .Trim('^', '$')
@@ -329,7 +324,7 @@ private void LoadHostNamesFromUrls()
             // don't add the same host twice
             if (!_hostsToWatch.Any(h => h.Url.ToString() == hostRegex.ToString()))
             {
-                _hostsToWatch.Add(new UrlToWatch(hostRegex));
+                _hostsToWatch.Add(new UrlToWatch(hostRegex, urlToWatch.Exclude));
             }
         }
     }
@@ -520,7 +515,18 @@ private async Task HandleRequestAsync(SessionEventArgs e, ProxyRequestArgs proxy
 
     private static void AddProxyHeader(Request r) => r.Headers?.AddHeader("Via", $"{r.HttpVersion} dev-proxy/{ProxyUtils.ProductVersion}");
 
-    private bool IsProxiedHost(string hostName) => _hostsToWatch.Any(h => h.Url.IsMatch(hostName));
+    private bool IsProxiedHost(string hostName)
+    {
+        var urlMatch = _hostsToWatch.FirstOrDefault(h => h.Url.IsMatch(hostName));
+        if (urlMatch is null)
+        {
+            return false;
+        }
+        else
+        {
+            return !urlMatch.Exclude;
+        }
+    }
 
     private bool IsIncludedByHeaders(HeaderCollection requestHeaders)
     {