fix(storage): constrain recursive blob deletion to resource folders
This commit is contained in:
@@ -338,7 +338,7 @@ test("deleteblob handler dependency failure returns DELETE_BLOB_FAILED", async (
|
||||
assert.strictEqual(res.state.jsonBody.error.code, "DELETE_BLOB_FAILED");
|
||||
});
|
||||
|
||||
test("deleteblobcase handler accepts encoded hash variant", async () => {
|
||||
test("deleteblobcase handler accepts a valid case folder", async () => {
|
||||
let deletedCaseFolder = null;
|
||||
const mod = loadModule("pages/api/file/deleteblobcase.js", {
|
||||
nextConnect: createNextConnectMock(),
|
||||
@@ -346,7 +346,7 @@ test("deleteblobcase handler accepts encoded hash variant", async () => {
|
||||
getServerSession: async () => ({ user: { id: "c1" } }),
|
||||
authOptions: () => ({}),
|
||||
hashAPIPath: (queryPath) =>
|
||||
queryPath.includes("casefolderID=CASE%2FSUB")
|
||||
queryPath.includes("casefolderID=CASE-SUB")
|
||||
? "&hash=expected"
|
||||
: "&hash=other",
|
||||
respondError: respondErrorMock,
|
||||
@@ -360,7 +360,7 @@ test("deleteblobcase handler accepts encoded hash variant", async () => {
|
||||
const req = {
|
||||
query: {
|
||||
container: "c1",
|
||||
casefolderID: "CASE/SUB",
|
||||
casefolderID: "CASE-SUB",
|
||||
hash: "expected"
|
||||
}
|
||||
};
|
||||
@@ -368,7 +368,41 @@ test("deleteblobcase handler accepts encoded hash variant", async () => {
|
||||
await mod.default.handler(req, res);
|
||||
|
||||
assert.strictEqual(res.state.statusCode, 200);
|
||||
assert.strictEqual(deletedCaseFolder, "CASE/SUB");
|
||||
assert.strictEqual(deletedCaseFolder, "CASE-SUB");
|
||||
});
|
||||
|
||||
test("deleteblobcase rejects unsafe normalized folder identifiers before deletion", async () => {
|
||||
for (const casefolderID of [" ", "CASE-1/REP-1", "..", "CASE\\REP"]) {
|
||||
let deletionCalls = 0;
|
||||
const mod = loadModule("pages/api/file/deleteblobcase.js", {
|
||||
nextConnect: createNextConnectMock(),
|
||||
middleware: () => {},
|
||||
getServerSession: async () => ({ user: { id: "c1" } }),
|
||||
authOptions: () => ({}),
|
||||
hashAPIPath: () => "&hash=expected",
|
||||
respondError: respondErrorMock,
|
||||
respondSuccess: respondSuccessMock,
|
||||
deleteBlobCase: async () => {
|
||||
deletionCalls += 1;
|
||||
}
|
||||
});
|
||||
const res = createRes();
|
||||
|
||||
await mod.default.handler(
|
||||
{
|
||||
query: {
|
||||
container: "c1",
|
||||
casefolderID,
|
||||
hash: "expected"
|
||||
}
|
||||
},
|
||||
res
|
||||
);
|
||||
|
||||
assert.strictEqual(res.state.statusCode, 400);
|
||||
assert.strictEqual(res.state.jsonBody.error.code, "INVALID_REQUEST");
|
||||
assert.strictEqual(deletionCalls, 0);
|
||||
}
|
||||
});
|
||||
|
||||
test("deleteblobcase handler dependency failure returns DELETE_BLOB_CASE_FAILED", async () => {
|
||||
@@ -436,6 +470,46 @@ test("deleteblobrep handler accepts encoded hash variant", async () => {
|
||||
assert.strictEqual(deletedRepPath, "CASE-1/Rep Name");
|
||||
});
|
||||
|
||||
test("deleteblobrep rejects missing or unsafe folder segments before deletion", async () => {
|
||||
for (const invalidQuery of [
|
||||
{ casefolderID: " ", repfile: "REP-1" },
|
||||
{ casefolderID: "CASE-1", repfile: " " },
|
||||
{ casefolderID: "CASE-1/REP-1", repfile: "REP-1" },
|
||||
{ casefolderID: "CASE-1", repfile: "REP-1/FILES" },
|
||||
{ casefolderID: "CASE-1", repfile: ".." }
|
||||
]) {
|
||||
let deletionCalls = 0;
|
||||
const mod = loadModule("pages/api/file/deleteblobrep.js", {
|
||||
nextConnect: createNextConnectMock(),
|
||||
middleware: () => {},
|
||||
getServerSession: async () => ({ user: { id: "c1" } }),
|
||||
authOptions: () => ({}),
|
||||
hashAPIPath: () => "&hash=expected",
|
||||
respondError: respondErrorMock,
|
||||
respondSuccess: respondSuccessMock,
|
||||
deleteBlobRep: async () => {
|
||||
deletionCalls += 1;
|
||||
}
|
||||
});
|
||||
const res = createRes();
|
||||
|
||||
await mod.default.handler(
|
||||
{
|
||||
query: {
|
||||
container: "c1",
|
||||
hash: "expected",
|
||||
...invalidQuery
|
||||
}
|
||||
},
|
||||
res
|
||||
);
|
||||
|
||||
assert.strictEqual(res.state.statusCode, 400);
|
||||
assert.strictEqual(res.state.jsonBody.error.code, "INVALID_REQUEST");
|
||||
assert.strictEqual(deletionCalls, 0);
|
||||
}
|
||||
});
|
||||
|
||||
test("deleteblobrep handler dependency failure returns DELETE_BLOB_REP_FAILED", async () => {
|
||||
const mod = loadModule("pages/api/file/deleteblobrep.js", {
|
||||
nextConnect: createNextConnectMock(),
|
||||
|
||||
@@ -33,6 +33,65 @@ const loadAzureStorageHelperModule = (injected = {}) => {
|
||||
return context.module.exports;
|
||||
};
|
||||
|
||||
const loadRecursiveDeletionHelpers = ({ blobNames = [] } = {}) => {
|
||||
const filePath = path.join(rootDir, "actions", "azurestorage.js");
|
||||
const source = fs.readFileSync(filePath, "utf8");
|
||||
const start = source.indexOf("const isSafeDeletionPathSegment =");
|
||||
const end = source.indexOf("export const uploadFile =");
|
||||
|
||||
if (start < 0 || end < 0 || end <= start) {
|
||||
throw new Error("Unable to isolate recursive deletion helper block");
|
||||
}
|
||||
|
||||
const listedPrefixes = [];
|
||||
const deletedBlobNames = [];
|
||||
const containerClient = {
|
||||
async *listBlobsFlat({ prefix }) {
|
||||
listedPrefixes.push(prefix);
|
||||
for (const name of blobNames.filter((blobName) =>
|
||||
blobName.startsWith(prefix)
|
||||
)) {
|
||||
yield { name };
|
||||
}
|
||||
},
|
||||
deleteBlob(name) {
|
||||
deletedBlobNames.push(name);
|
||||
return Promise.resolve();
|
||||
},
|
||||
getBlockBlobClient() {
|
||||
return { exists: async () => true };
|
||||
}
|
||||
};
|
||||
|
||||
let helperSource = source
|
||||
.slice(start, end)
|
||||
.replace(/export const /g, "const ");
|
||||
helperSource +=
|
||||
"\nmodule.exports = { deleteBlobCase, deleteBlobRep };\n";
|
||||
|
||||
const context = {
|
||||
module: { exports: {} },
|
||||
exports: {},
|
||||
console: { log: () => {} },
|
||||
DefaultAzureCredential: class {},
|
||||
createContainerSas: async () => "sas-token",
|
||||
STORAGE_PATH: "https://storage.example.test",
|
||||
ContainerClient: class {
|
||||
constructor() {
|
||||
return containerClient;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
vm.runInNewContext(helperSource, context, { filename: filePath });
|
||||
|
||||
return {
|
||||
...context.module.exports,
|
||||
listedPrefixes,
|
||||
deletedBlobNames
|
||||
};
|
||||
};
|
||||
|
||||
const tests = [];
|
||||
const test = (name, fn) => tests.push({ name, fn });
|
||||
|
||||
@@ -103,6 +162,63 @@ test("azurestorage helper builds hash metadata map with stable keys", () => {
|
||||
});
|
||||
});
|
||||
|
||||
test("case deletion uses a complete folder prefix and excludes lexical siblings", async () => {
|
||||
const loaded = loadRecursiveDeletionHelpers({
|
||||
blobNames: [
|
||||
"TMP-ABC/TMP-ABC_appeal.json",
|
||||
"TMP-ABC/files/evidence.pdf",
|
||||
"TMP-ABC1/TMP-ABC1_appeal.json",
|
||||
"TMP-ABCD/files/sibling.pdf"
|
||||
]
|
||||
});
|
||||
|
||||
await loaded.deleteBlobCase("container-1", "TMP-ABC");
|
||||
|
||||
assert.deepStrictEqual(loaded.listedPrefixes, ["TMP-ABC/"]);
|
||||
assert.deepStrictEqual(loaded.deletedBlobNames, [
|
||||
"TMP-ABC/TMP-ABC_appeal.json",
|
||||
"TMP-ABC/files/evidence.pdf"
|
||||
]);
|
||||
});
|
||||
|
||||
test("representation deletion uses a complete folder prefix and preserves parent and siblings", async () => {
|
||||
const loaded = loadRecursiveDeletionHelpers({
|
||||
blobNames: [
|
||||
"CASE-1/CASE-1_case.json",
|
||||
"CASE-1/REP-1/REP-1_rep.json",
|
||||
"CASE-1/REP-1/files/evidence.pdf",
|
||||
"CASE-1/REP-10/REP-10_rep.json",
|
||||
"CASE-1/REP-2/REP-2_rep.json"
|
||||
]
|
||||
});
|
||||
|
||||
await loaded.deleteBlobRep("container-1", "CASE-1/REP-1");
|
||||
|
||||
assert.deepStrictEqual(loaded.listedPrefixes, ["CASE-1/REP-1/"]);
|
||||
assert.deepStrictEqual(loaded.deletedBlobNames, [
|
||||
"CASE-1/REP-1/REP-1_rep.json",
|
||||
"CASE-1/REP-1/files/evidence.pdf"
|
||||
]);
|
||||
});
|
||||
|
||||
test("recursive deletion helpers reject empty and unsafe resource paths before listing", async () => {
|
||||
for (const [helperName, unsafePath] of [
|
||||
["deleteBlobCase", ""],
|
||||
["deleteBlobCase", "CASE-1/REP-1"],
|
||||
["deleteBlobRep", "CASE-1"],
|
||||
["deleteBlobRep", "CASE-1/REP-1/FILES"],
|
||||
["deleteBlobRep", "CASE-1/../REP-1"]
|
||||
]) {
|
||||
const loaded = loadRecursiveDeletionHelpers();
|
||||
|
||||
await assert.rejects(
|
||||
() => loaded[helperName]("container-1", unsafePath),
|
||||
/Invalid deletion resource path/
|
||||
);
|
||||
assert.deepStrictEqual(loaded.listedPrefixes, []);
|
||||
}
|
||||
});
|
||||
|
||||
const run = async () => {
|
||||
let passed = 0;
|
||||
for (const currentTest of tests) {
|
||||
|
||||
Reference in New Issue
Block a user