whopper 0.7.2 → 0.8.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.
- package/dist/analyzer/match.d.ts +3 -3
- package/dist/analyzer/match.d.ts.map +1 -1
- package/dist/analyzer/match.js +51 -7
- package/dist/analyzer/match.js.map +1 -1
- package/dist/analyzer/match.test.js +34 -0
- package/dist/analyzer/match.test.js.map +1 -1
- package/dist/signatures/_types.d.ts +10 -5
- package/dist/signatures/_types.d.ts.map +1 -1
- package/dist/signatures/signatures.test.js +15 -2
- package/dist/signatures/signatures.test.js.map +1 -1
- package/dist/signatures/technologies/movable_type.test.js +2 -2
- package/dist/signatures/technologies/movable_type.test.js.map +1 -1
- package/dist/signatures/technologies/tinymce.d.ts.map +1 -1
- package/dist/signatures/technologies/tinymce.js +17 -1
- package/dist/signatures/technologies/tinymce.js.map +1 -1
- package/dist/signatures/technologies/tinymce.test.d.ts +2 -0
- package/dist/signatures/technologies/tinymce.test.d.ts.map +1 -0
- package/dist/signatures/technologies/tinymce.test.js +106 -0
- package/dist/signatures/technologies/tinymce.test.js.map +1 -0
- package/package.json +1 -1
package/dist/analyzer/match.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Pattern } from "../signatures/_types.js";
|
|
2
2
|
export type MatchResult = {
|
|
3
3
|
hit: boolean;
|
|
4
4
|
version: string | undefined;
|
|
5
5
|
index: number | undefined;
|
|
6
6
|
matchLength: number | undefined;
|
|
7
7
|
};
|
|
8
|
-
export declare const matchString: (value: string,
|
|
8
|
+
export declare const matchString: (value: string, pattern: Pattern) => MatchResult;
|
|
9
9
|
/**
|
|
10
10
|
* Like {@link matchString}, but returns the first match that does not overlap
|
|
11
11
|
* any of `excludedSpans` (half-open `[start, end)` character ranges). The value
|
|
@@ -13,7 +13,7 @@ export declare const matchString: (value: string, regex: Regex) => MatchResult;
|
|
|
13
13
|
* matches that merely fall inside an excluded range are skipped in favour of the
|
|
14
14
|
* next one. With no excluded spans it is equivalent to {@link matchString}.
|
|
15
15
|
*/
|
|
16
|
-
export declare const matchStringOutsideSpans: (value: string,
|
|
16
|
+
export declare const matchStringOutsideSpans: (value: string, pattern: Pattern, excludedSpans: Array<[number, number]>) => MatchResult;
|
|
17
17
|
export type SnippetOptions = {
|
|
18
18
|
context?: number;
|
|
19
19
|
maxMatchLength?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../../src/analyzer/match.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../../src/analyzer/match.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAS,MAAM,yBAAyB,CAAC;AAE9D,MAAM,MAAM,WAAW,GAAG;IACxB,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC,CAAC;AA+CF,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,EAAE,SAAS,OAAO,KAAG,WAmB7D,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,GAClC,OAAO,MAAM,EACb,SAAS,OAAO,EAChB,eAAe,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KACrC,WAmCF,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,OAAO,MAAM,EACb,OAAO,MAAM,EACb,aAAa,MAAM,EACnB,UAAS,cAAmB,KAC3B,MAoBF,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,UAAU,MAAM,EAChB,QAAQ,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,aAAa,CAAC,EAClD,SAAS,MAAM,KACd,MAMF,CAAC"}
|
package/dist/analyzer/match.js
CHANGED
|
@@ -1,15 +1,53 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Splits a pattern into the regex to run and the version template to apply to
|
|
3
|
+
* its capture groups, if the pattern carries one.
|
|
4
|
+
*/
|
|
5
|
+
const splitPattern = (pattern) => typeof pattern === "string"
|
|
6
|
+
? { regex: pattern, template: undefined }
|
|
7
|
+
: { regex: pattern.regex, template: pattern.version };
|
|
8
|
+
/**
|
|
9
|
+
* Builds the version of a match. Without a template the first capture group is
|
|
10
|
+
* the version, as it is for every pattern written as a plain regex. With one,
|
|
11
|
+
* $1, $2 … $n are replaced by the corresponding groups; a template naming a
|
|
12
|
+
* group that did not participate in the match, or the invalid $0, yields no
|
|
13
|
+
* version rather than a half-built one.
|
|
14
|
+
*/
|
|
15
|
+
const resolveVersion = (match, template) => {
|
|
16
|
+
if (template === undefined) {
|
|
17
|
+
return match.length > 1 ? match[1] : undefined;
|
|
18
|
+
}
|
|
19
|
+
let missingGroup = false;
|
|
20
|
+
const version = template.replace(/\$(\d+)/g, (_placeholder, digits) => {
|
|
21
|
+
const index = Number(digits);
|
|
22
|
+
// $0 would be the whole match rather than a capture group, so it is not
|
|
23
|
+
// a valid placeholder and leaves the pattern without a version.
|
|
24
|
+
const group = index >= 1 ? match[index] : undefined;
|
|
25
|
+
if (group === undefined) {
|
|
26
|
+
missingGroup = true;
|
|
27
|
+
return "";
|
|
28
|
+
}
|
|
29
|
+
return group;
|
|
30
|
+
});
|
|
31
|
+
return missingGroup ? undefined : version;
|
|
32
|
+
};
|
|
33
|
+
export const matchString = (value, pattern) => {
|
|
34
|
+
const { regex, template } = splitPattern(pattern);
|
|
2
35
|
const regexExp = new RegExp(regex, "i");
|
|
3
36
|
const match = value.match(regexExp);
|
|
4
37
|
if (match) {
|
|
5
38
|
return {
|
|
6
39
|
hit: true,
|
|
7
|
-
version: match
|
|
40
|
+
version: resolveVersion(match, template),
|
|
8
41
|
index: match.index,
|
|
9
42
|
matchLength: match[0].length,
|
|
10
43
|
};
|
|
11
44
|
}
|
|
12
|
-
return {
|
|
45
|
+
return {
|
|
46
|
+
hit: false,
|
|
47
|
+
version: undefined,
|
|
48
|
+
index: undefined,
|
|
49
|
+
matchLength: undefined,
|
|
50
|
+
};
|
|
13
51
|
};
|
|
14
52
|
/**
|
|
15
53
|
* Like {@link matchString}, but returns the first match that does not overlap
|
|
@@ -18,10 +56,11 @@ export const matchString = (value, regex) => {
|
|
|
18
56
|
* matches that merely fall inside an excluded range are skipped in favour of the
|
|
19
57
|
* next one. With no excluded spans it is equivalent to {@link matchString}.
|
|
20
58
|
*/
|
|
21
|
-
export const matchStringOutsideSpans = (value,
|
|
59
|
+
export const matchStringOutsideSpans = (value, pattern, excludedSpans) => {
|
|
22
60
|
if (excludedSpans.length === 0) {
|
|
23
|
-
return matchString(value,
|
|
61
|
+
return matchString(value, pattern);
|
|
24
62
|
}
|
|
63
|
+
const { regex, template } = splitPattern(pattern);
|
|
25
64
|
const regexExp = new RegExp(regex, "gi");
|
|
26
65
|
let match;
|
|
27
66
|
while ((match = regexExp.exec(value)) !== null) {
|
|
@@ -36,13 +75,18 @@ export const matchStringOutsideSpans = (value, regex, excludedSpans) => {
|
|
|
36
75
|
if (!overlapsExcluded) {
|
|
37
76
|
return {
|
|
38
77
|
hit: true,
|
|
39
|
-
version: match
|
|
78
|
+
version: resolveVersion(match, template),
|
|
40
79
|
index: match.index,
|
|
41
80
|
matchLength: match[0].length,
|
|
42
81
|
};
|
|
43
82
|
}
|
|
44
83
|
}
|
|
45
|
-
return {
|
|
84
|
+
return {
|
|
85
|
+
hit: false,
|
|
86
|
+
version: undefined,
|
|
87
|
+
index: undefined,
|
|
88
|
+
matchLength: undefined,
|
|
89
|
+
};
|
|
46
90
|
};
|
|
47
91
|
export const extractMatchSnippet = (value, index, matchLength, options = {}) => {
|
|
48
92
|
const { context = 40, maxMatchLength = 120, maxValueLength = 200 } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/analyzer/match.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/analyzer/match.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,6 +62,40 @@ describe("matchString", () => {
|
|
|
62
62
|
expect(result.version).toBe("1.20.0");
|
|
63
63
|
});
|
|
64
64
|
});
|
|
65
|
+
describe("version templates", () => {
|
|
66
|
+
it("joins several capture groups", () => {
|
|
67
|
+
const result = matchString('major:"8",minor:"8.2"', {
|
|
68
|
+
regex: 'major:"(\\d+)",minor:"([\\d.]+)"',
|
|
69
|
+
version: "$1.$2",
|
|
70
|
+
});
|
|
71
|
+
expect(result.hit).toBe(true);
|
|
72
|
+
expect(result.version).toBe("8.8.2");
|
|
73
|
+
});
|
|
74
|
+
it("keeps the literal text of the template", () => {
|
|
75
|
+
const result = matchString("v1 build 7", {
|
|
76
|
+
regex: "v(\\d+) build (\\d+)",
|
|
77
|
+
version: "$1.0.$2",
|
|
78
|
+
});
|
|
79
|
+
expect(result.version).toBe("1.0.7");
|
|
80
|
+
});
|
|
81
|
+
it("reports no version when a group named by the template did not match", () => {
|
|
82
|
+
const result = matchString('major:"8"', {
|
|
83
|
+
regex: 'major:"(\\d+)"(?:,minor:"([\\d.]+)")?',
|
|
84
|
+
version: "$1.$2",
|
|
85
|
+
});
|
|
86
|
+
expect(result.hit).toBe(true);
|
|
87
|
+
expect(result.version).toBeUndefined();
|
|
88
|
+
});
|
|
89
|
+
it("applies the template when spans are excluded as well", () => {
|
|
90
|
+
const value = 'skip:"1",minor:"0" major:"8",minor:"8.2"';
|
|
91
|
+
const result = matchStringOutsideSpans(value, {
|
|
92
|
+
regex: '(?:major|skip):"(\\d+)",minor:"([\\d.]+)"',
|
|
93
|
+
version: "$1.$2",
|
|
94
|
+
}, [[0, 18]]);
|
|
95
|
+
expect(result.hit).toBe(true);
|
|
96
|
+
expect(result.version).toBe("8.8.2");
|
|
97
|
+
});
|
|
98
|
+
});
|
|
65
99
|
describe("edge cases", () => {
|
|
66
100
|
it("should handle empty string input", () => {
|
|
67
101
|
const result = matchString("", "nginx");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.test.js","sourceRoot":"","sources":["../../src/analyzer/match.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,WAAW,EACX,uBAAuB,GACxB,MAAM,YAAY,CAAC;AAEpB,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,MAAM,GAAG,uBAAuB,
|
|
1
|
+
{"version":3,"file":"match.test.js","sourceRoot":"","sources":["../../src/analyzer/match.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
export type Confidence = "high" | "medium" | "low";
|
|
2
2
|
export type Runtime = "client" | "server";
|
|
3
3
|
export type Regex = string;
|
|
4
|
+
export type VersionedRegex = {
|
|
5
|
+
regex: Regex;
|
|
6
|
+
version: string;
|
|
7
|
+
};
|
|
8
|
+
export type Pattern = Regex | VersionedRegex;
|
|
4
9
|
export type Rule = {
|
|
5
10
|
confidence: Confidence;
|
|
6
|
-
headers?: Record<string,
|
|
7
|
-
bodies?:
|
|
8
|
-
urls?:
|
|
9
|
-
cookies?: Record<string,
|
|
10
|
-
javascriptVariables?: Record<string,
|
|
11
|
+
headers?: Record<string, Pattern>;
|
|
12
|
+
bodies?: Pattern[];
|
|
13
|
+
urls?: Pattern[];
|
|
14
|
+
cookies?: Record<string, Pattern>;
|
|
15
|
+
javascriptVariables?: Record<string, Pattern>;
|
|
11
16
|
requireAnyOfJavascriptVariables?: string[];
|
|
12
17
|
};
|
|
13
18
|
export type ActiveRule = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_types.d.ts","sourceRoot":"","sources":["../../src/signatures/_types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;AACnD,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE1C,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"_types.d.ts","sourceRoot":"","sources":["../../src/signatures/_types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;AACnD,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE1C,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC;AAQ3B,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,KAAK,GAAG,cAAc,CAAC;AAE7C,MAAM,MAAM,IAAI,GAAG;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAG9C,+BAA+B,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,KAAK,EAAE,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,IAAI,CAAC;IAEZ,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAI5B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC"}
|
|
@@ -39,11 +39,24 @@ describe("signatures validation", () => {
|
|
|
39
39
|
});
|
|
40
40
|
describe("regex patterns", () => {
|
|
41
41
|
const testRegex = (pattern, sigName, field) => {
|
|
42
|
+
const regex = typeof pattern === "string" ? pattern : pattern.regex;
|
|
43
|
+
let compiled;
|
|
42
44
|
try {
|
|
43
|
-
new RegExp(
|
|
45
|
+
compiled = new RegExp(regex, "i");
|
|
44
46
|
}
|
|
45
47
|
catch {
|
|
46
|
-
throw new Error(`Invalid regex in ${sigName}.${field}: "${
|
|
48
|
+
throw new Error(`Invalid regex in ${sigName}.${field}: "${regex}"`);
|
|
49
|
+
}
|
|
50
|
+
if (typeof pattern === "string") {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
// A version template may only name capture groups the regex actually has,
|
|
54
|
+
// otherwise the pattern silently reports no version at all.
|
|
55
|
+
const groupCount = new RegExp(`${compiled.source}|`).exec("").length - 1;
|
|
56
|
+
for (const [, digits] of pattern.version.matchAll(/\$(\d+)/g)) {
|
|
57
|
+
const message = `Version template of ${sigName}.${field} refers to $${digits}, but "${regex}" has ${groupCount} capture group(s)`;
|
|
58
|
+
expect(Number(digits), message).toBeGreaterThanOrEqual(1);
|
|
59
|
+
expect(Number(digits), message).toBeLessThanOrEqual(groupCount);
|
|
47
60
|
}
|
|
48
61
|
};
|
|
49
62
|
it("all header patterns should be valid regex", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signatures.test.js","sourceRoot":"","sources":["../../src/signatures/signatures.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"signatures.test.js","sourceRoot":"","sources":["../../src/signatures/signatures.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { matchString } from "../../analyzer/match.js";
|
|
|
3
3
|
import { movableTypeSignature } from "./movable_type.js";
|
|
4
4
|
describe("movableTypeSignature", () => {
|
|
5
5
|
describe("rule (passive, public-facing markers)", () => {
|
|
6
|
-
const bodies = movableTypeSignature.rule?.bodies ?? [];
|
|
6
|
+
const bodies = (movableTypeSignature.rule?.bodies ?? []).filter((pattern) => typeof pattern === "string");
|
|
7
7
|
const urls = movableTypeSignature.rule?.urls ?? [];
|
|
8
8
|
const generatorRegex = bodies.find((r) => r.includes("generator"));
|
|
9
9
|
it("matches the generator meta tag without a version", () => {
|
|
@@ -51,7 +51,7 @@ describe("movableTypeSignature", () => {
|
|
|
51
51
|
expect(bodies.some((r) => matchString(html, r).hit)).toBe(false);
|
|
52
52
|
});
|
|
53
53
|
it("does not match an unrelated page", () => {
|
|
54
|
-
const html =
|
|
54
|
+
const html = "<html><head><title>Some Blog</title>" +
|
|
55
55
|
'<meta name="generator" content="WordPress 6.5" /></head></html>';
|
|
56
56
|
expect(bodies.some((r) => matchString(html, r).hit)).toBe(false);
|
|
57
57
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"movable_type.test.js","sourceRoot":"","sources":["../../../src/signatures/technologies/movable_type.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;QACrD,MAAM,MAAM,GAAG,oBAAoB,CAAC,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"movable_type.test.js","sourceRoot":"","sources":["../../../src/signatures/technologies/movable_type.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tinymce.d.ts","sourceRoot":"","sources":["../../../src/signatures/technologies/tinymce.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,eAAO,MAAM,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"tinymce.d.ts","sourceRoot":"","sources":["../../../src/signatures/technologies/tinymce.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,eAAO,MAAM,gBAAgB,EAAE,SA8B9B,CAAC"}
|
|
@@ -5,8 +5,24 @@ export const tinyMceSignature = {
|
|
|
5
5
|
rule: {
|
|
6
6
|
confidence: "high",
|
|
7
7
|
urls: ["/tiny_?mce(?:\\.min)?\\.js"],
|
|
8
|
+
bodies: [
|
|
9
|
+
{
|
|
10
|
+
// TinyMCE never carries the whole version in one place: majorVersion
|
|
11
|
+
// holds "8" on its own and minorVersion the remainder ("8.2"). The two
|
|
12
|
+
// sit next to each other ahead of the release date in every major from
|
|
13
|
+
// 4 onwards, and they survive being bundled into an application bundle,
|
|
14
|
+
// where the version banner is dropped and the file no longer matches
|
|
15
|
+
// the script URL above. Reading the banner instead would miss exactly
|
|
16
|
+
// those builds.
|
|
17
|
+
regex: 'majorVersion:"(\\d+)",\\s*minorVersion:"(\\d+(?:\\.\\d+)*)",\\s*releaseDate:"',
|
|
18
|
+
version: "$1.$2",
|
|
19
|
+
},
|
|
20
|
+
],
|
|
8
21
|
javascriptVariables: {
|
|
9
|
-
|
|
22
|
+
// Presence check only: this global holds the major number alone, so
|
|
23
|
+
// capturing it would report a second, less precise version next to the
|
|
24
|
+
// one built above, detections being split per distinct version.
|
|
25
|
+
"tinyMCE.majorVersion": "",
|
|
10
26
|
tinymce: "",
|
|
11
27
|
},
|
|
12
28
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tinymce.js","sourceRoot":"","sources":["../../../src/signatures/technologies/tinymce.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,gBAAgB,GAAc;IACzC,IAAI,EAAE,SAAS;IACf,WAAW,EACT,iOAAiO;IACnO,GAAG,EAAE,qBAAqB;IAC1B,IAAI,EAAE;QACJ,UAAU,EAAE,MAAM;QAClB,IAAI,EAAE,CAAC,4BAA4B,CAAC;QACpC,mBAAmB,EAAE;YACnB,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"tinymce.js","sourceRoot":"","sources":["../../../src/signatures/technologies/tinymce.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,gBAAgB,GAAc;IACzC,IAAI,EAAE,SAAS;IACf,WAAW,EACT,iOAAiO;IACnO,GAAG,EAAE,qBAAqB;IAC1B,IAAI,EAAE;QACJ,UAAU,EAAE,MAAM;QAClB,IAAI,EAAE,CAAC,4BAA4B,CAAC;QACpC,MAAM,EAAE;YACN;gBACE,qEAAqE;gBACrE,uEAAuE;gBACvE,uEAAuE;gBACvE,wEAAwE;gBACxE,qEAAqE;gBACrE,sEAAsE;gBACtE,gBAAgB;gBAChB,KAAK,EACH,+EAA+E;gBACjF,OAAO,EAAE,OAAO;aACjB;SACF;QACD,mBAAmB,EAAE;YACnB,oEAAoE;YACpE,uEAAuE;YACvE,gEAAgE;YAChE,sBAAsB,EAAE,EAAE;YAC1B,OAAO,EAAE,EAAE;SACZ;KACF;CACF,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tinymce.test.d.ts","sourceRoot":"","sources":["../../../src/signatures/technologies/tinymce.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { applySignature } from "../../analyzer/apply.js";
|
|
3
|
+
import { tinyMceSignature } from "./tinymce.js";
|
|
4
|
+
function createMockContext(overrides = {}) {
|
|
5
|
+
return {
|
|
6
|
+
browser: {},
|
|
7
|
+
page: {},
|
|
8
|
+
urls: [],
|
|
9
|
+
responses: [],
|
|
10
|
+
cookies: [],
|
|
11
|
+
javascriptVariables: {},
|
|
12
|
+
timeoutMs: 30000,
|
|
13
|
+
timeoutOccurred: false,
|
|
14
|
+
...overrides,
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
function createMockResponse(overrides = {}) {
|
|
18
|
+
return {
|
|
19
|
+
url: "https://example.com/js/tinymce/tinymce.min.js",
|
|
20
|
+
host: "example.com",
|
|
21
|
+
isFirstParty: true,
|
|
22
|
+
status: 200,
|
|
23
|
+
headers: { "content-type": "application/javascript" },
|
|
24
|
+
body: "",
|
|
25
|
+
...overrides,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
function versionsOf(detection) {
|
|
29
|
+
return [
|
|
30
|
+
...new Set((detection?.evidences ?? [])
|
|
31
|
+
.map((evidence) => evidence.version)
|
|
32
|
+
.filter((version) => version !== undefined)),
|
|
33
|
+
];
|
|
34
|
+
}
|
|
35
|
+
function editorManager(major, minor) {
|
|
36
|
+
return `documentBaseURL:null,suffix:null,majorVersion:"${major}",minorVersion:"${minor}",releaseDate:"2026-07-27",i18n:t`;
|
|
37
|
+
}
|
|
38
|
+
describe("tinyMceSignature", () => {
|
|
39
|
+
describe("body matching", () => {
|
|
40
|
+
it("joins the major and minor fields into the full version", () => {
|
|
41
|
+
const context = createMockContext({
|
|
42
|
+
responses: [createMockResponse({ body: editorManager("8", "8.2") })],
|
|
43
|
+
});
|
|
44
|
+
expect(versionsOf(applySignature(context, tinyMceSignature))).toEqual([
|
|
45
|
+
"8.8.2",
|
|
46
|
+
]);
|
|
47
|
+
});
|
|
48
|
+
it("reads the same fields in a TinyMCE 4 bundle", () => {
|
|
49
|
+
const context = createMockContext({
|
|
50
|
+
responses: [createMockResponse({ body: editorManager("4", "9.11") })],
|
|
51
|
+
});
|
|
52
|
+
expect(versionsOf(applySignature(context, tinyMceSignature))).toEqual([
|
|
53
|
+
"4.9.11",
|
|
54
|
+
]);
|
|
55
|
+
});
|
|
56
|
+
it("reads the version out of an application bundle", () => {
|
|
57
|
+
const context = createMockContext({
|
|
58
|
+
responses: [
|
|
59
|
+
createMockResponse({
|
|
60
|
+
url: "https://example.com/static/spa/index-3ef96762.js",
|
|
61
|
+
body: `var e=1;${editorManager("8", "8.2")};export{e};`,
|
|
62
|
+
}),
|
|
63
|
+
],
|
|
64
|
+
});
|
|
65
|
+
expect(versionsOf(applySignature(context, tinyMceSignature))).toEqual([
|
|
66
|
+
"8.8.2",
|
|
67
|
+
]);
|
|
68
|
+
});
|
|
69
|
+
it("ignores a version named in prose on an unrelated page", () => {
|
|
70
|
+
const context = createMockContext({
|
|
71
|
+
responses: [
|
|
72
|
+
createMockResponse({
|
|
73
|
+
url: "https://example.com/blog/release-notes.html",
|
|
74
|
+
headers: { "content-type": "text/html" },
|
|
75
|
+
body: "<p>We upgraded to TinyMCE version 5.10.9 (2023-11-15) last year.</p>",
|
|
76
|
+
}),
|
|
77
|
+
],
|
|
78
|
+
});
|
|
79
|
+
expect(applySignature(context, tinyMceSignature)).toBeUndefined();
|
|
80
|
+
});
|
|
81
|
+
it("detects a bundle without the version fields but reports no version", () => {
|
|
82
|
+
const context = createMockContext({
|
|
83
|
+
responses: [
|
|
84
|
+
createMockResponse({ body: '!function(){"use strict"}();' }),
|
|
85
|
+
],
|
|
86
|
+
});
|
|
87
|
+
const detection = applySignature(context, tinyMceSignature);
|
|
88
|
+
expect(detection).toBeDefined();
|
|
89
|
+
expect(versionsOf(detection)).toEqual([]);
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
describe("javascript variables", () => {
|
|
93
|
+
it("detects TinyMCE without reporting the major number as a version", () => {
|
|
94
|
+
const context = createMockContext({
|
|
95
|
+
javascriptVariables: {
|
|
96
|
+
"tinyMCE.majorVersion": "8",
|
|
97
|
+
tinymce: { majorVersion: "8", minorVersion: "8.2" },
|
|
98
|
+
},
|
|
99
|
+
});
|
|
100
|
+
const detection = applySignature(context, tinyMceSignature);
|
|
101
|
+
expect(detection).toBeDefined();
|
|
102
|
+
expect(versionsOf(detection)).toEqual([]);
|
|
103
|
+
});
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
//# sourceMappingURL=tinymce.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tinymce.test.js","sourceRoot":"","sources":["../../../src/signatures/technologies/tinymce.test.ts"],"names":[],"mappings":"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"}
|