@kevinrabun/judges 3.0.3 → 3.1.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/api.d.ts +5 -2
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +5 -2
- package/dist/api.js.map +1 -1
- package/dist/ast/structural-parser.d.ts.map +1 -1
- package/dist/ast/structural-parser.js +112 -5
- package/dist/ast/structural-parser.js.map +1 -1
- package/dist/ast/types.d.ts +8 -0
- package/dist/ast/types.d.ts.map +1 -1
- package/dist/cache.d.ts +32 -0
- package/dist/cache.d.ts.map +1 -0
- package/dist/cache.js +63 -0
- package/dist/cache.js.map +1 -0
- package/dist/evaluators/authentication.d.ts.map +1 -1
- package/dist/evaluators/authentication.js +9 -5
- package/dist/evaluators/authentication.js.map +1 -1
- package/dist/evaluators/cybersecurity.d.ts.map +1 -1
- package/dist/evaluators/cybersecurity.js +3 -1
- package/dist/evaluators/cybersecurity.js.map +1 -1
- package/dist/evaluators/error-handling.d.ts.map +1 -1
- package/dist/evaluators/error-handling.js +10 -4
- package/dist/evaluators/error-handling.js.map +1 -1
- package/dist/evaluators/index.d.ts +2 -0
- package/dist/evaluators/index.d.ts.map +1 -1
- package/dist/evaluators/index.js +53 -5
- package/dist/evaluators/index.js.map +1 -1
- package/dist/evaluators/project.d.ts +2 -0
- package/dist/evaluators/project.d.ts.map +1 -1
- package/dist/evaluators/project.js +14 -2
- package/dist/evaluators/project.js.map +1 -1
- package/dist/evaluators/rate-limiting.d.ts.map +1 -1
- package/dist/evaluators/rate-limiting.js +6 -2
- package/dist/evaluators/rate-limiting.js.map +1 -1
- package/dist/evaluators/shared.d.ts +14 -0
- package/dist/evaluators/shared.d.ts.map +1 -1
- package/dist/evaluators/shared.js +100 -20
- package/dist/evaluators/shared.js.map +1 -1
- package/dist/formatters/sarif.d.ts +15 -0
- package/dist/formatters/sarif.d.ts.map +1 -1
- package/dist/formatters/sarif.js +140 -0
- package/dist/formatters/sarif.js.map +1 -1
- package/dist/patches/index.d.ts.map +1 -1
- package/dist/patches/index.js +149 -0
- package/dist/patches/index.js.map +1 -1
- package/dist/scoring.d.ts.map +1 -1
- package/dist/scoring.js +5 -0
- package/dist/scoring.js.map +1 -1
- package/dist/types.d.ts +13 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -88,6 +88,89 @@ export function classifyFile(code, language, filePath) {
|
|
|
88
88
|
export function shouldRunAbsenceRules(category) {
|
|
89
89
|
return category === "server" || category === "unknown";
|
|
90
90
|
}
|
|
91
|
+
const FRAMEWORK_DETECT_PATTERNS = [
|
|
92
|
+
// ── JavaScript / TypeScript ──
|
|
93
|
+
["express", /\brequire\s*\(\s*['"]express['"]\)|from\s+['"]express['"]/],
|
|
94
|
+
["next", /from\s+['"]next['"\/]|getServerSideProps|getStaticProps|NextRequest|NextResponse/],
|
|
95
|
+
["hono", /from\s+['"]hono['"\/]|new\s+Hono\s*\(/],
|
|
96
|
+
["koa", /from\s+['"]koa['"\/]|new\s+Koa\s*\(|require\s*\(\s*['"]koa['"]\)/],
|
|
97
|
+
["fastify", /from\s+['"]fastify['"\/]|require\s*\(\s*['"]fastify['"]\)/],
|
|
98
|
+
["helmet", /\bhelmet\s*\(|from\s+['"]helmet['"]/],
|
|
99
|
+
["express-rate-limit", /express-rate-limit|rateLimit\s*\(\s*\{/],
|
|
100
|
+
["cors-middleware", /\bcors\s*\(|from\s+['"]cors['"]/],
|
|
101
|
+
["csurf", /csurf|csrf-csrf/],
|
|
102
|
+
// ── Python ──
|
|
103
|
+
["fastapi", /from\s+fastapi\s+import|FastAPI\s*\(/],
|
|
104
|
+
["django", /from\s+django\b|django\.\w+|INSTALLED_APPS/],
|
|
105
|
+
["flask", /from\s+flask\s+import|Flask\s*\(__name__\)/],
|
|
106
|
+
// ── Java ──
|
|
107
|
+
["spring", /@SpringBootApplication|@RestController|@(?:Get|Post|Put|Delete)Mapping/],
|
|
108
|
+
// ── C# ──
|
|
109
|
+
["aspnet", /\[ApiController\]|ControllerBase|Microsoft\.AspNetCore/],
|
|
110
|
+
// ── Go ──
|
|
111
|
+
["gin", /gin\.Default\s*\(|"github\.com\/gin-gonic\/gin"/],
|
|
112
|
+
// ── Rust ──
|
|
113
|
+
["actix", /use\s+actix_web|HttpServer::new\s*\(/],
|
|
114
|
+
];
|
|
115
|
+
/**
|
|
116
|
+
* Finding-title patterns that each framework inherently mitigates.
|
|
117
|
+
* When a framework is detected, findings matching these patterns have their
|
|
118
|
+
* confidence reduced because the framework likely handles the concern.
|
|
119
|
+
*/
|
|
120
|
+
const FRAMEWORK_MITIGATIONS = {
|
|
121
|
+
// Middleware that explicitly handles specific concerns
|
|
122
|
+
helmet: /security.?header|x-frame|hsts|content.security.policy|clickjack/i,
|
|
123
|
+
"express-rate-limit": /rate.?limit|throttl|brute.?force/i,
|
|
124
|
+
"cors-middleware": /cors|cross.?origin/i,
|
|
125
|
+
csurf: /csrf|cross.?site\s*request/i,
|
|
126
|
+
// Frameworks with built-in security features
|
|
127
|
+
next: /csrf|security.?header|x-frame/i,
|
|
128
|
+
django: /csrf|security.?header|xss|cross.?site\s*script/i,
|
|
129
|
+
fastapi: /input.?valid|type.?check|request.?valid|unsanitized.?input/i,
|
|
130
|
+
spring: /csrf|cross.?site\s*request/i,
|
|
131
|
+
aspnet: /csrf|cross.?site\s*request|input.?valid/i,
|
|
132
|
+
gin: /panic|recovery|unhandled/i,
|
|
133
|
+
};
|
|
134
|
+
/** Confidence reduction when a framework already handles the concern. */
|
|
135
|
+
const FRAMEWORK_CONFIDENCE_REDUCTION = 0.2;
|
|
136
|
+
/**
|
|
137
|
+
* Detect frameworks and security middleware from code patterns.
|
|
138
|
+
* Works across all languages — no AST required.
|
|
139
|
+
*/
|
|
140
|
+
export function detectFrameworks(code) {
|
|
141
|
+
const detected = [];
|
|
142
|
+
for (const [name, regex] of FRAMEWORK_DETECT_PATTERNS) {
|
|
143
|
+
if (regex.test(code))
|
|
144
|
+
detected.push(name);
|
|
145
|
+
}
|
|
146
|
+
return detected;
|
|
147
|
+
}
|
|
148
|
+
/**
|
|
149
|
+
* Reduce confidence on findings that are mitigated by a detected framework
|
|
150
|
+
* or middleware. This is complementary to AST-based import awareness —
|
|
151
|
+
* it works for all languages and detects framework-level mitigations
|
|
152
|
+
* (e.g. Django CSRF, FastAPI validation) that import-level checks miss.
|
|
153
|
+
*/
|
|
154
|
+
export function applyFrameworkAwareness(findings, code) {
|
|
155
|
+
const frameworks = detectFrameworks(code);
|
|
156
|
+
if (frameworks.length === 0)
|
|
157
|
+
return findings;
|
|
158
|
+
return findings.map((f) => {
|
|
159
|
+
for (const fw of frameworks) {
|
|
160
|
+
const pattern = FRAMEWORK_MITIGATIONS[fw];
|
|
161
|
+
if (pattern && pattern.test(f.title)) {
|
|
162
|
+
const currentConf = f.confidence ?? 0.5;
|
|
163
|
+
const newConf = Math.max(0, Math.min(1, currentConf - FRAMEWORK_CONFIDENCE_REDUCTION));
|
|
164
|
+
return {
|
|
165
|
+
...f,
|
|
166
|
+
confidence: newConf,
|
|
167
|
+
provenance: f.provenance ? `${f.provenance}; ${fw}-mitigated` : `${fw}-mitigated`,
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
return f;
|
|
172
|
+
});
|
|
173
|
+
}
|
|
91
174
|
// ─── Shared Utilities ────────────────────────────────────────────────────────
|
|
92
175
|
// Helper functions used by all analyzer modules and the evaluation engine.
|
|
93
176
|
// ──────────────────────────────────────────────────────────────────────────────
|
|
@@ -221,38 +304,35 @@ export function detectPositiveSignals(code) {
|
|
|
221
304
|
return Math.min(bonus, 15);
|
|
222
305
|
}
|
|
223
306
|
export function calculateScore(findings, code) {
|
|
307
|
+
const basePenalty = {
|
|
308
|
+
critical: 30,
|
|
309
|
+
high: 18,
|
|
310
|
+
medium: 10,
|
|
311
|
+
low: 5,
|
|
312
|
+
info: 2,
|
|
313
|
+
};
|
|
224
314
|
let score = 100;
|
|
225
315
|
for (const f of findings) {
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
case "high":
|
|
231
|
-
score -= 18;
|
|
232
|
-
break;
|
|
233
|
-
case "medium":
|
|
234
|
-
score -= 10;
|
|
235
|
-
break;
|
|
236
|
-
case "low":
|
|
237
|
-
score -= 5;
|
|
238
|
-
break;
|
|
239
|
-
case "info":
|
|
240
|
-
score -= 2;
|
|
241
|
-
break;
|
|
242
|
-
}
|
|
316
|
+
const penalty = basePenalty[f.severity] ?? 0;
|
|
317
|
+
// Weight deductions by confidence — low-confidence findings have less impact
|
|
318
|
+
const confidence = f.confidence ?? 0.5;
|
|
319
|
+
score -= penalty * confidence;
|
|
243
320
|
}
|
|
244
321
|
// Add positive signals bonus if code is provided
|
|
245
322
|
if (code) {
|
|
246
323
|
score += detectPositiveSignals(code);
|
|
247
324
|
}
|
|
248
|
-
return Math.max(0, Math.min(100, score));
|
|
325
|
+
return Math.max(0, Math.min(100, Math.round(score)));
|
|
249
326
|
}
|
|
250
327
|
export function deriveVerdict(findings, score) {
|
|
251
|
-
|
|
328
|
+
// Only fail on critical findings with sufficient confidence
|
|
329
|
+
if (findings.some((f) => f.severity === "critical" && (f.confidence ?? 0.5) >= 0.6))
|
|
252
330
|
return "fail";
|
|
253
331
|
if (score < 60)
|
|
254
332
|
return "fail";
|
|
255
|
-
|
|
333
|
+
// High/medium findings need reasonable confidence to trigger warning
|
|
334
|
+
const significantFindings = findings.filter((f) => (f.severity === "high" || f.severity === "medium") && (f.confidence ?? 0.5) >= 0.4);
|
|
335
|
+
if (significantFindings.length > 0 || score < 80)
|
|
256
336
|
return "warning";
|
|
257
337
|
return "pass";
|
|
258
338
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/evaluators/shared.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/evaluators/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,5 +71,20 @@ export declare function evaluationToSarif(evaluation: JudgeEvaluation, filePath?
|
|
|
71
71
|
* Convert a full TribunalVerdict (all judges) into SARIF.
|
|
72
72
|
*/
|
|
73
73
|
export declare function verdictToSarif(verdict: TribunalVerdict, filePath?: string, version?: string): SarifLog;
|
|
74
|
+
/**
|
|
75
|
+
* Validation error returned by validateSarifLog.
|
|
76
|
+
*/
|
|
77
|
+
export interface SarifValidationError {
|
|
78
|
+
path: string;
|
|
79
|
+
message: string;
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* Validate that a JSON object structurally conforms to the SARIF 2.1.0 schema.
|
|
83
|
+
* This is a lightweight check of all mandatory properties and value constraints
|
|
84
|
+
* without requiring the full JSON Schema or ajv dependency.
|
|
85
|
+
*
|
|
86
|
+
* @returns Array of validation errors (empty = valid)
|
|
87
|
+
*/
|
|
88
|
+
export declare function validateSarifLog(log: unknown): SarifValidationError[];
|
|
74
89
|
export {};
|
|
75
90
|
//# sourceMappingURL=sarif.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sarif.d.ts","sourceRoot":"","sources":["../../src/formatters/sarif.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAY,MAAM,aAAa,CAAC;AAIvF,UAAU,QAAQ;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,QAAQ,EAAE,CAAC;CAClB;AAED,UAAU,QAAQ;IAChB,IAAI,EAAE;QAAE,MAAM,EAAE,WAAW,CAAA;KAAE,CAAC;IAC9B,OAAO,EAAE,WAAW,EAAE,CAAC;CACxB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,SAAS,EAAE,CAAC;CACpB;AAED,UAAU,SAAS;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,oBAAoB,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,CAAC;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;AAED,UAAU,aAAa;IACrB,gBAAgB,EAAE;QAChB,gBAAgB,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;QAClC,MAAM,EAAE;YAAE,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC;KAC/B,CAAC;CACH;AAED,KAAK,UAAU,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AAsCxD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,QAAQ,SAAc,EAAE,OAAO,SAAU,GAAG,QAAQ,CAgCxG;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,QAAQ,CAE5G;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,QAAQ,CAGtG"}
|
|
1
|
+
{"version":3,"file":"sarif.d.ts","sourceRoot":"","sources":["../../src/formatters/sarif.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAY,MAAM,aAAa,CAAC;AAIvF,UAAU,QAAQ;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,QAAQ,EAAE,CAAC;CAClB;AAED,UAAU,QAAQ;IAChB,IAAI,EAAE;QAAE,MAAM,EAAE,WAAW,CAAA;KAAE,CAAC;IAC9B,OAAO,EAAE,WAAW,EAAE,CAAC;CACxB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,SAAS,EAAE,CAAC;CACpB;AAED,UAAU,SAAS;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,oBAAoB,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,CAAC;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;AAED,UAAU,aAAa;IACrB,gBAAgB,EAAE;QAChB,gBAAgB,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;QAClC,MAAM,EAAE;YAAE,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC;KAC/B,CAAC;CACH;AAED,KAAK,UAAU,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AAsCxD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,QAAQ,SAAc,EAAE,OAAO,SAAU,GAAG,QAAQ,CAgCxG;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,QAAQ,CAE5G;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,QAAQ,CAGtG;AAID;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAID;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,oBAAoB,EAAE,CA0JrE"}
|
package/dist/formatters/sarif.js
CHANGED
|
@@ -90,4 +90,144 @@ export function verdictToSarif(verdict, filePath, version) {
|
|
|
90
90
|
const allFindings = verdict.evaluations.flatMap((e) => e.findings);
|
|
91
91
|
return findingsToSarif(allFindings, filePath, version);
|
|
92
92
|
}
|
|
93
|
+
const VALID_SARIF_LEVELS = new Set(["error", "warning", "note", "none"]);
|
|
94
|
+
/**
|
|
95
|
+
* Validate that a JSON object structurally conforms to the SARIF 2.1.0 schema.
|
|
96
|
+
* This is a lightweight check of all mandatory properties and value constraints
|
|
97
|
+
* without requiring the full JSON Schema or ajv dependency.
|
|
98
|
+
*
|
|
99
|
+
* @returns Array of validation errors (empty = valid)
|
|
100
|
+
*/
|
|
101
|
+
export function validateSarifLog(log) {
|
|
102
|
+
const errors = [];
|
|
103
|
+
if (typeof log !== "object" || log === null || Array.isArray(log)) {
|
|
104
|
+
errors.push({ path: "$", message: "Root must be a non-null object" });
|
|
105
|
+
return errors;
|
|
106
|
+
}
|
|
107
|
+
const obj = log;
|
|
108
|
+
// Top-level required properties
|
|
109
|
+
if (obj.version !== "2.1.0") {
|
|
110
|
+
errors.push({ path: "$.version", message: `Must be "2.1.0", got ${JSON.stringify(obj.version)}` });
|
|
111
|
+
}
|
|
112
|
+
if (typeof obj.$schema !== "string" || !obj.$schema) {
|
|
113
|
+
errors.push({ path: "$.$schema", message: "Must be a non-empty string URI" });
|
|
114
|
+
}
|
|
115
|
+
if (!Array.isArray(obj.runs)) {
|
|
116
|
+
errors.push({ path: "$.runs", message: "Must be an array" });
|
|
117
|
+
return errors;
|
|
118
|
+
}
|
|
119
|
+
if (obj.runs.length === 0) {
|
|
120
|
+
errors.push({ path: "$.runs", message: "Must contain at least one run" });
|
|
121
|
+
return errors;
|
|
122
|
+
}
|
|
123
|
+
// Validate each run
|
|
124
|
+
for (let ri = 0; ri < obj.runs.length; ri++) {
|
|
125
|
+
const run = obj.runs[ri];
|
|
126
|
+
const rp = `$.runs[${ri}]`;
|
|
127
|
+
if (typeof run !== "object" || run === null) {
|
|
128
|
+
errors.push({ path: rp, message: "Run must be a non-null object" });
|
|
129
|
+
continue;
|
|
130
|
+
}
|
|
131
|
+
// tool.driver is required
|
|
132
|
+
const tool = run.tool;
|
|
133
|
+
if (typeof tool !== "object" || tool === null) {
|
|
134
|
+
errors.push({ path: `${rp}.tool`, message: "Required object" });
|
|
135
|
+
continue;
|
|
136
|
+
}
|
|
137
|
+
const driver = tool.driver;
|
|
138
|
+
if (typeof driver !== "object" || driver === null) {
|
|
139
|
+
errors.push({ path: `${rp}.tool.driver`, message: "Required object" });
|
|
140
|
+
continue;
|
|
141
|
+
}
|
|
142
|
+
if (typeof driver.name !== "string" || !driver.name) {
|
|
143
|
+
errors.push({ path: `${rp}.tool.driver.name`, message: "Required non-empty string" });
|
|
144
|
+
}
|
|
145
|
+
// rules array (optional per spec, but we always emit it)
|
|
146
|
+
if (driver.rules !== undefined) {
|
|
147
|
+
if (!Array.isArray(driver.rules)) {
|
|
148
|
+
errors.push({ path: `${rp}.tool.driver.rules`, message: "Must be an array if present" });
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
for (let rri = 0; rri < driver.rules.length; rri++) {
|
|
152
|
+
const rule = driver.rules[rri];
|
|
153
|
+
const rrp = `${rp}.tool.driver.rules[${rri}]`;
|
|
154
|
+
if (typeof rule.id !== "string" || !rule.id) {
|
|
155
|
+
errors.push({ path: `${rrp}.id`, message: "Required non-empty string" });
|
|
156
|
+
}
|
|
157
|
+
if (rule.shortDescription !== undefined) {
|
|
158
|
+
const sd = rule.shortDescription;
|
|
159
|
+
if (typeof sd !== "object" || typeof sd.text !== "string") {
|
|
160
|
+
errors.push({ path: `${rrp}.shortDescription.text`, message: "Must be a string" });
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
if (rule.defaultConfiguration !== undefined) {
|
|
164
|
+
const dc = rule.defaultConfiguration;
|
|
165
|
+
if (typeof dc === "object" && dc !== null && dc.level !== undefined) {
|
|
166
|
+
if (!VALID_SARIF_LEVELS.has(dc.level)) {
|
|
167
|
+
errors.push({
|
|
168
|
+
path: `${rrp}.defaultConfiguration.level`,
|
|
169
|
+
message: `Must be one of: error, warning, note, none. Got ${JSON.stringify(dc.level)}`,
|
|
170
|
+
});
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
// results array
|
|
178
|
+
if (!Array.isArray(run.results)) {
|
|
179
|
+
errors.push({ path: `${rp}.results`, message: "Required array" });
|
|
180
|
+
continue;
|
|
181
|
+
}
|
|
182
|
+
for (let si = 0; si < run.results.length; si++) {
|
|
183
|
+
const result = run.results[si];
|
|
184
|
+
const sp = `${rp}.results[${si}]`;
|
|
185
|
+
if (typeof result.ruleId !== "string") {
|
|
186
|
+
errors.push({ path: `${sp}.ruleId`, message: "Must be a string" });
|
|
187
|
+
}
|
|
188
|
+
if (result.level !== undefined && !VALID_SARIF_LEVELS.has(result.level)) {
|
|
189
|
+
errors.push({
|
|
190
|
+
path: `${sp}.level`,
|
|
191
|
+
message: `Must be one of: error, warning, note, none. Got ${JSON.stringify(result.level)}`,
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
// message.text is required
|
|
195
|
+
const msg = result.message;
|
|
196
|
+
if (typeof msg !== "object" || msg === null || typeof msg.text !== "string") {
|
|
197
|
+
errors.push({ path: `${sp}.message.text`, message: "Required string" });
|
|
198
|
+
}
|
|
199
|
+
// locations array (optional per spec but we always emit)
|
|
200
|
+
if (result.locations !== undefined) {
|
|
201
|
+
if (!Array.isArray(result.locations)) {
|
|
202
|
+
errors.push({ path: `${sp}.locations`, message: "Must be an array if present" });
|
|
203
|
+
}
|
|
204
|
+
else {
|
|
205
|
+
for (let li = 0; li < result.locations.length; li++) {
|
|
206
|
+
const loc = result.locations[li];
|
|
207
|
+
const lp = `${sp}.locations[${li}]`;
|
|
208
|
+
const phys = loc?.physicalLocation;
|
|
209
|
+
if (typeof phys !== "object" || phys === null) {
|
|
210
|
+
errors.push({ path: `${lp}.physicalLocation`, message: "Required object" });
|
|
211
|
+
continue;
|
|
212
|
+
}
|
|
213
|
+
const art = phys.artifactLocation;
|
|
214
|
+
if (typeof art !== "object" || typeof art?.uri !== "string") {
|
|
215
|
+
errors.push({ path: `${lp}.physicalLocation.artifactLocation.uri`, message: "Required string" });
|
|
216
|
+
}
|
|
217
|
+
const reg = phys.region;
|
|
218
|
+
if (reg !== undefined) {
|
|
219
|
+
if (typeof reg.startLine !== "number" || reg.startLine < 1) {
|
|
220
|
+
errors.push({
|
|
221
|
+
path: `${lp}.physicalLocation.region.startLine`,
|
|
222
|
+
message: "Must be a positive integer",
|
|
223
|
+
});
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
return errors;
|
|
232
|
+
}
|
|
93
233
|
//# sourceMappingURL=sarif.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sarif.js","sourceRoot":"","sources":["../../src/formatters/sarif.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAgDH,+EAA+E;AAE/E,SAAS,eAAe,CAAC,CAAW;IAClC,QAAQ,CAAC,EAAE,CAAC;QACV,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM;YACT,OAAO,OAAO,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,SAAS,CAAC;QACnB,KAAK,KAAK,CAAC;QACX,KAAK,MAAM;YACT,OAAO,MAAM,CAAC;QAChB;YACE,OAAO,MAAM,CAAC;IAClB,CAAC;AACH,CAAC;AAED,+EAA+E;AAE/E,SAAS,UAAU,CAAC,QAAmB;IACrC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC1C,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE;gBACjB,EAAE,EAAE,CAAC,CAAC,MAAM;gBACZ,IAAI,EAAE,CAAC,CAAC,KAAK;gBACb,gBAAgB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,cAAc,EAAE;gBAC5C,oBAAoB,EAAE,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE;aAC7D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;AAC5B,CAAC;AAED,gFAAgF;AAEhF;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,QAAmB,EAAE,QAAQ,GAAG,WAAW,EAAE,OAAO,GAAG,OAAO;IAC5F,MAAM,OAAO,GAAkB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAClD,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC;QAClC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,cAAc,EAAE,EAAE;QACpD,SAAS,EAAE;YACT;gBACE,gBAAgB,EAAE;oBAChB,gBAAgB,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE;oBACnC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;iBAC/C;aACF;SACF;KACF,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,OAAO,EAAE,sGAAsG;QAC/G,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACJ;gBACE,IAAI,EAAE;oBACJ,MAAM,EAAE;wBACN,IAAI,EAAE,QAAQ;wBACd,OAAO;wBACP,cAAc,EAAE,sCAAsC;wBACtD,KAAK,EAAE,UAAU,CAAC,QAAQ,CAAC;qBAC5B;iBACF;gBACD,OAAO;aACR;SACF;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,UAA2B,EAAE,QAAiB,EAAE,OAAgB;IAChG,OAAO,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AACjE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,OAAwB,EAAE,QAAiB,EAAE,OAAgB;IAC1F,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACnE,OAAO,eAAe,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC"}
|
|
1
|
+
{"version":3,"file":"sarif.js","sourceRoot":"","sources":["../../src/formatters/sarif.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/patches/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/patches/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAmnB3C,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE,CAyC9E"}
|
package/dist/patches/index.js
CHANGED
|
@@ -501,12 +501,148 @@ const PATCH_RULES = [
|
|
|
501
501
|
},
|
|
502
502
|
},
|
|
503
503
|
];
|
|
504
|
+
const MULTI_LINE_PATCH_RULES = [
|
|
505
|
+
// ── Multi-line empty catch block → re-throw with error parameter ──
|
|
506
|
+
{
|
|
507
|
+
match: /empty.*catch|catch.*swallow|catch.*discard/i,
|
|
508
|
+
contextLines: 6,
|
|
509
|
+
generate: (windowLines, windowStart, findingLine) => {
|
|
510
|
+
for (let i = 0; i < windowLines.length; i++) {
|
|
511
|
+
const line = windowLines[i];
|
|
512
|
+
const catchMatch = line.match(/^(\s*)(?:}\s*)?catch\s*\(([^)]*)\)\s*\{\s*$/);
|
|
513
|
+
if (!catchMatch)
|
|
514
|
+
continue;
|
|
515
|
+
const indent = catchMatch[1];
|
|
516
|
+
const param = catchMatch[2].trim() || "error";
|
|
517
|
+
// Find matching closing brace — everything inside must be empty/comments
|
|
518
|
+
let braceDepth = 1;
|
|
519
|
+
let endIdx = -1;
|
|
520
|
+
for (let j = i + 1; j < windowLines.length; j++) {
|
|
521
|
+
const inner = windowLines[j];
|
|
522
|
+
for (const ch of inner) {
|
|
523
|
+
if (ch === "{")
|
|
524
|
+
braceDepth++;
|
|
525
|
+
if (ch === "}")
|
|
526
|
+
braceDepth--;
|
|
527
|
+
}
|
|
528
|
+
if (braceDepth === 0) {
|
|
529
|
+
endIdx = j;
|
|
530
|
+
break;
|
|
531
|
+
}
|
|
532
|
+
// Non-empty, non-comment line means the catch isn't truly empty
|
|
533
|
+
if (inner.trim() !== "" && !/^\s*\/\//.test(inner))
|
|
534
|
+
return null;
|
|
535
|
+
}
|
|
536
|
+
if (endIdx <= i)
|
|
537
|
+
continue;
|
|
538
|
+
const oldText = windowLines.slice(i, endIdx + 1).join("\n");
|
|
539
|
+
const newText = `${indent}catch (${param}) {\n${indent} /* TODO: handle error appropriately */ throw ${param};\n${indent}}`;
|
|
540
|
+
return { oldText, newText, startLine: windowStart + i, endLine: windowStart + endIdx };
|
|
541
|
+
}
|
|
542
|
+
return null;
|
|
543
|
+
},
|
|
544
|
+
},
|
|
545
|
+
// ── Bare JSON.parse → try/catch wrapped ──
|
|
546
|
+
{
|
|
547
|
+
match: /unsafe.*json|json.*parse.*unguard|deserialization(?!.*already)/i,
|
|
548
|
+
contextLines: 2,
|
|
549
|
+
generate: (windowLines, windowStart, findingLine) => {
|
|
550
|
+
const idx = findingLine - windowStart;
|
|
551
|
+
if (idx < 0 || idx >= windowLines.length)
|
|
552
|
+
return null;
|
|
553
|
+
const line = windowLines[idx];
|
|
554
|
+
const m = line.match(/^(\s*)(const|let|var)\s+(\w+)\s*=\s*JSON\.parse\s*\(([^)]+)\)\s*;?\s*$/);
|
|
555
|
+
if (!m)
|
|
556
|
+
return null;
|
|
557
|
+
const [, indent, , varName, arg] = m;
|
|
558
|
+
const oldText = line;
|
|
559
|
+
const newText = [
|
|
560
|
+
`${indent}let ${varName};`,
|
|
561
|
+
`${indent}try { ${varName} = JSON.parse(${arg}); }`,
|
|
562
|
+
`${indent}catch { ${varName} = null; /* TODO: handle parse error */ }`,
|
|
563
|
+
].join("\n");
|
|
564
|
+
return { oldText, newText, startLine: findingLine, endLine: findingLine };
|
|
565
|
+
},
|
|
566
|
+
},
|
|
567
|
+
// ── Server .listen() without error callback → add error handler ──
|
|
568
|
+
{
|
|
569
|
+
match: /no.*error.*callback|listen.*without.*error|server.*error.*handling/i,
|
|
570
|
+
contextLines: 2,
|
|
571
|
+
generate: (windowLines, windowStart, findingLine) => {
|
|
572
|
+
const idx = findingLine - windowStart;
|
|
573
|
+
if (idx < 0 || idx >= windowLines.length)
|
|
574
|
+
return null;
|
|
575
|
+
const line = windowLines[idx];
|
|
576
|
+
const m = line.match(/^(\s*)((?:\w+\.)?listen\s*\(\s*(\d+|[\w.]+)\s*)\)\s*;?\s*$/);
|
|
577
|
+
if (!m)
|
|
578
|
+
return null;
|
|
579
|
+
const [, indent, prefix, port] = m;
|
|
580
|
+
const oldText = line;
|
|
581
|
+
const newText = [
|
|
582
|
+
`${indent}${prefix}, () => {`,
|
|
583
|
+
`${indent} console.log(\`Server listening on port ${port}\`);`,
|
|
584
|
+
`${indent}}).on("error", (err) => {`,
|
|
585
|
+
`${indent} console.error("Server failed to start:", err);`,
|
|
586
|
+
`${indent} process.exitCode = 1;`,
|
|
587
|
+
`${indent}});`,
|
|
588
|
+
].join("\n");
|
|
589
|
+
return { oldText, newText, startLine: findingLine, endLine: findingLine };
|
|
590
|
+
},
|
|
591
|
+
},
|
|
592
|
+
// ── Bare await without try/catch → wrap in try/catch ──
|
|
593
|
+
{
|
|
594
|
+
match: /unhandled.*reject|await.*without.*catch|async.*error.*handling/i,
|
|
595
|
+
contextLines: 3,
|
|
596
|
+
generate: (windowLines, windowStart, findingLine) => {
|
|
597
|
+
const idx = findingLine - windowStart;
|
|
598
|
+
if (idx < 0 || idx >= windowLines.length)
|
|
599
|
+
return null;
|
|
600
|
+
const line = windowLines[idx];
|
|
601
|
+
const m = line.match(/^(\s*)((?:const|let|var)\s+\w+\s*=\s*await\s+.+?)\s*;?\s*$/);
|
|
602
|
+
if (!m)
|
|
603
|
+
return null;
|
|
604
|
+
// Check that there is no try/catch wrapping already
|
|
605
|
+
const before = windowLines.slice(Math.max(0, idx - 3), idx).join("\n");
|
|
606
|
+
if (/\btry\s*\{/.test(before))
|
|
607
|
+
return null;
|
|
608
|
+
const [, indent, stmt] = m;
|
|
609
|
+
const oldText = line;
|
|
610
|
+
const newText = [
|
|
611
|
+
`${indent}try {`,
|
|
612
|
+
`${indent} ${stmt.trim()};`,
|
|
613
|
+
`${indent}} catch (error) {`,
|
|
614
|
+
`${indent} /* TODO: handle async error */ throw error;`,
|
|
615
|
+
`${indent}}`,
|
|
616
|
+
].join("\n");
|
|
617
|
+
return { oldText, newText, startLine: findingLine, endLine: findingLine };
|
|
618
|
+
},
|
|
619
|
+
},
|
|
620
|
+
// ── Dockerfile FROM :latest → pinned with comment ──
|
|
621
|
+
{
|
|
622
|
+
match: /latest.*tag|docker.*latest|unpinned.*base/i,
|
|
623
|
+
contextLines: 1,
|
|
624
|
+
generate: (windowLines, windowStart, findingLine) => {
|
|
625
|
+
const idx = findingLine - windowStart;
|
|
626
|
+
if (idx < 0 || idx >= windowLines.length)
|
|
627
|
+
return null;
|
|
628
|
+
const line = windowLines[idx];
|
|
629
|
+
const m = line.match(/^(\s*)(FROM\s+)(\S+):latest(\s+AS\s+\S+)?\s*$/i);
|
|
630
|
+
if (!m)
|
|
631
|
+
return null;
|
|
632
|
+
const [, indent, from, image, alias] = m;
|
|
633
|
+
const oldText = line;
|
|
634
|
+
const newText = `${indent}# TODO: pin to a specific version for reproducibility\n${indent}${from}${image}:lts-slim${alias || ""}`;
|
|
635
|
+
return { oldText, newText, startLine: findingLine, endLine: findingLine };
|
|
636
|
+
},
|
|
637
|
+
},
|
|
638
|
+
];
|
|
504
639
|
export function enrichWithPatches(findings, code) {
|
|
505
640
|
const lines = code.split("\n");
|
|
506
641
|
return findings.map((f) => {
|
|
507
642
|
// Skip if patch already present or no line numbers
|
|
508
643
|
if (f.patch || !f.lineNumbers || f.lineNumbers.length === 0)
|
|
509
644
|
return f;
|
|
645
|
+
// 1. Try single-line rules first
|
|
510
646
|
for (const rule of PATCH_RULES) {
|
|
511
647
|
if (!rule.match.test(f.title) && !rule.match.test(f.ruleId))
|
|
512
648
|
continue;
|
|
@@ -527,6 +663,19 @@ export function enrichWithPatches(findings, code) {
|
|
|
527
663
|
};
|
|
528
664
|
}
|
|
529
665
|
}
|
|
666
|
+
// 2. Try multi-line rules
|
|
667
|
+
for (const rule of MULTI_LINE_PATCH_RULES) {
|
|
668
|
+
if (!rule.match.test(f.title) && !rule.match.test(f.ruleId))
|
|
669
|
+
continue;
|
|
670
|
+
const findingLine = f.lineNumbers[0];
|
|
671
|
+
const windowStart = Math.max(1, findingLine - rule.contextLines);
|
|
672
|
+
const windowEnd = Math.min(lines.length, findingLine + rule.contextLines);
|
|
673
|
+
const windowLines = lines.slice(windowStart - 1, windowEnd);
|
|
674
|
+
const result = rule.generate(windowLines, windowStart, findingLine);
|
|
675
|
+
if (result) {
|
|
676
|
+
return { ...f, patch: result };
|
|
677
|
+
}
|
|
678
|
+
}
|
|
530
679
|
return f;
|
|
531
680
|
});
|
|
532
681
|
}
|