vaspera 2.5.0 → 2.7.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/CHANGELOG.md +45 -0
- package/dist/agents/agent-integrity.test.d.ts +5 -0
- package/dist/agents/agent-integrity.test.d.ts.map +1 -0
- package/dist/agents/agent-integrity.test.js +364 -0
- package/dist/agents/agent-integrity.test.js.map +1 -0
- package/dist/agents/agent-privacy.test.d.ts +5 -0
- package/dist/agents/agent-privacy.test.d.ts.map +1 -0
- package/dist/agents/agent-privacy.test.js +373 -0
- package/dist/agents/agent-privacy.test.js.map +1 -0
- package/dist/compliance/mapper.d.ts.map +1 -1
- package/dist/compliance/mapper.js +2 -2
- package/dist/compliance/mapper.js.map +1 -1
- package/dist/compliance/nist-800-53.d.ts +34 -0
- package/dist/compliance/nist-800-53.d.ts.map +1 -0
- package/dist/compliance/nist-800-53.js +664 -0
- package/dist/compliance/nist-800-53.js.map +1 -0
- package/dist/config/flags.test.d.ts +5 -0
- package/dist/config/flags.test.d.ts.map +1 -0
- package/dist/config/flags.test.js +489 -0
- package/dist/config/flags.test.js.map +1 -0
- package/dist/enterprise/policy/opa.test.js +4 -1
- package/dist/enterprise/policy/opa.test.js.map +1 -1
- package/dist/http-server.js +2 -1
- package/dist/http-server.js.map +1 -1
- package/dist/observability/otel.test.d.ts +5 -0
- package/dist/observability/otel.test.d.ts.map +1 -0
- package/dist/observability/otel.test.js +269 -0
- package/dist/observability/otel.test.js.map +1 -0
- package/dist/plugins/loader.test.d.ts +5 -0
- package/dist/plugins/loader.test.d.ts.map +1 -0
- package/dist/plugins/loader.test.js +337 -0
- package/dist/plugins/loader.test.js.map +1 -0
- package/package.json +2 -2
|
@@ -0,0 +1,337 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Unit tests for plugin loader module
|
|
3
|
+
*/
|
|
4
|
+
import { describe, it, expect, beforeEach, afterEach } from "vitest";
|
|
5
|
+
import { tmpdir } from "os";
|
|
6
|
+
import { join } from "path";
|
|
7
|
+
import { mkdir, rm, writeFile } from "fs/promises";
|
|
8
|
+
import { loadPlugins, executePluginDirect, PluginRegistry } from "./loader.js";
|
|
9
|
+
import { isValidManifest, validateManifest } from "./types.js";
|
|
10
|
+
describe("PluginRegistry", () => {
|
|
11
|
+
it("creates an empty registry", () => {
|
|
12
|
+
const registry = new PluginRegistry("/test/path");
|
|
13
|
+
expect(registry.getAll()).toHaveLength(0);
|
|
14
|
+
expect(registry.getEnabled()).toHaveLength(0);
|
|
15
|
+
expect(registry.getEntries()).toHaveLength(0);
|
|
16
|
+
});
|
|
17
|
+
it("adds and retrieves plugins", () => {
|
|
18
|
+
const registry = new PluginRegistry("/test/path");
|
|
19
|
+
const plugin = createMockPlugin("test-scanner");
|
|
20
|
+
registry.add(plugin);
|
|
21
|
+
expect(registry.has("test-scanner")).toBe(true);
|
|
22
|
+
expect(registry.get("test-scanner")).toBe(plugin);
|
|
23
|
+
expect(registry.getAll()).toHaveLength(1);
|
|
24
|
+
});
|
|
25
|
+
it("returns undefined for non-existent plugin", () => {
|
|
26
|
+
const registry = new PluginRegistry("/test/path");
|
|
27
|
+
expect(registry.get("non-existent")).toBeUndefined();
|
|
28
|
+
expect(registry.has("non-existent")).toBe(false);
|
|
29
|
+
});
|
|
30
|
+
it("getEnabled filters out disabled and errored plugins", () => {
|
|
31
|
+
const registry = new PluginRegistry("/test/path");
|
|
32
|
+
registry.add(createMockPlugin("enabled-1", true));
|
|
33
|
+
registry.add(createMockPlugin("enabled-2", true));
|
|
34
|
+
registry.add(createMockPlugin("disabled", false));
|
|
35
|
+
registry.add(createMockPlugin("errored", true, "Load error"));
|
|
36
|
+
expect(registry.getAll()).toHaveLength(4);
|
|
37
|
+
expect(registry.getEnabled()).toHaveLength(2);
|
|
38
|
+
expect(registry.getEnabled().map((p) => p.manifest.name)).toEqual(["enabled-1", "enabled-2"]);
|
|
39
|
+
});
|
|
40
|
+
it("removes plugins", () => {
|
|
41
|
+
const registry = new PluginRegistry("/test/path");
|
|
42
|
+
registry.add(createMockPlugin("to-remove"));
|
|
43
|
+
registry.add(createMockPlugin("to-keep"));
|
|
44
|
+
const removed = registry.remove("to-remove");
|
|
45
|
+
expect(removed).toBe(true);
|
|
46
|
+
expect(registry.has("to-remove")).toBe(false);
|
|
47
|
+
expect(registry.has("to-keep")).toBe(true);
|
|
48
|
+
});
|
|
49
|
+
it("returns false when removing non-existent plugin", () => {
|
|
50
|
+
const registry = new PluginRegistry("/test/path");
|
|
51
|
+
expect(registry.remove("non-existent")).toBe(false);
|
|
52
|
+
});
|
|
53
|
+
it("clears all plugins", () => {
|
|
54
|
+
const registry = new PluginRegistry("/test/path");
|
|
55
|
+
registry.add(createMockPlugin("plugin-1"));
|
|
56
|
+
registry.add(createMockPlugin("plugin-2"));
|
|
57
|
+
registry.clear();
|
|
58
|
+
expect(registry.getAll()).toHaveLength(0);
|
|
59
|
+
expect(registry.has("plugin-1")).toBe(false);
|
|
60
|
+
});
|
|
61
|
+
it("getEntries returns registry entries", () => {
|
|
62
|
+
const registry = new PluginRegistry("/test/path");
|
|
63
|
+
registry.add(createMockPlugin("scanner-a", true));
|
|
64
|
+
registry.add(createMockPlugin("scanner-b", true, "Error message"));
|
|
65
|
+
const entries = registry.getEntries();
|
|
66
|
+
expect(entries).toHaveLength(2);
|
|
67
|
+
expect(entries[0].name).toBe("scanner-a");
|
|
68
|
+
expect(entries[0].loaded).toBe(true);
|
|
69
|
+
expect(entries[0].source).toBe("local");
|
|
70
|
+
expect(entries[1].name).toBe("scanner-b");
|
|
71
|
+
expect(entries[1].loaded).toBe(false);
|
|
72
|
+
expect(entries[1].error).toBe("Error message");
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
describe("loadPlugins", () => {
|
|
76
|
+
let testDir;
|
|
77
|
+
beforeEach(async () => {
|
|
78
|
+
testDir = join(tmpdir(), `vaspera-plugin-test-${Date.now()}-${Math.random().toString(36).slice(2)}`);
|
|
79
|
+
await mkdir(testDir, { recursive: true });
|
|
80
|
+
});
|
|
81
|
+
afterEach(async () => {
|
|
82
|
+
await rm(testDir, { recursive: true, force: true });
|
|
83
|
+
});
|
|
84
|
+
it("returns empty registry when no plugins exist", async () => {
|
|
85
|
+
const registry = await loadPlugins(testDir);
|
|
86
|
+
expect(registry.getAll()).toHaveLength(0);
|
|
87
|
+
});
|
|
88
|
+
it("discovers local plugins", async () => {
|
|
89
|
+
// Create plugin structure
|
|
90
|
+
const pluginDir = join(testDir, ".vaspera", "plugins", "test-plugin");
|
|
91
|
+
await mkdir(pluginDir, { recursive: true });
|
|
92
|
+
const manifest = createValidManifest("test-plugin");
|
|
93
|
+
await writeFile(join(pluginDir, "manifest.json"), JSON.stringify(manifest));
|
|
94
|
+
// Create a dummy scanner module
|
|
95
|
+
await writeFile(join(pluginDir, "scanner.js"), `export default async function(ctx) { return { scanner: "test", findings: [], duration: 0, success: true }; }`);
|
|
96
|
+
const registry = await loadPlugins(testDir);
|
|
97
|
+
// The plugin may fail to load due to module resolution, but discovery works
|
|
98
|
+
expect(registry.getAll().length).toBeGreaterThanOrEqual(0);
|
|
99
|
+
});
|
|
100
|
+
it("skips directories without manifest.json", async () => {
|
|
101
|
+
const pluginDir = join(testDir, ".vaspera", "plugins", "invalid-plugin");
|
|
102
|
+
await mkdir(pluginDir, { recursive: true });
|
|
103
|
+
// No manifest.json created
|
|
104
|
+
const registry = await loadPlugins(testDir);
|
|
105
|
+
expect(registry.has("invalid-plugin")).toBe(false);
|
|
106
|
+
});
|
|
107
|
+
it("respects skip option", async () => {
|
|
108
|
+
const plugin1Dir = join(testDir, ".vaspera", "plugins", "plugin-a");
|
|
109
|
+
const plugin2Dir = join(testDir, ".vaspera", "plugins", "plugin-b");
|
|
110
|
+
await mkdir(plugin1Dir, { recursive: true });
|
|
111
|
+
await mkdir(plugin2Dir, { recursive: true });
|
|
112
|
+
await writeFile(join(plugin1Dir, "manifest.json"), JSON.stringify(createValidManifest("plugin-a")));
|
|
113
|
+
await writeFile(join(plugin2Dir, "manifest.json"), JSON.stringify(createValidManifest("plugin-b")));
|
|
114
|
+
// Create scanner modules
|
|
115
|
+
const scannerCode = `export default async function(ctx) { return { scanner: "test", findings: [], duration: 0, success: true }; }`;
|
|
116
|
+
await writeFile(join(plugin1Dir, "scanner.js"), scannerCode);
|
|
117
|
+
await writeFile(join(plugin2Dir, "scanner.js"), scannerCode);
|
|
118
|
+
const registry = await loadPlugins(testDir, { skip: ["plugin-a"] });
|
|
119
|
+
expect(registry.has("plugin-a")).toBe(false);
|
|
120
|
+
});
|
|
121
|
+
it("respects only option", async () => {
|
|
122
|
+
const plugin1Dir = join(testDir, ".vaspera", "plugins", "include-me");
|
|
123
|
+
const plugin2Dir = join(testDir, ".vaspera", "plugins", "exclude-me");
|
|
124
|
+
await mkdir(plugin1Dir, { recursive: true });
|
|
125
|
+
await mkdir(plugin2Dir, { recursive: true });
|
|
126
|
+
await writeFile(join(plugin1Dir, "manifest.json"), JSON.stringify(createValidManifest("include-me")));
|
|
127
|
+
await writeFile(join(plugin2Dir, "manifest.json"), JSON.stringify(createValidManifest("exclude-me")));
|
|
128
|
+
// Create scanner modules
|
|
129
|
+
const scannerCode = `export default async function(ctx) { return { scanner: "test", findings: [], duration: 0, success: true }; }`;
|
|
130
|
+
await writeFile(join(plugin1Dir, "scanner.js"), scannerCode);
|
|
131
|
+
await writeFile(join(plugin2Dir, "scanner.js"), scannerCode);
|
|
132
|
+
const registry = await loadPlugins(testDir, { only: ["include-me"] });
|
|
133
|
+
expect(registry.has("exclude-me")).toBe(false);
|
|
134
|
+
});
|
|
135
|
+
it("respects loadLocal=false option", async () => {
|
|
136
|
+
const pluginDir = join(testDir, ".vaspera", "plugins", "local-plugin");
|
|
137
|
+
await mkdir(pluginDir, { recursive: true });
|
|
138
|
+
await writeFile(join(pluginDir, "manifest.json"), JSON.stringify(createValidManifest("local-plugin")));
|
|
139
|
+
await writeFile(join(pluginDir, "scanner.js"), `export default async () => ({});`);
|
|
140
|
+
const registry = await loadPlugins(testDir, { loadLocal: false });
|
|
141
|
+
expect(registry.has("local-plugin")).toBe(false);
|
|
142
|
+
});
|
|
143
|
+
it("handles invalid manifest gracefully", async () => {
|
|
144
|
+
const pluginDir = join(testDir, ".vaspera", "plugins", "bad-manifest");
|
|
145
|
+
await mkdir(pluginDir, { recursive: true });
|
|
146
|
+
// Invalid manifest (missing required fields)
|
|
147
|
+
await writeFile(join(pluginDir, "manifest.json"), JSON.stringify({ name: "bad" }));
|
|
148
|
+
const registry = await loadPlugins(testDir);
|
|
149
|
+
// Should either not load or load with error
|
|
150
|
+
const plugin = registry.get("bad-manifest");
|
|
151
|
+
if (plugin) {
|
|
152
|
+
expect(plugin.loadError).toBeDefined();
|
|
153
|
+
}
|
|
154
|
+
});
|
|
155
|
+
it("handles malformed JSON gracefully", async () => {
|
|
156
|
+
const pluginDir = join(testDir, ".vaspera", "plugins", "malformed");
|
|
157
|
+
await mkdir(pluginDir, { recursive: true });
|
|
158
|
+
await writeFile(join(pluginDir, "manifest.json"), "{ invalid json }");
|
|
159
|
+
// Should not throw
|
|
160
|
+
await expect(loadPlugins(testDir)).resolves.toBeDefined();
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
describe("executePluginDirect", () => {
|
|
164
|
+
it("executes plugin and returns result", async () => {
|
|
165
|
+
const plugin = createMockPlugin("direct-test", true, undefined, async () => ({
|
|
166
|
+
scanner: "semgrep",
|
|
167
|
+
findings: [{
|
|
168
|
+
scanner: "semgrep",
|
|
169
|
+
ruleId: "test-rule",
|
|
170
|
+
file: "a.js",
|
|
171
|
+
line: 1,
|
|
172
|
+
severity: "high",
|
|
173
|
+
message: "Test finding",
|
|
174
|
+
confidence: 90,
|
|
175
|
+
}],
|
|
176
|
+
duration: 100,
|
|
177
|
+
success: true,
|
|
178
|
+
}));
|
|
179
|
+
const context = {
|
|
180
|
+
projectPath: "/test",
|
|
181
|
+
timeout: 5000,
|
|
182
|
+
logger: createNoOpLogger(),
|
|
183
|
+
};
|
|
184
|
+
const result = await executePluginDirect(plugin, context);
|
|
185
|
+
expect(result.plugin).toBe("direct-test");
|
|
186
|
+
expect(result.sandboxed).toBe(false);
|
|
187
|
+
expect(result.result.success).toBe(true);
|
|
188
|
+
expect(result.result.findings).toHaveLength(1);
|
|
189
|
+
expect(result.durationMs).toBeGreaterThanOrEqual(0);
|
|
190
|
+
});
|
|
191
|
+
it("handles plugin errors gracefully", async () => {
|
|
192
|
+
const plugin = createMockPlugin("error-plugin", true, undefined, async () => {
|
|
193
|
+
throw new Error("Scanner failed");
|
|
194
|
+
});
|
|
195
|
+
const context = {
|
|
196
|
+
projectPath: "/test",
|
|
197
|
+
timeout: 5000,
|
|
198
|
+
logger: createNoOpLogger(),
|
|
199
|
+
};
|
|
200
|
+
const result = await executePluginDirect(plugin, context);
|
|
201
|
+
expect(result.result.success).toBe(false);
|
|
202
|
+
expect(result.error).toContain("Scanner failed");
|
|
203
|
+
expect(result.result.findings).toHaveLength(0);
|
|
204
|
+
});
|
|
205
|
+
it("records duration correctly", async () => {
|
|
206
|
+
const plugin = createMockPlugin("duration-test", true, undefined, async () => {
|
|
207
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
208
|
+
return {
|
|
209
|
+
scanner: "duration-test",
|
|
210
|
+
findings: [],
|
|
211
|
+
duration: 50,
|
|
212
|
+
success: true,
|
|
213
|
+
};
|
|
214
|
+
});
|
|
215
|
+
const context = {
|
|
216
|
+
projectPath: "/test",
|
|
217
|
+
timeout: 5000,
|
|
218
|
+
logger: createNoOpLogger(),
|
|
219
|
+
};
|
|
220
|
+
const result = await executePluginDirect(plugin, context);
|
|
221
|
+
expect(result.durationMs).toBeGreaterThanOrEqual(45); // Allow some variance
|
|
222
|
+
});
|
|
223
|
+
});
|
|
224
|
+
describe("isValidManifest", () => {
|
|
225
|
+
it("returns true for valid manifest", () => {
|
|
226
|
+
const manifest = createValidManifest("valid-plugin");
|
|
227
|
+
expect(isValidManifest(manifest)).toBe(true);
|
|
228
|
+
});
|
|
229
|
+
it("returns false for invalid manifest", () => {
|
|
230
|
+
expect(isValidManifest({})).toBe(false);
|
|
231
|
+
expect(isValidManifest({ name: "test" })).toBe(false);
|
|
232
|
+
expect(isValidManifest(null)).toBe(false);
|
|
233
|
+
expect(isValidManifest(undefined)).toBe(false);
|
|
234
|
+
expect(isValidManifest("string")).toBe(false);
|
|
235
|
+
});
|
|
236
|
+
it("validates name format", () => {
|
|
237
|
+
const manifest = createValidManifest("INVALID_NAME");
|
|
238
|
+
expect(isValidManifest(manifest)).toBe(false);
|
|
239
|
+
const validManifest = createValidManifest("valid-name-123");
|
|
240
|
+
expect(isValidManifest(validManifest)).toBe(true);
|
|
241
|
+
});
|
|
242
|
+
it("validates version format", () => {
|
|
243
|
+
const manifest = createValidManifest("test");
|
|
244
|
+
manifest.version = "invalid";
|
|
245
|
+
expect(isValidManifest(manifest)).toBe(false);
|
|
246
|
+
manifest.version = "1.0.0";
|
|
247
|
+
expect(isValidManifest(manifest)).toBe(true);
|
|
248
|
+
manifest.version = "10.20.30-beta.1";
|
|
249
|
+
expect(isValidManifest(manifest)).toBe(true);
|
|
250
|
+
});
|
|
251
|
+
});
|
|
252
|
+
describe("validateManifest", () => {
|
|
253
|
+
it("returns valid=true with manifest for valid input", () => {
|
|
254
|
+
const input = createValidManifest("test-plugin");
|
|
255
|
+
const result = validateManifest(input);
|
|
256
|
+
expect(result.valid).toBe(true);
|
|
257
|
+
expect(result.manifest).toBeDefined();
|
|
258
|
+
expect(result.manifest?.name).toBe("test-plugin");
|
|
259
|
+
expect(result.errors).toBeUndefined();
|
|
260
|
+
});
|
|
261
|
+
it("returns valid=false with errors for invalid input", () => {
|
|
262
|
+
const result = validateManifest({ name: "INVALID" });
|
|
263
|
+
expect(result.valid).toBe(false);
|
|
264
|
+
expect(result.manifest).toBeUndefined();
|
|
265
|
+
expect(result.errors).toBeDefined();
|
|
266
|
+
expect(result.errors?.length).toBeGreaterThan(0);
|
|
267
|
+
});
|
|
268
|
+
it("returns specific error messages for each validation failure", () => {
|
|
269
|
+
const result = validateManifest({
|
|
270
|
+
name: "INVALID",
|
|
271
|
+
version: "bad",
|
|
272
|
+
description: "",
|
|
273
|
+
scanner: {},
|
|
274
|
+
entryPoint: {},
|
|
275
|
+
});
|
|
276
|
+
expect(result.valid).toBe(false);
|
|
277
|
+
expect(result.errors?.some((e) => e.includes("name"))).toBe(true);
|
|
278
|
+
expect(result.errors?.some((e) => e.includes("version"))).toBe(true);
|
|
279
|
+
});
|
|
280
|
+
it("applies default values for optional fields", () => {
|
|
281
|
+
const input = createValidManifest("defaults-test");
|
|
282
|
+
delete input.capabilities;
|
|
283
|
+
const result = validateManifest(input);
|
|
284
|
+
expect(result.valid).toBe(true);
|
|
285
|
+
expect(result.manifest?.capabilities).toBeDefined();
|
|
286
|
+
expect(result.manifest?.capabilities.sandboxable).toBe(true);
|
|
287
|
+
expect(result.manifest?.capabilities.autofix).toBe(false);
|
|
288
|
+
});
|
|
289
|
+
});
|
|
290
|
+
// Helper functions
|
|
291
|
+
function createMockPlugin(name, enabled = true, loadError, scanFn) {
|
|
292
|
+
return {
|
|
293
|
+
manifest: createValidManifest(name),
|
|
294
|
+
path: `/mock/plugins/${name}`,
|
|
295
|
+
source: "local",
|
|
296
|
+
scan: scanFn || (async () => ({
|
|
297
|
+
scanner: name,
|
|
298
|
+
findings: [],
|
|
299
|
+
duration: 0,
|
|
300
|
+
success: true,
|
|
301
|
+
})),
|
|
302
|
+
enabled,
|
|
303
|
+
loadError,
|
|
304
|
+
};
|
|
305
|
+
}
|
|
306
|
+
function createValidManifest(name) {
|
|
307
|
+
return {
|
|
308
|
+
name,
|
|
309
|
+
version: "1.0.0",
|
|
310
|
+
description: `Test plugin: ${name}`,
|
|
311
|
+
scanner: {
|
|
312
|
+
type: "sast",
|
|
313
|
+
languages: ["javascript", "typescript"],
|
|
314
|
+
defaultTimeout: 60000,
|
|
315
|
+
requiresBinary: false,
|
|
316
|
+
},
|
|
317
|
+
entryPoint: {
|
|
318
|
+
module: "scanner.js",
|
|
319
|
+
exportName: "default",
|
|
320
|
+
},
|
|
321
|
+
capabilities: {
|
|
322
|
+
incremental: false,
|
|
323
|
+
autofix: false,
|
|
324
|
+
customRules: false,
|
|
325
|
+
sandboxable: true,
|
|
326
|
+
},
|
|
327
|
+
};
|
|
328
|
+
}
|
|
329
|
+
function createNoOpLogger() {
|
|
330
|
+
return {
|
|
331
|
+
debug: () => { },
|
|
332
|
+
info: () => { },
|
|
333
|
+
warn: () => { },
|
|
334
|
+
error: () => { },
|
|
335
|
+
};
|
|
336
|
+
}
|
|
337
|
+
//# sourceMappingURL=loader.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loader.test.js","sourceRoot":"","sources":["../../src/plugins/loader.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vaspera",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.7.0",
|
|
4
4
|
"packageManager": "npm@10.2.4",
|
|
5
5
|
"workspaces": [
|
|
6
6
|
"apps/*",
|
|
@@ -65,6 +65,7 @@
|
|
|
65
65
|
"@sigstore/sign": "~4.1.1",
|
|
66
66
|
"glob": "^11.0.0",
|
|
67
67
|
"proper-lockfile": "~4.1.2",
|
|
68
|
+
"typescript": "^5.7.0",
|
|
68
69
|
"zod": "^3.24.0"
|
|
69
70
|
},
|
|
70
71
|
"devDependencies": {
|
|
@@ -73,7 +74,6 @@
|
|
|
73
74
|
"@vitest/coverage-v8": "~4.1.4",
|
|
74
75
|
"concurrently": "^9.1.2",
|
|
75
76
|
"turbo": "~2.9.6",
|
|
76
|
-
"typescript": "^5.7.0",
|
|
77
77
|
"vitest": "~4.1.4"
|
|
78
78
|
}
|
|
79
79
|
}
|