Merge pull request #504 from codex-team/master

Update prod

Author: e11sy

src/models/eventsFactory.js

@@ -1,5 +1,6 @@
 import { getMidnightWithTimezoneOffset, getUTCMidnight } from '../utils/dates';
 import { groupBy } from '../utils/grouper';
+import safe from 'safe-regex';
 
 const Factory = require('./modelFactory');
 const mongo = require('../mongo');
@@ -164,6 +165,13 @@ class EventsFactory extends Factory {
       throw new Error('Search parameter must be a string');
     }
 
+    /**
+     * Check if pattern is safe RegExp
+     */
+    if (!safe(search)) {
+      throw new Error('Invalid regular expression pattern');
+    }
+
     const escapedSearch = search.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 
     limit = this.validateLimit(limit);
@@ -207,6 +215,12 @@ class EventsFactory extends Factory {
               $options: 'i',
             },
           },
+          {
+            'event.payload.context': {
+              $regex: escapedSearch,
+              $options: 'i',
+            },
+          },
         ],
       }
       : {};