@verdaccio/middleware 8.0.0-next-8.4 → 8.0.0-next-8.6

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @verdaccio/middleware
 
+## 8.0.0-next-8.6
+
+### Patch Changes
+
+- 8995041: fix(middleware): allow content-type with charset
+  - @verdaccio/core@8.0.0-next-8.6
+  - @verdaccio/config@8.0.0-next-8.6
+  - @verdaccio/url@13.0.0-next-8.6
+  - @verdaccio/utils@8.1.0-next-8.6
+
+## 8.0.0-next-8.5
+
+### Patch Changes
+
+- Updated dependencies [ba71932]
+- Updated dependencies [64a7fc0]
+- Updated dependencies [4adaa83]
+- Updated dependencies [5cbee6f]
+- Updated dependencies [a049bba]
+  - @verdaccio/config@8.0.0-next-8.5
+  - @verdaccio/core@8.0.0-next-8.5
+  - @verdaccio/url@13.0.0-next-8.5
+  - @verdaccio/utils@8.1.0-next-8.5
+
 ## 8.0.0-next-8.4
 
 ### Patch Changes

package/build/middlewares/media.js

@@ -7,7 +7,12 @@ exports.media = media;
 var _core = require("@verdaccio/core");
 function media(expect) {
   return function (req, res, next) {
-    if (req.headers[_core.HEADER_TYPE.CONTENT_TYPE] !== expect) {
+    const header = req.headers[_core.HEADER_TYPE.CONTENT_TYPE];
+    if (!header) {
+      next(_core.errorUtils.getCode(_core.HTTP_STATUS.UNSUPPORTED_MEDIA, 'content-type is missing, expect: ' + expect));
+      return;
+    }
+    if (typeof header !== 'string' || header.split(';')[0].trim() !== expect) {
       next(_core.errorUtils.getCode(_core.HTTP_STATUS.UNSUPPORTED_MEDIA, 'wrong content-type, expect: ' + expect + ', got: ' + req.get[_core.HEADER_TYPE.CONTENT_TYPE]));
     } else {
       next();

package/build/middlewares/media.js.map

@@ -1 +1 @@
-{"version":3,"file":"media.js","names":["_core","require","media","expect","req","res","next","headers","HEADER_TYPE","CONTENT_TYPE","errorUtils","getCode","HTTP_STATUS","UNSUPPORTED_MEDIA","get"],"sources":["../../src/middlewares/media.ts"],"sourcesContent":["import { HEADER_TYPE, HTTP_STATUS, errorUtils } from '@verdaccio/core';\n\nimport { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types';\n\nexport function media(expect: string | null): any {\n  return function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {\n    if (req.headers[HEADER_TYPE.CONTENT_TYPE] !== expect) {\n      next(\n        errorUtils.getCode(\n          HTTP_STATUS.UNSUPPORTED_MEDIA,\n          'wrong content-type, expect: ' + expect + ', got: ' + req.get[HEADER_TYPE.CONTENT_TYPE]\n        )\n      );\n    } else {\n      next();\n    }\n  };\n}\n"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAIO,SAASC,KAAKA,CAACC,MAAqB,EAAO;EAChD,OAAO,UAAUC,GAAmB,EAAEC,GAAoB,EAAEC,IAAsB,EAAQ;IACxF,IAAIF,GAAG,CAACG,OAAO,CAACC,iBAAW,CAACC,YAAY,CAAC,KAAKN,MAAM,EAAE;MACpDG,IAAI,CACFI,gBAAU,CAACC,OAAO,CAChBC,iBAAW,CAACC,iBAAiB,EAC7B,8BAA8B,GAAGV,MAAM,GAAG,SAAS,GAAGC,GAAG,CAACU,GAAG,CAACN,iBAAW,CAACC,YAAY,CACxF,CACF,CAAC;IACH,CAAC,MAAM;MACLH,IAAI,CAAC,CAAC;IACR;EACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"media.js","names":["_core","require","media","expect","req","res","next","header","headers","HEADER_TYPE","CONTENT_TYPE","errorUtils","getCode","HTTP_STATUS","UNSUPPORTED_MEDIA","split","trim","get"],"sources":["../../src/middlewares/media.ts"],"sourcesContent":["import { HEADER_TYPE, HTTP_STATUS, errorUtils } from '@verdaccio/core';\n\nimport { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types';\n\nexport function media(expect: string | null): any {\n  return function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {\n    const header = req.headers[HEADER_TYPE.CONTENT_TYPE];\n    if (!header) {\n      next(\n        errorUtils.getCode(\n          HTTP_STATUS.UNSUPPORTED_MEDIA,\n          'content-type is missing, expect: ' + expect\n        )\n      );\n      return;\n    }\n\n    if (typeof header !== 'string' || header.split(';')[0].trim() !== expect) {\n      next(\n        errorUtils.getCode(\n          HTTP_STATUS.UNSUPPORTED_MEDIA,\n          'wrong content-type, expect: ' + expect + ', got: ' + req.get[HEADER_TYPE.CONTENT_TYPE]\n        )\n      );\n    } else {\n      next();\n    }\n  };\n}\n"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAIO,SAASC,KAAKA,CAACC,MAAqB,EAAO;EAChD,OAAO,UAAUC,GAAmB,EAAEC,GAAoB,EAAEC,IAAsB,EAAQ;IACxF,MAAMC,MAAM,GAAGH,GAAG,CAACI,OAAO,CAACC,iBAAW,CAACC,YAAY,CAAC;IACpD,IAAI,CAACH,MAAM,EAAE;MACXD,IAAI,CACFK,gBAAU,CAACC,OAAO,CAChBC,iBAAW,CAACC,iBAAiB,EAC7B,mCAAmC,GAAGX,MACxC,CACF,CAAC;MACD;IACF;IAEA,IAAI,OAAOI,MAAM,KAAK,QAAQ,IAAIA,MAAM,CAACQ,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC,KAAKb,MAAM,EAAE;MACxEG,IAAI,CACFK,gBAAU,CAACC,OAAO,CAChBC,iBAAW,CAACC,iBAAiB,EAC7B,8BAA8B,GAAGX,MAAM,GAAG,SAAS,GAAGC,GAAG,CAACa,GAAG,CAACR,iBAAW,CAACC,YAAY,CACxF,CACF,CAAC;IACH,CAAC,MAAM;MACLJ,IAAI,CAAC,CAAC;IACR;EACF,CAAC;AACH","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/middleware",
-  "version": "8.0.0-next-8.4",
+  "version": "8.0.0-next-8.6",
   "description": "express middleware utils",
   "main": "./build/index.js",
   "types": "build/index.d.ts",
@@ -29,10 +29,10 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@verdaccio/config": "8.0.0-next-8.4",
-    "@verdaccio/core": "8.0.0-next-8.4",
-    "@verdaccio/url": "13.0.0-next-8.4",
-    "@verdaccio/utils": "8.1.0-next-8.4",
+    "@verdaccio/config": "8.0.0-next-8.6",
+    "@verdaccio/core": "8.0.0-next-8.6",
+    "@verdaccio/url": "13.0.0-next-8.6",
+    "@verdaccio/utils": "8.1.0-next-8.6",
     "debug": "4.3.7",
     "express": "4.21.1",
     "express-rate-limit": "5.5.1",
@@ -45,7 +45,7 @@
     "url": "https://opencollective.com/verdaccio"
   },
   "devDependencies": {
-    "@verdaccio/logger": "8.0.0-next-8.4",
+    "@verdaccio/logger": "8.0.0-next-8.6",
     "body-parser": "1.20.3",
     "supertest": "7.0.0",
     "jsdom": "25.0.1"

package/src/middlewares/media.ts

@@ -4,7 +4,18 @@ import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types';
 
 export function media(expect: string | null): any {
   return function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {
-    if (req.headers[HEADER_TYPE.CONTENT_TYPE] !== expect) {
+    const header = req.headers[HEADER_TYPE.CONTENT_TYPE];
+    if (!header) {
+      next(
+        errorUtils.getCode(
+          HTTP_STATUS.UNSUPPORTED_MEDIA,
+          'content-type is missing, expect: ' + expect
+        )
+      );
+      return;
+    }
+
+    if (typeof header !== 'string' || header.split(';')[0].trim() !== expect) {
       next(
         errorUtils.getCode(
           HTTP_STATUS.UNSUPPORTED_MEDIA,

package/test/media.spec.ts

@@ -20,6 +20,19 @@ test('media is json', async () => {
     .expect(200);
 });
 
+test('media is json with charset', async () => {
+  const app = getApp([]);
+  app.get('/json', media(mime.getType('json')), (req, res) => {
+    res.status(200).json();
+  });
+
+  return request(app)
+    .get('/json')
+    .set(HEADERS.CONTENT_TYPE, 'application/json; charset=utf-8')
+    .expect('Content-Type', /json/)
+    .expect(200);
+});
+
 test('media is not json', async () => {
   const app = getApp([]);
   app.get('/json', media(mime.getType('json')), (req, res) => {
@@ -32,3 +45,12 @@ test('media is not json', async () => {
     .expect('Content-Type', /html/)
     .expect(HTTP_STATUS.UNSUPPORTED_MEDIA);
 });
+
+test('missing content-type', async () => {
+  const app = getApp([]);
+  app.get('/json', media(mime.getType('json')), (req, res) => {
+    res.status(HTTP_STATUS.OK).json({});
+  });
+
+  return request(app).get('/json').expect(HTTP_STATUS.UNSUPPORTED_MEDIA);
+});