Added EnforceEventStackFilter option and turned it on in the EventController. Allow other system usages of event repository to bypass event stack filter.

Author: ejsmith

build/generate-client.sh

@@ -0,0 +1,14 @@
+curl -X POST https://generator3.swagger.io/api/generate \
+  -H 'content-type: application/json' \
+  -d '{
+    "specURL" : "https://collector.exceptionless.io/docs/v2/swagger.json",
+    "lang" : "typescript-fetch",
+    "type" : "CLIENT",
+    "options" : {
+      "additionalProperties" : {
+        "supportsES6": true,
+        "typescriptThreePlus": true
+      }
+    },
+    "codegenVersion" : "V3"
+  }' --output exceptionless-ts.zip

src/Exceptionless.Core/Repositories/Queries/EventStackFilterQuery.cs

@@ -13,9 +13,27 @@
 using Nest;
 using DateRange = Foundatio.Repositories.DateRange;
 
+namespace Exceptionless.Core.Repositories {
+    public static class EventStackFilterQueryExtensions {
+        internal const string EnforceEventStackFilterKey = "@EnforceEventStackFilter";
+
+        public static T EnforceEventStackFilter<T>(this T query, bool shouldEnforceEventStackFilter = true) where T : IRepositoryQuery {
+            query.Values.Set(EnforceEventStackFilterKey, shouldEnforceEventStackFilter);
+            return query;
+        }
+    }
+}
+
+namespace Exceptionless.Core.Repositories.Options {
+    public static class ReadEventStackFilterQueryExtensions {
+        public static bool ShouldEnforceEventStackFilter(this IRepositoryQuery query) {
+            return query.SafeGetOption<bool>(EventStackFilterQueryExtensions.EnforceEventStackFilterKey, false);
+        }
+    }
+}
+
 namespace Exceptionless.Core.Repositories.Queries {
     public class EventStackFilterQueryBuilder : IElasticQueryBuilder {
-        public const string StackFieldName = "@stack";
         private readonly IStackRepository _stackRepository;
         private readonly ILogger _logger;
         private readonly Field _inferredEventDateField;
@@ -31,6 +49,9 @@ public EventStackFilterQueryBuilder(IStackRepository stackRepository, ILoggerFac
         public async Task BuildAsync<T>(QueryBuilderContext<T> ctx) where T : class, new() {
             string filter = ctx.Source.GetFilterExpression() ?? String.Empty;
 
+            if (String.IsNullOrEmpty(filter) && !ctx.Source.ShouldEnforceEventStackFilter())
+                return;
+
             // TODO: Handle search expressions as well
             bool altInvertRequested = false;
             if (filter.StartsWith("@!")) {
@@ -57,7 +78,7 @@ public EventStackFilterQueryBuilder(IStackRepository stackRepository, ILoggerFac
             if (isStackIdsNegated)
                 query = invertedStackFilter.Query;
 
-            if (String.IsNullOrEmpty(query) && ctx.Options.GetSoftDeleteMode() != SoftDeleteQueryMode.ActiveOnly)
+            if (String.IsNullOrEmpty(query) && (!ctx.Source.ShouldEnforceEventStackFilter() || ctx.Options.GetSoftDeleteMode() != SoftDeleteQueryMode.ActiveOnly))
                 return;
 
             if (!(ctx is IQueryVisitorContextWithValidator)) {

src/Exceptionless.Web/Controllers/Base/ReadOnlyRepositoryApiController.cs

@@ -39,34 +39,6 @@ protected async Task<ActionResult<TViewModel>> GetByIdImplAsync(string id) {
             return await OkModelAsync(model);
         }
 
-        protected async Task<ActionResult<CountResult>> GetCountImplAsync(AppFilter sf, TimeInfo ti, string filter = null, string aggregations = null) {
-            var pr = await _validator.ValidateQueryAsync(filter);
-            if (!pr.IsValid)
-                return BadRequest(pr.Message);
-
-            var far = await _validator.ValidateAggregationsAsync(aggregations);
-            if (!far.IsValid)
-                return BadRequest(far.Message);
-
-            sf.UsesPremiumFeatures = pr.UsesPremiumFeatures || far.UsesPremiumFeatures;
-            var query = new RepositoryQuery<TModel>()
-                .AppFilter(ShouldApplySystemFilter(sf, filter) ? sf : null)
-                .DateRange(ti.Range.UtcStart, ti.Range.UtcEnd, ti.Field)
-                .Index(ti.Range.UtcStart, ti.Range.UtcEnd);
-
-            CountResult result;
-            try {
-                result = await _repository.CountAsync(q => q.SystemFilter(query).FilterExpression(filter).AggregationsExpression(aggregations));
-            } catch (Exception ex) {
-                using (_logger.BeginScope(new ExceptionlessState().Property("Search Filter", new { SystemFilter = sf, UserFilter = filter, Time = ti, Aggregations = aggregations }).Tag("Search").Identity(CurrentUser.EmailAddress).Property("User", CurrentUser).SetHttpContext(HttpContext)))
-                    _logger.LogError(ex, "An error has occurred. Please check your filter or aggregations.");
-
-                return BadRequest("An error has occurred. Please check your search filter.");
-            }
-
-            return Ok(result);
-        }
-
         protected async Task<ActionResult<TViewModel>> OkModelAsync(TModel model) {
             return Ok(await MapAsync<TViewModel>(model, true));
         }

src/Exceptionless.Web/Controllers/EventController.cs

@@ -154,6 +154,34 @@ public async Task<ActionResult<CountResult>> GetCountByProjectAsync(string proje
             return await GetCountImplAsync(sf, ti, filter, aggregations);
         }
 
+        private async Task<ActionResult<CountResult>> GetCountImplAsync(AppFilter sf, TimeInfo ti, string filter = null, string aggregations = null) {
+            var pr = await _validator.ValidateQueryAsync(filter);
+            if (!pr.IsValid)
+                return BadRequest(pr.Message);
+
+            var far = await _validator.ValidateAggregationsAsync(aggregations);
+            if (!far.IsValid)
+                return BadRequest(far.Message);
+
+            sf.UsesPremiumFeatures = pr.UsesPremiumFeatures || far.UsesPremiumFeatures;
+            var query = new RepositoryQuery<PersistentEvent>()
+                .AppFilter(ShouldApplySystemFilter(sf, filter) ? sf : null)
+                .DateRange(ti.Range.UtcStart, ti.Range.UtcEnd, ti.Field)
+                .Index(ti.Range.UtcStart, ti.Range.UtcEnd);
+
+            CountResult result;
+            try {
+                result = await _repository.CountAsync(q => q.SystemFilter(query).FilterExpression(filter).EnforceEventStackFilter().AggregationsExpression(aggregations));
+            } catch (Exception ex) {
+                using (_logger.BeginScope(new ExceptionlessState().Property("Search Filter", new { SystemFilter = sf, UserFilter = filter, Time = ti, Aggregations = aggregations }).Tag("Search").Identity(CurrentUser.EmailAddress).Property("User", CurrentUser).SetHttpContext(HttpContext)))
+                    _logger.LogError(ex, "An error has occurred. Please check your filter or aggregations.");
+
+                return BadRequest("An error has occurred. Please check your search filter.");
+            }
+
+            return Ok(result);
+        }
+
         /// <summary>
         /// Get by id
         /// </summary>
@@ -251,6 +279,7 @@ private async Task<ActionResult<IReadOnlyCollection<PersistentEvent>>> GetIntern
 
                         var systemFilter = new RepositoryQuery<PersistentEvent>()
                             .AppFilter(ShouldApplySystemFilter(sf, filter) ? sf : null)
+                            .EnforceEventStackFilter()
                             .DateRange(ti.Range.UtcStart, ti.Range.UtcEnd, (PersistentEvent e) => e.Date)
                             .Index(ti.Range.UtcStart, ti.Range.UtcEnd);
 
@@ -265,6 +294,7 @@ private async Task<ActionResult<IReadOnlyCollection<PersistentEvent>>> GetIntern
                         var countResponse = await _repository.CountAsync(q => q
                             .SystemFilter(systemFilter)
                             .FilterExpression(filter)
+                            .EnforceEventStackFilter()
                             .AggregationsExpression($"terms:(stack_id~{GetSkip(page + 1, limit) + 1} {stackAggregations})"));
 
                         var stackTerms = countResponse.Aggregations.Terms<string>("terms_stack_id");
@@ -296,7 +326,7 @@ private Task<FindResults<PersistentEvent>> GetEventsInternalAsync(AppFilter sf,
             if (String.IsNullOrEmpty(sort))
                 sort = "-date";
 
-            return _repository.FindAsync(q => q.AppFilter(ShouldApplySystemFilter(sf, filter) ? sf : null).FilterExpression(filter).SortExpression(sort).DateRange(ti.Range.UtcStart, ti.Range.UtcEnd, ti.Field),
+            return _repository.FindAsync(q => q.AppFilter(ShouldApplySystemFilter(sf, filter) ? sf : null).FilterExpression(filter).EnforceEventStackFilter().SortExpression(sort).DateRange(ti.Range.UtcStart, ti.Range.UtcEnd, ti.Field),
                 o => useSearchAfter
                     ? o.SearchAfterPaging().SearchAfter(after).PageLimit(limit)
                     : o.PageNumber(page).PageLimit(limit));
@@ -1211,7 +1241,7 @@ private async Task<Dictionary<string, double>> GetUserCountByProjectIdsAsync(ICo
 
             var systemFilter = new RepositoryQuery<PersistentEvent>().AppFilter(sf).DateRange(utcStart, utcEnd, (PersistentEvent e) => e.Date).Index(utcStart, utcEnd);
             var projects = cachedTotals.Where(kvp => !kvp.Value.HasValue).Select(kvp => new Project { Id = kvp.Key, OrganizationId = stacks.FirstOrDefault(s => s.ProjectId == kvp.Key)?.OrganizationId }).ToList();
-            var countResult = await _repository.CountAsync(q => q.SystemFilter(systemFilter).FilterExpression(projects.BuildFilter()).AggregationsExpression("terms:(project_id cardinality:user)"));
+            var countResult = await _repository.CountAsync(q => q.SystemFilter(systemFilter).FilterExpression(projects.BuildFilter()).EnforceEventStackFilter().AggregationsExpression("terms:(project_id cardinality:user)"));
 
             // Cache all projects that have more than 10 users for 5 minutes.
             var projectTerms = countResult.Aggregations.Terms<string>("terms_project_id").Buckets;