SERVER-76126 Set user roles system variable only if referenced in query

1 files changed, 4 insertions, 3 deletions

diff --git a/src/mongo/db/commands/run_aggregate.cpp b/src/mongo/db/commands/run_aggregate.cpp
index 56c1166506c..9d67caf2df3 100644
--- a/src/mongo/db/commands/run_aggregate.cpp
+++ b/src/mongo/db/commands/run_aggregate.cpp
@@ -460,9 +460,6 @@ boost::intrusive_ptr<ExpressionContext> makeExpressionContext(
         expCtx->changeStreamTokenVersion = 1;
     }
 
-    // Set the value of $$USER_ROLES for the aggregation.
-    expCtx->setUserRoles();
-
     return expCtx;
 }
 
@@ -1022,6 +1019,10 @@ Status runAggregate(OperationContext* opCtx,
         curOp->beginQueryPlanningTimer();
         expCtx->stopExpressionCounters();
 
+        // After parsing to detect if $$USER_ROLES is referenced in the query, set the value of
+        // $$USER_ROLES for the aggregation.
+        expCtx->setUserRoles();
+
         if (!request.getAllowDiskUse().value_or(true)) {
             allowDiskUseFalseCounter.increment();
         }