WIP: Renamed presigned to signature; totally broken API

Author: Rajat Saxena

apps/api/package.json

@@ -43,7 +43,7 @@
     "aws-sdk": "^2.1692.0",
     "cors": "^2.8.5",
     "dotenv": "^16.4.7",
-    "express": "^5.1.0",
+    "express": "^4.2.0",
     "express-fileupload": "^1.3.1",
     "joi": "^17.6.0",
     "mongoose": "^8.0.1",

apps/api/src/apikey/middleware.ts

@@ -2,16 +2,17 @@ import { BAD_REQUEST, UNAUTHORISED } from "../config/strings";
 import { getApiKeyUsingKeyId } from "./queries";
 import { getUser } from "../user/queries";
 import { Apikey } from "@medialit/models";
+import logger from "../services/log";
 
 export default async function apikey(
     req: any,
     res: any,
     next: (...args: any[]) => void,
 ) {
-    const reqKey = req.body.apikey || req.headers["x-medialit-apikey"];
+    const reqKey = req.body?.apikey || req.headers["x-medialit-apikey"];
 
     if (!reqKey) {
-        console.log("API key missing in request");
+        logger.error({}, "API key is missing");
         return res.status(400).json({ error: BAD_REQUEST });
     }
 

apps/api/src/config/constants.ts

@@ -67,6 +67,3 @@ export const HOSTNAME_OVERRIDE = process.env.HOSTNAME_OVERRIDE || ""; // Useful
 export const TUS_UPLOAD_EXPIRATION_HOURS = parseInt(
     process.env.TUS_UPLOAD_EXPIRATION_HOURS || "48",
 );
-export const TUS_CHUNK_SIZE = parseInt(
-    process.env.TUS_CHUNK_SIZE || "10485760",
-); // 10MB default

apps/api/src/index.ts

@@ -5,15 +5,15 @@ import express from "express";
 import connectToDatabase from "./config/db";
 import passport from "passport";
 import mediaRoutes from "./media/routes";
-import presignedUrlRoutes from "./presigning/routes";
+import signatureRoutes from "./signature/routes";
 import mediaSettingsRoutes from "./media-settings/routes";
 import tusRoutes from "./tus/routes";
 import logger from "./services/log";
 import { createUser, findByEmail } from "./user/queries";
-import { Apikey, Constants, User } from "@medialit/models";
+import { Apikey, User } from "@medialit/models";
 import { createApiKey } from "./apikey/queries";
 import { spawn } from "child_process";
-import { cleanupExpiredTusUploads } from "./tus/queries";
+import { Cleanup } from "./tus/cleanup";
 
 connectToDatabase();
 const app = express();
@@ -30,7 +30,7 @@ app.get("/health", (req, res) => {
 });
 
 app.use("/settings/media", mediaSettingsRoutes(passport));
-app.use("/media/presigned", presignedUrlRoutes);
+app.use("/media/signature", signatureRoutes);
 app.use("/media", tusRoutes);
 app.use("/media", mediaRoutes);
 
@@ -48,10 +48,10 @@ checkDependencies().then(() => {
     // Setup background cleanup job for expired tus uploads
     setInterval(
         async () => {
-            await cleanupExpiredTusUploads();
+            await Cleanup();
         },
-        1000 * 60 * 60,
-    ); // Run every hour
+        1000 * 60 * 60, // 1 hours
+    );
 });
 
 async function checkDependencies() {

apps/api/src/media/handlers.ts

@@ -15,7 +15,7 @@ import logger from "../services/log";
 import { Request } from "express";
 import mediaService from "./service";
 import { getMediaCount as getCount, getTotalSpace } from "./queries";
-import { Constants, getSubscriptionStatus } from "@medialit/models";
+import { getSubscriptionStatus } from "@medialit/models";
 
 function validateUploadOptions(req: Request): Joi.ValidationResult {
     const uploadSchema = Joi.object({

apps/api/src/media/routes.ts

@@ -14,7 +14,7 @@ import {
     getMediaCount,
     getTotalSpaceOccupied,
 } from "./handlers";
-import presigned from "../presigning/middleware";
+import signatureMiddleware from "../signature/middleware";
 import storage from "./storage-middleware";
 
 const router = express.Router();
@@ -31,9 +31,12 @@ router.post(
         },
     }),
     (req: Request, res: Response, next: (...args: any[]) => void) => {
-        const { signature } = req.query;
+        const signature =
+            req.query.signature ||
+            req.headers["x-medialit-signature"] ||
+            req.headers["X-Medialit-Signature"];
         if (signature) {
-            presigned(
+            signatureMiddleware(
                 req as Request & { user: any; apikey: string },
                 res,
                 next,

apps/api/src/media/service.ts

@@ -35,7 +35,7 @@ import {
     getPaginatedMedia,
     createMedia,
 } from "./queries";
-import * as presignedUrlService from "../presigning/service";
+import * as presignedUrlService from "../signature/service";
 import getTags from "./utils/get-tags";
 import { getMainFileUrl, getThumbnailUrl } from "./utils/get-public-urls";
 

apps/api/src/presigning/routes.ts

@@ -12,7 +12,7 @@ function validatePresigningOptions(req: Request): Joi.ValidationResult {
     return uploadSchema.validate({ group });
 }
 
-export async function getPresignedUrl(
+export async function getSignature(
     req: any,
     res: any,
     next: (...args: any[]) => void,
@@ -23,40 +23,13 @@ export async function getPresignedUrl(
     }
 
     try {
-        const presignedUrl = await preSignedUrlService.generateSignedUrl({
+        const signature = await preSignedUrlService.generateSignature({
             userId: req.user.id,
             apikey: req.apikey,
             protocol: req.protocol,
             host: HOSTNAME_OVERRIDE || req.get("Host"),
             group: req.body.group,
         });
-        return res.status(200).json({ message: presignedUrl });
-    } catch (err: any) {
-        logger.error({ err }, err.message);
-        return res.status(500).json(err.message);
-    }
-}
-
-export async function getPresignedTusUrl(
-    req: any,
-    res: any,
-    next: (...args: any[]) => void,
-) {
-    const { error } = validatePresigningOptions(req);
-    if (error) {
-        return res.status(400).json({ error: error.message });
-    }
-
-    try {
-        const presignedUrl = await preSignedUrlService.generateSignedUrlForTus({
-            userId: req.user.id,
-            apikey: req.apikey,
-            protocol: req.protocol,
-            host: HOSTNAME_OVERRIDE || req.get("Host"),
-            group: req.body.group,
-        });
-        // Extract signature from the URL
-        const signature = presignedUrl.split("signature=")[1];
         return res.status(200).json({ signature });
     } catch (err: any) {
         logger.error({ err }, err.message);

apps/api/src/presigning/handlers.ts apps/api/src/signature/handlers.tsapps/api/src/presigning/handlers.ts renamed to apps/api/src/signature/handlers.ts

@@ -2,13 +2,15 @@ import { Request, Response } from "express";
 import { PRESIGNED_URL_INVALID } from "../config/strings";
 import * as preSignedUrlService from "./service";
 
-export default async function presigned(
+export default async function signature(
     req: Request & { user?: any; apikey?: string },
     res: Response,
     next: (...args: any[]) => void,
 ) {
     const signature =
-        req.query.signature || req.headers["x-medialit-signature"];
+        req.query.signature ||
+        req.headers["x-medialit-signature"] ||
+        req.headers["X-Medialit-Signature"];
 
     const response = await preSignedUrlService.getUserAndGroupFromPresignedUrl(
         signature as string,