@contrast/common 1.1.3 → 1.1.5
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.
- package/lib/index.d.ts +4 -1
- package/lib/index.js +2 -3
- package/lib/index.js.map +1 -1
- package/lib/types.d.ts +3 -2
- package/package.json +2 -3
- package/src/index.ts +7 -4
- package/src/types.ts +9 -22
package/lib/index.d.ts
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
export * from './constants';
|
|
2
2
|
export * from './types';
|
|
3
|
+
interface TraverseCallback {
|
|
4
|
+
(path: any[], type: 'Key' | 'Value', value: any, obj: any): unknown;
|
|
5
|
+
}
|
|
3
6
|
/**
|
|
4
7
|
* Returns true if the value passed is either a primitive string or a
|
|
5
8
|
* String object.
|
|
@@ -7,5 +10,5 @@ export * from './types';
|
|
|
7
10
|
export declare function isString(value: unknown): value is string | String;
|
|
8
11
|
export declare function isNonEmptyObject(value: unknown): value is object;
|
|
9
12
|
export declare function encodeString(str: string): string;
|
|
10
|
-
export declare function simpleTraverse(obj: any, cb:
|
|
13
|
+
export declare function simpleTraverse(obj: any, cb: TraverseCallback): void;
|
|
11
14
|
export declare function installChildComponentsSync(parent: any, order: string[]): void;
|
package/lib/index.js
CHANGED
|
@@ -54,7 +54,6 @@ function simpleTraverse(obj, cb) {
|
|
|
54
54
|
return;
|
|
55
55
|
}
|
|
56
56
|
const path = [];
|
|
57
|
-
/* eslint-disable complexity */
|
|
58
57
|
function traverse(obj) {
|
|
59
58
|
const isArray = Array.isArray(obj);
|
|
60
59
|
for (const k in obj) {
|
|
@@ -66,7 +65,7 @@ function simpleTraverse(obj, cb) {
|
|
|
66
65
|
if (typeof obj[_k] === 'object' && obj[_k] !== null) {
|
|
67
66
|
traverse(obj[_k]);
|
|
68
67
|
}
|
|
69
|
-
else if (typeof obj[_k] === 'string' && obj[_k]) {
|
|
68
|
+
else if (typeof obj[_k] === 'string' && isNaN(obj[_k]) && obj[_k]) {
|
|
70
69
|
cb(path, 'Value', obj[_k], obj);
|
|
71
70
|
}
|
|
72
71
|
path.pop();
|
|
@@ -80,7 +79,7 @@ function simpleTraverse(obj, cb) {
|
|
|
80
79
|
else {
|
|
81
80
|
cb(path, 'Key', k, obj);
|
|
82
81
|
// only callback if the value is a non-empty string
|
|
83
|
-
if (typeof obj[k] === 'string' && obj[k]) {
|
|
82
|
+
if (typeof obj[k] === 'string' && isNaN(obj[k]) && obj[k]) {
|
|
84
83
|
path.push(k);
|
|
85
84
|
cb(path, 'Value', obj[k], obj);
|
|
86
85
|
path.pop();
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;GAaG;;;;;;;;;;;;;;;;;AAEH,8CAA4B;AAC5B,0CAAwB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
|
@@ -9,7 +9,6 @@ export interface AppInfo {
|
|
|
9
9
|
release: string;
|
|
10
10
|
};
|
|
11
11
|
hostname: string;
|
|
12
|
-
version: string;
|
|
13
12
|
name: string;
|
|
14
13
|
pkg: object;
|
|
15
14
|
agentVersion: string;
|
|
@@ -20,6 +19,7 @@ export interface AppInfo {
|
|
|
20
19
|
indexFile: string;
|
|
21
20
|
serverName: string;
|
|
22
21
|
serverEnvironment: string;
|
|
22
|
+
version: string;
|
|
23
23
|
}
|
|
24
24
|
export declare type SemanticAnalysisRules = Rule.CMD_INJECTION_SEMANTIC_CHAINED_COMMANDS | Rule.CMD_INJECTION_COMMAND_BACKDOORS | Rule.CMD_INJECTION_SEMANTIC_DANGEROUS_PATHS;
|
|
25
25
|
export interface Result {
|
|
@@ -38,6 +38,8 @@ export interface Result {
|
|
|
38
38
|
export interface SemanticAnalysisResult extends Result {
|
|
39
39
|
findings?: {
|
|
40
40
|
command?: string;
|
|
41
|
+
prolog?: string;
|
|
42
|
+
xml?: string;
|
|
41
43
|
};
|
|
42
44
|
sinkContext?: any;
|
|
43
45
|
}
|
|
@@ -62,7 +64,6 @@ export interface ReqData {
|
|
|
62
64
|
uriPath: string;
|
|
63
65
|
queries: string;
|
|
64
66
|
contentType?: string;
|
|
65
|
-
standardUrlParsing: boolean;
|
|
66
67
|
ip: string;
|
|
67
68
|
httpVersion: string;
|
|
68
69
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@contrast/common",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.5",
|
|
4
4
|
"description": "Shared constants and utilities for all Contrast Agent modules",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
|
|
@@ -13,6 +13,5 @@
|
|
|
13
13
|
"scripts": {
|
|
14
14
|
"build": "tsc --build src/",
|
|
15
15
|
"test": "../scripts/test.sh"
|
|
16
|
-
}
|
|
17
|
-
"dependencies": {}
|
|
16
|
+
}
|
|
18
17
|
}
|
package/src/index.ts
CHANGED
|
@@ -16,6 +16,10 @@
|
|
|
16
16
|
export * from './constants';
|
|
17
17
|
export * from './types';
|
|
18
18
|
|
|
19
|
+
interface TraverseCallback {
|
|
20
|
+
(path: any[], type: 'Key' | 'Value', value: any, obj: any): unknown;
|
|
21
|
+
}
|
|
22
|
+
|
|
19
23
|
/**
|
|
20
24
|
* Returns true if the value passed is either a primitive string or a
|
|
21
25
|
* String object.
|
|
@@ -34,12 +38,11 @@ export function encodeString(str: string): string {
|
|
|
34
38
|
return Buffer.from(str).toString('base64');
|
|
35
39
|
}
|
|
36
40
|
|
|
37
|
-
export function simpleTraverse(obj: any, cb:
|
|
41
|
+
export function simpleTraverse(obj: any, cb: TraverseCallback) {
|
|
38
42
|
if (typeof obj !== 'object' || obj === null) {
|
|
39
43
|
return;
|
|
40
44
|
}
|
|
41
45
|
const path: any[] = [];
|
|
42
|
-
/* eslint-disable complexity */
|
|
43
46
|
function traverse(obj: any) {
|
|
44
47
|
const isArray = Array.isArray(obj);
|
|
45
48
|
for (const k in obj) {
|
|
@@ -50,7 +53,7 @@ export function simpleTraverse(obj: any, cb: Function) {
|
|
|
50
53
|
path.push(_k);
|
|
51
54
|
if (typeof obj[_k] === 'object' && obj[_k] !== null) {
|
|
52
55
|
traverse(obj[_k]);
|
|
53
|
-
} else if (typeof obj[_k] === 'string' && obj[_k]) {
|
|
56
|
+
} else if (typeof obj[_k] === 'string' && isNaN(obj[_k]) && obj[_k]) {
|
|
54
57
|
cb(path, 'Value', obj[_k], obj);
|
|
55
58
|
}
|
|
56
59
|
path.pop();
|
|
@@ -62,7 +65,7 @@ export function simpleTraverse(obj: any, cb: Function) {
|
|
|
62
65
|
} else {
|
|
63
66
|
cb(path, 'Key', k, obj);
|
|
64
67
|
// only callback if the value is a non-empty string
|
|
65
|
-
if (typeof obj[k] === 'string' && obj[k]) {
|
|
68
|
+
if (typeof obj[k] === 'string' && isNaN(obj[k]) && obj[k]) {
|
|
66
69
|
path.push(k);
|
|
67
70
|
cb(path, 'Value', obj[k], obj);
|
|
68
71
|
path.pop();
|
package/src/types.ts
CHANGED
|
@@ -24,7 +24,6 @@ export interface AppInfo {
|
|
|
24
24
|
release: string;
|
|
25
25
|
};
|
|
26
26
|
hostname: string;
|
|
27
|
-
version: string;
|
|
28
27
|
name: string;
|
|
29
28
|
pkg: object; // package.json
|
|
30
29
|
agentVersion: string;
|
|
@@ -35,6 +34,7 @@ export interface AppInfo {
|
|
|
35
34
|
indexFile: string;
|
|
36
35
|
serverName: string;
|
|
37
36
|
serverEnvironment: string;
|
|
37
|
+
version: string;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
export type SemanticAnalysisRules =
|
|
@@ -59,6 +59,8 @@ export interface Result {
|
|
|
59
59
|
export interface SemanticAnalysisResult extends Result {
|
|
60
60
|
findings?: {
|
|
61
61
|
command?: string;
|
|
62
|
+
prolog?: string;
|
|
63
|
+
xml?: string;
|
|
62
64
|
};
|
|
63
65
|
sinkContext?: any;
|
|
64
66
|
}
|
|
@@ -87,7 +89,6 @@ export interface ReqData {
|
|
|
87
89
|
uriPath: string;
|
|
88
90
|
queries: string;
|
|
89
91
|
contentType?: string;
|
|
90
|
-
standardUrlParsing: boolean;
|
|
91
92
|
ip: string;
|
|
92
93
|
httpVersion: string;
|
|
93
94
|
}
|
|
@@ -130,29 +131,15 @@ export interface RequestStore {
|
|
|
130
131
|
}
|
|
131
132
|
|
|
132
133
|
export interface Messages extends EventEmitter {
|
|
133
|
-
addListener(event: Event.PROTECT,
|
|
134
|
-
|
|
135
|
-
): this;
|
|
136
|
-
addListener(
|
|
137
|
-
event: Event.SERVER_SETTINGS_UPDATE,
|
|
138
|
-
listener: (msg: Record<string, any>) => void,
|
|
139
|
-
): this;
|
|
134
|
+
addListener(event: Event.PROTECT, listener: (msg: RequestStore) => void): this;
|
|
135
|
+
addListener(event: Event.SERVER_SETTINGS_UPDATE, listener: (msg: Record<string, any>) => void): this;
|
|
140
136
|
|
|
141
137
|
emit(event: Event.PROTECT, msg: RequestStore): boolean;
|
|
142
138
|
emit(event: Event.SERVER_SETTINGS_UPDATE, msg: Record<string, any>): boolean;
|
|
143
139
|
|
|
144
140
|
on(event: Event.PROTECT, listener: (msg: RequestStore) => void): this;
|
|
145
|
-
on(
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
): this;
|
|
149
|
-
|
|
150
|
-
prependListener(
|
|
151
|
-
event: Event.PROTECT,
|
|
152
|
-
listener: (msg: RequestStore) => void,
|
|
153
|
-
): this;
|
|
154
|
-
prependOnceListener(
|
|
155
|
-
event: Event.PROTECT,
|
|
156
|
-
listener: (msg: RequestStore) => void,
|
|
157
|
-
): this;
|
|
141
|
+
on(event: Event.SERVER_SETTINGS_UPDATE, listener: (msg: Record<string, any>) => void): this;
|
|
142
|
+
|
|
143
|
+
prependListener(event: Event.PROTECT, listener: (msg: RequestStore) => void,): this;
|
|
144
|
+
prependOnceListener(event: Event.PROTECT, listener: (msg: RequestStore) => void): this;
|
|
158
145
|
}
|