@newrelic/browser-agent 1.306.0-rc.1 → 1.306.0

package/dist/cjs/common/constants/env.cdn.js

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.RRWEB_PACKAGE_NAME = exports.D
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.306.0-rc.1";
+const VERSION = exports.VERSION = "1.306.0";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/constants/env.npm.js

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.RRWEB_PACKAGE_NAME = exports.D
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.306.0-rc.1";
+const VERSION = exports.VERSION = "1.306.0";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/deny-list/deny-list.js

@@ -26,12 +26,12 @@ var denyList = [];
 function shouldCollectEvent(params) {
   if (!params || hasUndefinedHostname(params)) return false;
   if (denyList.length === 0) return true;
-
-  // short circuit if deny list contains just a wildcard
-  if (denyList[0].hostname === '*') return false;
   for (var i = 0; i < denyList.length; i++) {
     var parsed = denyList[i];
-    if (parsed.hostname.test(params.hostname) && parsed.pathname.test(params.pathname)) {
+    if (parsed.hostname === '*') {
+      return false;
+    }
+    if (domainMatchesPattern(parsed.hostname, params.hostname) && comparePath(parsed.pathname, params.pathname)) {
       return false;
     }
   }
@@ -54,13 +54,6 @@ function setDenyList(denyListConfig) {
     let url = denyListConfig[i];
     if (!url) continue; // ignore bad values like undefined or empty strings
 
-    // short circuit if deny list entry is just a wildcard
-    if (url === '*') {
-      denyList = [{
-        hostname: '*'
-      }];
-      return;
-    }
     if (url.indexOf('http://') === 0) {
       url = url.substring(7);
     } else if (url.indexOf('https://') === 0) {
@@ -73,24 +66,45 @@ function setDenyList(denyListConfig) {
       pathname = url.substring(firstSlash);
     } else {
       host = url;
-      pathname = '*';
+      pathname = '';
     }
     let [hostname] = host.split(':');
     denyList.push({
-      hostname: convertToRegularExpression(hostname),
-      pathname: convertToRegularExpression(pathname, true)
+      hostname,
+      pathname
     });
   }
 }
+/**
+ * Returns true if the right side of `domain` (end of string) matches `pattern`.
+ * @param {string} pattern - a string to be matched against the end of `domain` string
+ * @param {string} domain - a domain string with no protocol or path (e.g., app1.example.com)
+ * @returns {boolean} `true` if domain matches pattern; else `false`
+ */
+function domainMatchesPattern(pattern, domain) {
+  if (pattern.length > domain.length) {
+    return false;
+  }
+  return domain.indexOf(pattern) === domain.length - pattern.length;
+}
 
 /**
- * Converts a deny list filter string into a regular expression object with wildcard support
- * @param {string} filter - deny list filter to convert
- * @param {boolean} [isPathname=false] - indicates if the filter is a pathname
- * @returns {RegExp} - regular expression object built from the input string
+ * Returns true if a URL path matches a pattern string, disregarding leading slashes.
+ * @param {string} pattern - a string to compare with path (e.g., api/v1)
+ * @param {string} path - a string representing a URL path (e.g., /api/v1)
+ * @returns {boolean} `true` if path and pattern are an exact string match (except for leading slashes); else `false`
  */
-function convertToRegularExpression(filter, isPathname = false) {
-  const newFilter = filter.replace(/[.+?^${}()|[\]\\]/g, m => '\\' + m) // use a replacer function to not break apm injection
-  .replace(/\*/g, '.*?'); // use lazy matching instead of greedy
-  return new RegExp((isPathname ? '^' : '') + newFilter + '$');
+function comparePath(pattern, path) {
+  if (pattern.indexOf('/') === 0) {
+    pattern = pattern.substring(1);
+  }
+  if (path.indexOf('/') === 0) {
+    path = path.substring(1);
+  }
+
+  // No path in pattern means match all paths.
+  if (pattern === '') {
+    return true;
+  }
+  return pattern === path;
 }

package/dist/esm/common/constants/env.cdn.js

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.306.0-rc.1";
+export const VERSION = "1.306.0";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/constants/env.npm.js

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.306.0-rc.1";
+export const VERSION = "1.306.0";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/deny-list/deny-list.js

@@ -18,12 +18,12 @@ var denyList = [];
 export function shouldCollectEvent(params) {
   if (!params || hasUndefinedHostname(params)) return false;
   if (denyList.length === 0) return true;
-
-  // short circuit if deny list contains just a wildcard
-  if (denyList[0].hostname === '*') return false;
   for (var i = 0; i < denyList.length; i++) {
     var parsed = denyList[i];
-    if (parsed.hostname.test(params.hostname) && parsed.pathname.test(params.pathname)) {
+    if (parsed.hostname === '*') {
+      return false;
+    }
+    if (domainMatchesPattern(parsed.hostname, params.hostname) && comparePath(parsed.pathname, params.pathname)) {
       return false;
     }
   }
@@ -46,13 +46,6 @@ export function setDenyList(denyListConfig) {
     let url = denyListConfig[i];
     if (!url) continue; // ignore bad values like undefined or empty strings
 
-    // short circuit if deny list entry is just a wildcard
-    if (url === '*') {
-      denyList = [{
-        hostname: '*'
-      }];
-      return;
-    }
     if (url.indexOf('http://') === 0) {
       url = url.substring(7);
     } else if (url.indexOf('https://') === 0) {
@@ -65,24 +58,45 @@ export function setDenyList(denyListConfig) {
       pathname = url.substring(firstSlash);
     } else {
       host = url;
-      pathname = '*';
+      pathname = '';
     }
     let [hostname] = host.split(':');
     denyList.push({
-      hostname: convertToRegularExpression(hostname),
-      pathname: convertToRegularExpression(pathname, true)
+      hostname,
+      pathname
     });
   }
 }
+/**
+ * Returns true if the right side of `domain` (end of string) matches `pattern`.
+ * @param {string} pattern - a string to be matched against the end of `domain` string
+ * @param {string} domain - a domain string with no protocol or path (e.g., app1.example.com)
+ * @returns {boolean} `true` if domain matches pattern; else `false`
+ */
+function domainMatchesPattern(pattern, domain) {
+  if (pattern.length > domain.length) {
+    return false;
+  }
+  return domain.indexOf(pattern) === domain.length - pattern.length;
+}
 
 /**
- * Converts a deny list filter string into a regular expression object with wildcard support
- * @param {string} filter - deny list filter to convert
- * @param {boolean} [isPathname=false] - indicates if the filter is a pathname
- * @returns {RegExp} - regular expression object built from the input string
+ * Returns true if a URL path matches a pattern string, disregarding leading slashes.
+ * @param {string} pattern - a string to compare with path (e.g., api/v1)
+ * @param {string} path - a string representing a URL path (e.g., /api/v1)
+ * @returns {boolean} `true` if path and pattern are an exact string match (except for leading slashes); else `false`
  */
-function convertToRegularExpression(filter, isPathname = false) {
-  const newFilter = filter.replace(/[.+?^${}()|[\]\\]/g, m => '\\' + m) // use a replacer function to not break apm injection
-  .replace(/\*/g, '.*?'); // use lazy matching instead of greedy
-  return new RegExp((isPathname ? '^' : '') + newFilter + '$');
+function comparePath(pattern, path) {
+  if (pattern.indexOf('/') === 0) {
+    pattern = pattern.substring(1);
+  }
+  if (path.indexOf('/') === 0) {
+    path = path.substring(1);
+  }
+
+  // No path in pattern means match all paths.
+  if (pattern === '') {
+    return true;
+  }
+  return pattern === path;
 }

package/dist/types/common/deny-list/deny-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deny-list.d.ts","sourceRoot":"","sources":["../../../../src/common/deny-list/deny-list.js"],"names":[],"mappings":"AAYA;;;;GAIG;AACH,2CAHW,MAAM,GACJ,OAAO,CAoBnB;AAED,2DAEC;AAED;;;GAGG;AACH,4CAFW,MAAM,EAAE,QAyClB"}
+{"version":3,"file":"deny-list.d.ts","sourceRoot":"","sources":["../../../../src/common/deny-list/deny-list.js"],"names":[],"mappings":"AAYA;;;;GAIG;AACH,2CAHW,MAAM,GACJ,OAAO,CAqBnB;AAED,2DAEC;AAED;;;GAGG;AACH,4CAFW,MAAM,EAAE,QAgClB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.306.0-rc.1",
+  "version": "1.306.0",
   "private": false,
   "author": "New Relic Browser Agent Team <browser-agent@newrelic.com>",
   "description": "New Relic Browser Agent",
@@ -292,4 +292,4 @@
     "README.md",
     "CHANGELOG.md"
   ]
-}
+}

package/src/common/deny-list/deny-list.js

@@ -20,14 +20,15 @@ export function shouldCollectEvent (params) {
 
   if (denyList.length === 0) return true
 
-  // short circuit if deny list contains just a wildcard
-  if (denyList[0].hostname === '*') return false
-
   for (var i = 0; i < denyList.length; i++) {
     var parsed = denyList[i]
 
-    if (parsed.hostname.test(params.hostname) &&
-      parsed.pathname.test(params.pathname)) {
+    if (parsed.hostname === '*') {
+      return false
+    }
+
+    if (domainMatchesPattern(parsed.hostname, params.hostname) &&
+      comparePath(parsed.pathname, params.pathname)) {
       return false
     }
   }
@@ -54,12 +55,6 @@ export function setDenyList (denyListConfig) {
     let url = denyListConfig[i]
     if (!url) continue // ignore bad values like undefined or empty strings
 
-    // short circuit if deny list entry is just a wildcard
-    if (url === '*') {
-      denyList = [{ hostname: '*' }]
-      return
-    }
-
     if (url.indexOf('http://') === 0) {
       url = url.substring(7)
     } else if (url.indexOf('https://') === 0) {
@@ -73,26 +68,46 @@ export function setDenyList (denyListConfig) {
       pathname = url.substring(firstSlash)
     } else {
       host = url
-      pathname = '*'
+      pathname = ''
     }
     let [hostname] = host.split(':')
 
-    denyList.push({
-      hostname: convertToRegularExpression(hostname),
-      pathname: convertToRegularExpression(pathname, true)
-    })
+    denyList.push({ hostname, pathname })
   }
 }
+/**
+ * Returns true if the right side of `domain` (end of string) matches `pattern`.
+ * @param {string} pattern - a string to be matched against the end of `domain` string
+ * @param {string} domain - a domain string with no protocol or path (e.g., app1.example.com)
+ * @returns {boolean} `true` if domain matches pattern; else `false`
+ */
+function domainMatchesPattern (pattern, domain) {
+  if (pattern.length > domain.length) {
+    return false
+  }
+
+  return domain.indexOf(pattern) === (domain.length - pattern.length)
+}
 
 /**
- * Converts a deny list filter string into a regular expression object with wildcard support
- * @param {string} filter - deny list filter to convert
- * @param {boolean} [isPathname=false] - indicates if the filter is a pathname
- * @returns {RegExp} - regular expression object built from the input string
+ * Returns true if a URL path matches a pattern string, disregarding leading slashes.
+ * @param {string} pattern - a string to compare with path (e.g., api/v1)
+ * @param {string} path - a string representing a URL path (e.g., /api/v1)
+ * @returns {boolean} `true` if path and pattern are an exact string match (except for leading slashes); else `false`
  */
-function convertToRegularExpression (filter, isPathname = false) {
-  const newFilter = filter
-    .replace(/[.+?^${}()|[\]\\]/g, (m) => '\\' + m) // use a replacer function to not break apm injection
-    .replace(/\*/g, '.*?') // use lazy matching instead of greedy
-  return new RegExp((isPathname ? '^' : '') + newFilter + '$')
+function comparePath (pattern, path) {
+  if (pattern.indexOf('/') === 0) {
+    pattern = pattern.substring(1)
+  }
+
+  if (path.indexOf('/') === 0) {
+    path = path.substring(1)
+  }
+
+  // No path in pattern means match all paths.
+  if (pattern === '') {
+    return true
+  }
+
+  return pattern === path
 }