Page MenuHomePhabricator
Files F3514165

D13512.diff
No OneTemporary
Actions

D13512.diff
View Options

diff --git a/keyserver/src/deleters/upload-deleters.js b/keyserver/src/deleters/upload-deleters.js
--- a/keyserver/src/deleters/upload-deleters.js
+++ b/keyserver/src/deleters/upload-deleters.js
@@ -3,7 +3,9 @@
import { ServerError } from 'lib/utils/errors.js';
import { dbQuery, SQL } from '../database/database.js';
+import { deleteBlob, removeBlobHolders } from '../services/blob.js';
import type { Viewer } from '../session/viewer.js';
+import { blobHoldersFromUploadRows } from '../uploads/media-utils.js';
async function deleteUpload(viewer: Viewer, id: string): Promise<void> {
if (!viewer.loggedIn) {
@@ -11,7 +13,7 @@
}
const fetchQuery = SQL`
- SELECT uploader, container, user_container AS userContainer
+ SELECT uploader, container, user_container AS userContainer, extra
FROM uploads
WHERE id = ${id}
`;
@@ -21,7 +23,7 @@
throw new ServerError('invalid_parameters');
}
const [row] = result;
- const { uploader, container, userContainer } = row;
+ const { uploader, container, userContainer, extra } = row;
if (
uploader.toString() !== viewer.userID ||
@@ -31,6 +33,14 @@
throw new ServerError('invalid_parameters');
}
+ const { blobHash, blobHolder } = JSON.parse(extra);
+ if (blobHash && blobHolder) {
+ await deleteBlob({
+ hash: blobHash,
+ holder: blobHolder,
+ });
+ }
+
const deleteQuery = SQL`
DELETE u, i
FROM uploads u
@@ -43,14 +53,27 @@
const maxUnassignedUploadAge = 24 * 60 * 60 * 1000;
async function deleteUnassignedUploads(): Promise<void> {
const oldestUnassignedUploadToKeep = Date.now() - maxUnassignedUploadAge;
- await dbQuery(SQL`
+
+ const holdersQuery = SQL`
+ SELECT extra
+ FROM uploads
+ WHERE container IS NULL
+ AND user_container IS NULL
+ AND creation_time < ${oldestUnassignedUploadToKeep}
+ `;
+ const [rows] = await dbQuery(holdersQuery);
+ const blobHolders = blobHoldersFromUploadRows(rows);
+ await removeBlobHolders(blobHolders);
+
+ const deletionQuery = SQL`
DELETE u, i
FROM uploads u
LEFT JOIN ids i ON i.id = u.id
WHERE u.container IS NULL
AND u.user_container IS NULL
AND creation_time < ${oldestUnassignedUploadToKeep}
- `);
+ `;
+ await dbQuery(deletionQuery);
}
export { deleteUpload, deleteUnassignedUploads };
diff --git a/keyserver/src/uploads/media-utils.js b/keyserver/src/uploads/media-utils.js
--- a/keyserver/src/uploads/media-utils.js
+++ b/keyserver/src/uploads/media-utils.js
@@ -11,6 +11,7 @@
mediaConfig,
} from 'lib/media/file-utils.js';
import { getImageProcessingPlan } from 'lib/media/image-utils.js';
+import type { BlobHashAndHolder } from 'lib/types/holder-types.js';
import type { Dimensions } from 'lib/types/media-types.js';
import { deepFileInfoFromData } from 'web/media/file-utils.js';
@@ -239,4 +240,21 @@
};
}
-export { getMediaType, validateAndConvert };
+function blobHoldersFromUploadRows(
+ rows: $ReadOnlyArray<Object>,
+): $ReadOnlyArray<BlobHashAndHolder> {
+ const results = [];
+ for (const { extra } of rows) {
+ if (!extra) {
+ continue;
+ }
+ const { blobHash, blobHolder } = JSON.parse(extra);
+ if (blobHash && blobHolder) {
+ results.push({ blobHash, holder: blobHolder });
+ }
+ }
+
+ return results;
+}
+
+export { blobHoldersFromUploadRows, getMediaType, validateAndConvert };

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 23, 3:40 AM (18 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2693411
Default Alt Text
D13512.diff (3 KB)

Event Timeline