@contrast/agent 4.29.1 → 4.29.2-alpha.2

package/lib/util/user-input-evaluator.js

@@ -1,17 +1,3 @@
-/**
-Copyright: 2022 Contrast Security, Inc
-  Contact: support@contrastsecurity.com
-  License: Commercial
-
-  NOTICE: This Software and the patented inventions embodied within may only be
-  used as part of Contrast Security’s commercial offerings. Even though it is
-  made available through public repositories, use of this Software is subject to
-  the applicable End User Licensing Agreement found at
-  https://www.contrastsecurity.com/enduser-terms-0317a or as otherwise agreed
-  between Contrast Security and the End User. The Software may not be reverse
-  engineered, modified, repackaged, sold, redistributed or otherwise used in a
-  way not consistent with the End User License Agreement.
-*/
 'use strict';
 
 /**

package/lib/util/xml-analyzer/external-entity-finder.js

@@ -1,17 +1,3 @@
-/**
-Copyright: 2022 Contrast Security, Inc
-  Contact: support@contrastsecurity.com
-  License: Commercial
-
-  NOTICE: This Software and the patented inventions embodied within may only be
-  used as part of Contrast Security’s commercial offerings. Even though it is
-  made available through public repositories, use of this Software is subject to
-  the applicable End User Licensing Agreement found at
-  https://www.contrastsecurity.com/enduser-terms-0317a or as otherwise agreed
-  between Contrast Security and the End User. The Software may not be reverse
-  engineered, modified, repackaged, sold, redistributed or otherwise used in a
-  way not consistent with the End User License Agreement.
-*/
 'use strict';
 
 const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agent",
-  "version": "4.29.1",
+  "version": "4.29.2-alpha.2",
   "description": "Node.js security instrumentation by Contrast Security",
   "keywords": [
     "security",

package/perf-logs.js

@@ -1,18 +1,4 @@
 #!/usr/bin/env node
-/**
-Copyright: 2022 Contrast Security, Inc
-  Contact: support@contrastsecurity.com
-  License: Commercial
-
-  NOTICE: This Software and the patented inventions embodied within may only be
-  used as part of Contrast Security’s commercial offerings. Even though it is
-  made available through public repositories, use of this Software is subject to
-  the applicable End User Licensing Agreement found at
-  https://www.contrastsecurity.com/enduser-terms-0317a or as otherwise agreed
-  between Contrast Security and the End User. The Software may not be reverse
-  engineered, modified, repackaged, sold, redistributed or otherwise used in a
-  way not consistent with the End User License Agreement.
-*/
 'use strict';
 
 const { program } = require('commander');

package/system-diagnostics.js

@@ -1,18 +1,4 @@
 #!/usr/bin/env node
-/**
-Copyright: 2022 Contrast Security, Inc
-  Contact: support@contrastsecurity.com
-  License: Commercial
-
-  NOTICE: This Software and the patented inventions embodied within may only be
-  used as part of Contrast Security’s commercial offerings. Even though it is
-  made available through public repositories, use of this Software is subject to
-  the applicable End User Licensing Agreement found at
-  https://www.contrastsecurity.com/enduser-terms-0317a or as otherwise agreed
-  between Contrast Security and the End User. The Software may not be reverse
-  engineered, modified, repackaged, sold, redistributed or otherwise used in a
-  way not consistent with the End User License Agreement.
-*/
 'use strict';
 
 const path = require('path');
@@ -35,28 +21,34 @@ Options:
   --output     -o     The directory to write the report in. Defaults to the current directory.
 `;
 
-function isContainer() {
+
+const isDocker = () => {
+  const MOUNTINFO_REGEX = /\/docker\/containers\/(.*?)\//;
+  const CGROUP_REGEX = /:\/docker\/([^/]+)$/;
+
   try {
-    fs.statSync('/.dockerenv');
-    return true;
+    const results = fs.readFileSync('/proc/self/mountinfo', 'utf8').match(MOUNTINFO_REGEX);
+    if (results) return { isDocker: true, containerID: results[1] };
   } catch (err) {
-    // if no docker env, check /proc/self/mountinfo
+    // else check /proc/self/cgroup
   }
 
   try {
-    return fs.readFileSync('proc/self/mountinfo', 'utf8').includes('docker/containers/');
+    const results = fs.readFileSync('/proc/self/cgroup', 'utf8').match(CGROUP_REGEX);
+    if (results) return { isDocker: true, containerID: results[1] };
   } catch (err) {
-    // else check /proc/self/cgroup
+    // else check /.dockerenv
   }
 
   try {
-    return fs.readFileSync('/proc/self/cgroup', 'utf8').includes('docker');
+    const result = fs.statSync('/.dockerenv');
+    if (result) return { isDocker: true, containerID: undefined };
   } catch (err) {
     // if there's not such file we can conclude it's not docker env
   }
 
-  return false;
-}
+  return { isDocker: false, containerID: undefined };
+};
 
 function isUsingPM2() {
   const used = !!process.env.pmx;
@@ -162,7 +154,7 @@ const diagnostics = {
         }
       },
       Host: {
-        isDocker: isContainer(),
+        Docker: isDocker(),
         PM2: isUsingPM2(),
         Memory: {
           Total: (os.totalmem() / 1e6).toFixed(0).concat(' MB'),

package/bin/VERSION

@@ -1 +0,0 @@
-2.28.23

package/changelog.config.js

@@ -1,56 +0,0 @@
-/**
-Copyright: 2022 Contrast Security, Inc
-  Contact: support@contrastsecurity.com
-  License: Commercial
-
-  NOTICE: This Software and the patented inventions embodied within may only be
-  used as part of Contrast Security’s commercial offerings. Even though it is
-  made available through public repositories, use of this Software is subject to
-  the applicable End User Licensing Agreement found at
-  https://www.contrastsecurity.com/enduser-terms-0317a or as otherwise agreed
-  between Contrast Security and the End User. The Software may not be reverse
-  engineered, modified, repackaged, sold, redistributed or otherwise used in a
-  way not consistent with the End User License Agreement.
-*/
-'use strict';
-
-module.exports = {
-  jira: {
-    baseUrl: `https://${process.env.JIRA_HOST}`,
-    ticketIDPattern: /(NODE-?\s?[0-9]{4})/i,
-    excludeIssueTypes: ['Sub-task', 'Release'],
-    api: {
-      host: process.env.JIRA_HOST,
-      email: process.env.JIRA_EMAIL,
-      token: process.env.JIRA_TOKEN
-    }
-  },
-  hideEmptyBlocks: true,
-  template: `## <%= process.env.VERSION -%>
-
-<% blockTickets = tickets.all.filter((t) => !t.reverted); -%>
-<% if (blockTickets.length > 0 || !options.hideEmptyBlocks) { -%>
-### Jira Tickets
----------------------
-<% blockTickets.forEach(ticket => { -%>
-  * [<%= ticket.fields.issuetype.name %>] - <%- ticket.fields.summary %>
-    [<%= ticket.key %>](<%= jira.baseUrl + '/browse/' + ticket.key %>)
-<% }); -%>
-<% if (!blockTickets.length) {%> ~ None ~ <% } %>
-<% } -%>
-<% blockNoTickets = commits.noTickets; -%>
-<% if (blockNoTickets.length > 0 || !options.hideEmptyBlocks) { -%>
-
-### Other Commits
----------------------
-<% blockNoTickets.forEach(commit => { -%>
-  * <%= commit.slackUser ? '@'+commit.slackUser.name : commit.authorName %> - <<%= commit.revision.substr(0, 7) %>> - <%= commit.summary %>
-<% }); -%>
-<% if (!blockNoTickets.length) {%> ~ None ~ <% } %>
-<% } -%>
-<% blockPendingByOwner = tickets.pendingByOwner; -%>
-<% if (blockPendingByOwner.length > 0 || !options.hideEmptyBlocks) { -%>
-<% } -%>
---------------------
-`
-};