bug fix for request blocking (#3859)

Author: robertpi

tracer/src/Datadog.Trace/AppSec/Security.cs

@@ -395,29 +395,23 @@ private void AsmProductConfigChanged(object sender, ProductConfigChangedEventArg
                 }
             }
 
-            if (_remoteConfigurationStatus.RulesOverrides is { Count: > 0 })
-            {
-                var result = _waf.UpdateRulesStatus(_remoteConfigurationStatus.RulesOverrides, _remoteConfigurationStatus.Exclusions);
-                Log.Debug<bool, int>("_waf.Update was updated: {Success}, ({Count} rule status entries)", result, _remoteConfigurationStatus.RulesOverrides.Count);
+            var result = _waf.UpdateRulesStatus(_remoteConfigurationStatus.RulesOverrides, _remoteConfigurationStatus.Exclusions);
+            Log.Debug<bool, int, int>(
+                "_waf.Update was updated: {Success}, ({RulesOverridesCount} rule status entries), ({ExclusionsCount} exclusion filters)",
+                result,
+                _remoteConfigurationStatus.RulesOverrides.Count,
+                _remoteConfigurationStatus.Exclusions.Count);
 
-                foreach (var asmConfig in asmConfigs)
-                {
-                    if (result)
-                    {
-                        e.Acknowledge(asmConfig.Name);
-                    }
-                    else
-                    {
-                        e.Error(asmConfig.Name, "waf couldn't be updated with rule overrides");
-                    }
-                }
-            }
-            else
+            foreach (var asmConfig in asmConfigs)
             {
-                foreach (var asmConfig in asmConfigs)
+                if (result)
                 {
                     e.Acknowledge(asmConfig.Name);
                 }
+                else
+                {
+                    e.Error(asmConfig.Name, "waf couldn't be updated with rule overrides");
+                }
             }
         }
 

tracer/src/Datadog.Trace/AppSec/Waf/Waf.cs

@@ -167,11 +167,6 @@ public bool UpdateRulesData(List<RuleData> rulesData)
                 return false;
             }
 
-            if (rulesData.Count == 0)
-            {
-                return true;
-            }
-
             var argsToDispose = new List<Obj>();
             var mergedRuleData = MergeRuleData(rulesData);
             var rulesDataEncoded = mergedRuleData.Encode(_wafLibraryInvoker, argsToDispose);
@@ -194,11 +189,6 @@ public bool UpdateRulesStatus(List<RuleOverride> ruleStatus, List<JToken> exclus
                 return false;
             }
 
-            if (ruleStatus.Count == 0)
-            {
-                return true;
-            }
-
             var argsToDispose = new List<Obj>();
             var ruleStatusEncoded = EncoderExtensions.Encode(ruleStatus, exclusions, _wafLibraryInvoker, argsToDispose);
             var updated = UpdateWafAndDisposeItems(ruleStatusEncoded, argsToDispose);