HoshinoKoji/r2-webdav
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix destination parent directory check in file

Browse Source 
upload
This commit is contained in:
abersheeran 2023-12-06 11:26:29 +08:00
parent dbd81d9e81
commit 57ecaf6c0e
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/index.ts
View File

@ -368,11 +368,14 @@ export default {
break; break;
} }
let destination = new URL(destination_header).pathname.slice(1); let destination = new URL(destination_header).pathname.slice(1);
let destination_exists = await bucket.head(destination);
if (dont_overwrite && destination_exists) { // Check if the parent directory exists
response = new Response('Precondition Failed', { status: 412 }); let destination_parent = destination.split('/').slice(0, destination.endsWith('/') ? -2 : -1).join('/');
if (destination_parent !== '' && !await bucket.head(destination_parent)) {
response = new Response('Conflict', { status: 409 });
break; break;
} }
if (resource_path.endsWith('/')) { if (resource_path.endsWith('/')) {
let depth = request.headers.get('Depth') ?? 'infinity'; let depth = request.headers.get('Depth') ?? 'infinity';
switch (depth) { switch (depth) {
@ -380,6 +383,10 @@ export default {
let r2_objects = await bucket.list({ let r2_objects = await bucket.list({
prefix: resource_path, prefix: resource_path,
}); });
if (r2_objects.objects.length === 0) {
response = new Response('Not Found', { status: 404 });
break;
}
await Promise.all(r2_objects.objects.map( await Promise.all(r2_objects.objects.map(
object => (async () => { object => (async () => {
let target = destination + object.key.slice(resource_path.length); let target = destination + object.key.slice(resource_path.length);
@ -396,7 +403,7 @@ export default {
} }
break; break;
case '0': { case '0': {
let object = await bucket.get(resource_path); let object = await bucket.get(resource_path.slice(0, -1));
if (object === null) { if (object === null) {
response = new Response('Not Found', { status: 404 }); response = new Response('Not Found', { status: 404 });
break; break;
@ -413,6 +420,12 @@ export default {
} }
} }
} else { } else {
let destination_exists = await bucket.head(destination);
if (dont_overwrite && destination_exists) {
response = new Response('Precondition Failed', { status: 412 });
break;
}
let src = await bucket.get(resource_path); let src = await bucket.get(resource_path);
if (src === null) { if (src === null) {
response = new Response('Not Found', { status: 404 }); response = new Response('Not Found', { status: 404 });