@contrast/assess 1.74.0 → 1.76.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -41,6 +41,7 @@ module.exports = function(core) {
41
41
  require('./install/mysql-connection-escape')(core);
42
42
  require('./install/parse-int')(core);
43
43
  require('./install/pug-runtime-escape')(core);
44
+ core.initComponentSync(require('./install/sanitize-html'));
44
45
  require('./install/sql-template-strings')(core);
45
46
  require('./install/unescape')(core);
46
47
  require('./install/querystring')(core);
@@ -0,0 +1,100 @@
1
+ /*
2
+ * Copyright: 2026 Contrast Security, Inc
3
+ * Contact: support@contrastsecurity.com
4
+ * License: Commercial
5
+
6
+ * NOTICE: This Software and the patented inventions embodied within may only be
7
+ * used as part of Contrast Security’s commercial offerings. Even though it is
8
+ * made available through public repositories, use of this Software is subject to
9
+ * the applicable End User Licensing Agreement found at
10
+ * https://www.contrastsecurity.com/enduser-terms-0317a or as otherwise agreed
11
+ * between Contrast Security and the End User. The Software may not be reverse
12
+ * engineered, modified, repackaged, sold, redistributed or otherwise used in a
13
+ * way not consistent with the End User License Agreement.
14
+ */
15
+
16
+ 'use strict';
17
+
18
+ const {
19
+ primordials: { StringPrototypeSubstr },
20
+ DataflowTag: { CUSTOM_VALIDATED_REFLECTED_XSS } } = require('@contrast/common');
21
+ const { kComponentName, ComponentBase } = require('@contrast/core/lib/ioc/core');
22
+ const { patchType } = require('../common');
23
+
24
+ const COMPONENT_NAME = 'assess.dataflow.propagation.sanitizeHtml';
25
+
26
+ module.exports = class extends ComponentBase {
27
+
28
+ static [kComponentName] = COMPONENT_NAME;
29
+
30
+ install() {
31
+ const {
32
+ patcher,
33
+ depHooks,
34
+ assess: {
35
+ getPropagatorContext,
36
+ eventFactory: { createPropagationEvent },
37
+ dataflow: { tracker }
38
+ }
39
+ } = this.core;
40
+
41
+ depHooks.resolve({ name: 'sanitize-html', version: '<3' }, (sanitizeHtml) => {
42
+ const name = 'sanitize-html';
43
+
44
+ return patcher.patch(sanitizeHtml, {
45
+ name,
46
+ patchType,
47
+ usePerf: 'sync',
48
+ post(data) {
49
+ const { args, result, hooked } = data;
50
+ if (!result || !args[0] || !getPropagatorContext()) return;
51
+
52
+ const argInfo = tracker.getData(args[0]);
53
+ if (!argInfo) return;
54
+
55
+ const resultInfo = tracker.getData(result);
56
+ if (!resultInfo) return;
57
+
58
+ const history = [{ ...argInfo }];
59
+ const newTags = {
60
+ ...resultInfo.tags,
61
+ CUSTOM_VALIDATED_REFLECTED_XSS: [0, result.length - 1]
62
+ };
63
+ const truncatedArg = argInfo.value.length > 100 ?
64
+ StringPrototypeSubstr.call(argInfo.value, 0, 100) :
65
+ argInfo.value;
66
+ const event = createPropagationEvent({
67
+ name,
68
+ moduleName: name,
69
+ methodName: '',
70
+ get context() {
71
+ return `sanitizeHtml(${truncatedArg})`;
72
+ },
73
+ object: {
74
+ value: name,
75
+ tracked: false
76
+ },
77
+ result: {
78
+ value: resultInfo ? resultInfo.value : result,
79
+ tracked: !!resultInfo,
80
+ },
81
+ args: [{ value: truncatedArg, tracked: true }],
82
+ tags: newTags,
83
+ history,
84
+ source: 'P',
85
+ target: 'R',
86
+ addedTags: [CUSTOM_VALIDATED_REFLECTED_XSS],
87
+ stacktraceOpts: {
88
+ constructorOpt: hooked,
89
+ },
90
+ });
91
+
92
+ if (!event) return;
93
+ if (resultInfo) {
94
+ Object.assign(resultInfo, event);
95
+ }
96
+ }
97
+ });
98
+ });
99
+ }
100
+ };
@@ -132,6 +132,8 @@ module.exports = function(core) {
132
132
  }
133
133
  }
134
134
 
135
+ if (history.length == 0) return;
136
+
135
137
  const resultInfo = tracker.getData(result);
136
138
  const event = createPropagationEvent({
137
139
  name,
@@ -373,7 +373,7 @@ module.exports = function (core) {
373
373
  }
374
374
 
375
375
  instr.install = function () {
376
- depHooks.resolve({ name: 'mongodb', version: '<7' }, (mongodb, meta) => {
376
+ depHooks.resolve({ name: 'mongodb', version: '<8' }, (mongodb, meta) => {
377
377
  if (!mongodb.Collection || !mongodb.Db) {
378
378
  meta.rerun();
379
379
  return;
@@ -107,7 +107,18 @@ module.exports = function(core) {
107
107
  core.assess.dataflow.sinks.sqlite3 = {
108
108
  install() {
109
109
 
110
- depHooks.resolve({ name: 'better-sqlite3', version: '<13'}, betterSqlite3 => {
110
+ depHooks.resolve({ name: 'node:sqlite', version: '*' }, nodeSqlite => {
111
+ ['exec', 'prepare'].forEach((method) => {
112
+ const name = `nodeSqlite.DatabaseSync.prototype.${method}`;
113
+ patcher.patch(nodeSqlite.DatabaseSync.prototype, method, {
114
+ name,
115
+ patchType,
116
+ pre: pre('node:sqlite', method)
117
+ });
118
+ });
119
+ });
120
+
121
+ depHooks.resolve({ name: 'better-sqlite3', version: '<13' }, betterSqlite3 => {
111
122
  ['exec', 'prepare'].forEach((method) => {
112
123
  const name = `better-sqlite3.prototype.${method}`;
113
124
  patcher.patch(betterSqlite3.prototype, method, {
@@ -31,53 +31,60 @@ module.exports = function (core) {
31
31
 
32
32
  const source = sources.fastifyInstrumentation.fastify = {
33
33
  install() {
34
- depHooks.resolve({ name: 'fastify', version: '>=4 <6' }, (fastify) => patcher.patch(fastify, {
35
- name: 'fastify.constructor',
36
- patchType,
37
- post({ result: server, funcKey }) {
38
- server.addHook('preValidation', function preValidationHandler(request, reply, done) {
39
- // todo(NODE-3793): support for @fastify/websocket
40
- if (request.constructor.name == 'WebSocket') return;
34
+ depHooks.resolve({ name: 'fastify', version: '>=4 <6' }, (fastify) => {
35
+ const patched = patcher.patch(fastify, {
36
+ name: 'fastify.constructor',
37
+ patchType,
38
+ post({ result: server, funcKey }) {
39
+ server.addHook('preValidation', function preValidationHandler(request, reply, done) {
40
+ // todo(NODE-3793): support for @fastify/websocket
41
+ if (request.constructor.name == 'WebSocket') return;
41
42
 
42
- const sourceContext = getSourceContext();
43
- if (!sourceContext) return done();
43
+ const sourceContext = getSourceContext();
44
+ if (!sourceContext) return done();
44
45
 
45
- const bodyType = request?.headers?.['content-type']?.includes('/json')
46
- ? InputType.JSON_VALUE
47
- : typeof request.body == 'object'
48
- ? InputType.PARAMETER_VALUE
49
- : InputType.BODY;
46
+ const bodyType = request?.headers?.['content-type']?.includes('/json')
47
+ ? InputType.JSON_VALUE
48
+ : typeof request.body == 'object'
49
+ ? InputType.PARAMETER_VALUE
50
+ : InputType.BODY;
50
51
 
51
- [
52
- { key: 'query', inputType: InputType.QUERYSTRING, alreadyTrackedFlag: 'parsedQuery' },
53
- { key: 'params', inputType: InputType.URL_PARAMETER, alreadyTrackedFlag: 'parsedParams' },
54
- { key: 'body', inputType: bodyType, alreadyTrackedFlag: 'parsedBody' }
55
- ].forEach(({ key, inputType, alreadyTrackedFlag }) => {
56
- if (sourceContext[alreadyTrackedFlag]) {
57
- logger.trace({ inputType, funcKey }, 'values already tracked');
58
- return;
59
- }
52
+ [
53
+ { key: 'query', inputType: InputType.QUERYSTRING, alreadyTrackedFlag: 'parsedQuery' },
54
+ { key: 'params', inputType: InputType.URL_PARAMETER, alreadyTrackedFlag: 'parsedParams' },
55
+ { key: 'body', inputType: bodyType, alreadyTrackedFlag: 'parsedBody' }
56
+ ].forEach(({ key, inputType, alreadyTrackedFlag }) => {
57
+ if (sourceContext[alreadyTrackedFlag]) {
58
+ logger.trace({ inputType, funcKey }, 'values already tracked');
59
+ return;
60
+ }
60
61
 
61
- try {
62
- sources.handle({
63
- context: `req.${key}`,
64
- data: request[key],
65
- inputType,
66
- name: 'fastify.preValidation',
67
- stacktraceOpts: {
68
- constructorOpt: preValidationHandler,
69
- },
70
- sourceContext
71
- });
72
- } catch (err) {
73
- logger.error({ err, inputType, funcKey }, 'unable to handle Fastify source');
74
- }
62
+ try {
63
+ sources.handle({
64
+ context: `req.${key}`,
65
+ data: request[key],
66
+ inputType,
67
+ name: 'fastify.preValidation',
68
+ stacktraceOpts: {
69
+ constructorOpt: preValidationHandler,
70
+ },
71
+ sourceContext
72
+ });
73
+ } catch (err) {
74
+ logger.error({ err, inputType, funcKey }, 'unable to handle Fastify source');
75
+ }
76
+ });
77
+
78
+ return done();
75
79
  });
80
+ },
81
+ });
82
+
83
+ fastify.fastify = patched;
84
+ fastify.default = patched;
76
85
 
77
- return done();
78
- });
79
- },
80
- }));
86
+ return patched;
87
+ });
81
88
  }
82
89
  };
83
90
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@contrast/assess",
3
- "version": "1.74.0",
3
+ "version": "1.76.0",
4
4
  "description": "Contrast service providing framework-agnostic Assess support",
5
5
  "license": "SEE LICENSE IN LICENSE",
6
6
  "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -21,18 +21,18 @@
21
21
  },
22
22
  "dependencies": {
23
23
  "@contrast/common": "1.41.1",
24
- "@contrast/config": "1.58.2",
25
- "@contrast/core": "1.63.2",
26
- "@contrast/dep-hooks": "1.32.2",
24
+ "@contrast/config": "1.59.0",
25
+ "@contrast/core": "1.64.0",
26
+ "@contrast/dep-hooks": "1.33.0",
27
27
  "@contrast/distringuish": "6.0.2",
28
- "@contrast/instrumentation": "1.42.2",
29
- "@contrast/logger": "1.36.2",
30
- "@contrast/patcher": "1.35.2",
31
- "@contrast/rewriter": "1.40.3",
32
- "@contrast/route-coverage": "1.57.1",
33
- "@contrast/scopes": "1.33.2",
34
- "@contrast/sources": "1.9.2",
35
- "@contrast/stack-trace-factory": "1.4.0",
28
+ "@contrast/instrumentation": "1.43.0",
29
+ "@contrast/logger": "1.37.0",
30
+ "@contrast/patcher": "1.36.0",
31
+ "@contrast/rewriter": "1.41.0",
32
+ "@contrast/route-coverage": "1.58.0",
33
+ "@contrast/scopes": "1.34.0",
34
+ "@contrast/sources": "1.10.0",
35
+ "@contrast/stack-trace-factory": "1.5.0",
36
36
  "semver": "7.6.0"
37
37
  }
38
38
  }