@verdaccio/url 11.0.0-6-next.16 → 11.0.0-6-next.18

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Change Log
 
+## 11.0.0-6-next.18
+
+### Patch Changes
+
+- @verdaccio/core@6.0.0-6-next.52
+
+## 11.0.0-6-next.17
+
+### Minor Changes
+
+- 4b29d715: chore: move improvements from v5 to v6
+
+  Migrate improvements form v5 to v6:
+
+  - https://github.com/verdaccio/verdaccio/pull/3158
+  - https://github.com/verdaccio/verdaccio/pull/3151
+  - https://github.com/verdaccio/verdaccio/pull/2271
+  - https://github.com/verdaccio/verdaccio/pull/2787
+  - https://github.com/verdaccio/verdaccio/pull/2791
+  - https://github.com/verdaccio/verdaccio/pull/2205
+
+### Patch Changes
+
+- Updated dependencies [4b29d715]
+  - @verdaccio/core@6.0.0-6-next.51
+
 ## 11.0.0-6-next.16
 
 ### Patch Changes

package/build/index.d.ts

@@ -15,7 +15,7 @@ export declare function wrapPrefix(prefix: string | void): string;
  */
 export declare function combineBaseUrl(protocol: string, host: string, prefix?: string): string;
 export declare function validateURL(publicUrl: string | void): boolean;
-export declare type RequestOptions = {
+export type RequestOptions = {
     /**
      * Request host.
      */

package/build/index.js

@@ -10,28 +10,21 @@ exports.isHost = isHost;
 exports.isURLhasValidProtocol = isURLhasValidProtocol;
 exports.validateURL = validateURL;
 exports.wrapPrefix = wrapPrefix;
-
 var _debug = _interopRequireDefault(require("debug"));
-
 var _url = require("url");
-
 var _isURL = _interopRequireDefault(require("validator/lib/isURL"));
-
 var _core = require("@verdaccio/core");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const debug = (0, _debug.default)('verdaccio:core:url');
 const validProtocols = ['https', 'http'];
+
 /**
  * Check if URI is starting with "http://", "https://" or "//"
  * @param {string} uri
  */
-
 function isURLhasValidProtocol(uri) {
   return /^(https?:)?\/\//.test(uri);
 }
-
 function isHost(url = '', options = {}) {
   return (0, _isURL.default)(url, {
     require_host: true,
@@ -43,15 +36,14 @@ function isHost(url = '', options = {}) {
     ...options
   });
 }
+
 /**
  * Detect running protocol (http or https)
  */
-
-
 function getWebProtocol(headerProtocol, protocol) {
   let returnProtocol;
-  const [, defaultProtocol] = validProtocols; // HAProxy variant might return http,http with X-Forwarded-Proto
-
+  const [, defaultProtocol] = validProtocols;
+  // HAProxy variant might return http,http with X-Forwarded-Proto
   if (typeof headerProtocol === 'string' && headerProtocol !== '') {
     debug('header protocol: %o', protocol);
     const commaIndex = headerProtocol.indexOf(',');
@@ -60,10 +52,8 @@ function getWebProtocol(headerProtocol, protocol) {
     debug('req protocol: %o', headerProtocol);
     returnProtocol = protocol;
   }
-
   return validProtocols.includes(returnProtocol) ? returnProtocol : defaultProtocol;
 }
-
 function wrapPrefix(prefix) {
   if (prefix === '' || typeof prefix === 'undefined' || prefix === null) {
     return '';
@@ -77,12 +67,11 @@ function wrapPrefix(prefix) {
     return prefix;
   }
 }
+
 /**
  * Create base url for registry.
  * @return {String} base registry url
  */
-
-
 function combineBaseUrl(protocol, host, prefix = '') {
   debug('combined protocol %o', protocol);
   debug('combined host %o', host);
@@ -93,22 +82,18 @@ function combineBaseUrl(protocol, host, prefix = '') {
   debug('combined url %o', result);
   return result;
 }
-
 function validateURL(publicUrl) {
   try {
     const parsed = new _url.URL(publicUrl);
-
     if (!validProtocols.includes(parsed.protocol.replace(':', ''))) {
       throw Error('invalid protocol');
     }
-
     return true;
   } catch (err) {
     // TODO: add error logger here
     return false;
   }
 }
-
 function getPublicUrl(url_prefix = '', requestOptions) {
   if (validateURL(process.env.VERDACCIO_PUBLIC_URL)) {
     const envURL = new _url.URL(wrapPrefix(url_prefix), process.env.VERDACCIO_PUBLIC_URL).href;
@@ -116,15 +101,11 @@ function getPublicUrl(url_prefix = '', requestOptions) {
     return envURL;
   } else if (requestOptions.headers['host']) {
     var _process$env$VERDACCI;
-
     const host = requestOptions.headers['host'];
-
     if (!isHost(host)) {
       throw new Error('invalid host');
     }
-
     const protoHeader = ((_process$env$VERDACCI = process.env.VERDACCIO_FORWARDED_PROTO) === null || _process$env$VERDACCI === void 0 ? void 0 : _process$env$VERDACCI.toLocaleLowerCase()) ?? _core.HEADERS.FORWARDED_PROTO.toLowerCase();
-
     const protocol = getWebProtocol(requestOptions.headers[protoHeader], requestOptions.protocol);
     const combinedUrl = combineBaseUrl(protocol, host, url_prefix);
     debug('public url by request %o', combinedUrl);

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["debug","buildDebug","validProtocols","isURLhasValidProtocol","uri","test","isHost","url","options","isURLValidator","require_host","allow_trailing_dot","require_valid_protocol","require_port","require_tld","getWebProtocol","headerProtocol","protocol","returnProtocol","defaultProtocol","commaIndex","indexOf","slice","includes","wrapPrefix","prefix","startsWith","endsWith","combineBaseUrl","host","newPrefix","groupedURI","URL","result","href","validateURL","publicUrl","parsed","replace","Error","err","getPublicUrl","url_prefix","requestOptions","process","env","VERDACCIO_PUBLIC_URL","envURL","headers","protoHeader","VERDACCIO_FORWARDED_PROTO","toLocaleLowerCase","HEADERS","FORWARDED_PROTO","toLowerCase","combinedUrl"],"sources":["../src/index.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { URL } from 'url';\nimport isURLValidator from 'validator/lib/isURL';\n\nimport { HEADERS } from '@verdaccio/core';\n\nconst debug = buildDebug('verdaccio:core:url');\n\nconst validProtocols = ['https', 'http'];\n\n/**\n * Check if URI is starting with \"http://\", \"https://\" or \"//\"\n * @param {string} uri\n */\nexport function isURLhasValidProtocol(uri: string): boolean {\n  return /^(https?:)?\\/\\//.test(uri);\n}\n\nexport function isHost(url: string = '', options = {}): boolean {\n  return isURLValidator(url, {\n    require_host: true,\n    allow_trailing_dot: false,\n    require_valid_protocol: false,\n    // @ts-ignore\n    require_port: false,\n    require_tld: false,\n    ...options,\n  });\n}\n\n/**\n * Detect running protocol (http or https)\n */\nexport function getWebProtocol(headerProtocol: string | void, protocol: string): string {\n  let returnProtocol;\n  const [, defaultProtocol] = validProtocols;\n  // HAProxy variant might return http,http with X-Forwarded-Proto\n  if (typeof headerProtocol === 'string' && headerProtocol !== '') {\n    debug('header protocol: %o', protocol);\n    const commaIndex = headerProtocol.indexOf(',');\n    returnProtocol = commaIndex > 0 ? headerProtocol.slice(0, commaIndex) : headerProtocol;\n  } else {\n    debug('req protocol: %o', headerProtocol);\n    returnProtocol = protocol;\n  }\n\n  return validProtocols.includes(returnProtocol) ? returnProtocol : defaultProtocol;\n}\n\nexport function wrapPrefix(prefix: string | void): string {\n  if (prefix === '' || typeof prefix === 'undefined' || prefix === null) {\n    return '';\n  } else if (!prefix.startsWith('/') && prefix.endsWith('/')) {\n    return `/${prefix}`;\n  } else if (!prefix.startsWith('/') && !prefix.endsWith('/')) {\n    return `/${prefix}/`;\n  } else if (prefix.startsWith('/') && !prefix.endsWith('/')) {\n    return `${prefix}/`;\n  } else {\n    return prefix;\n  }\n}\n\n/**\n * Create base url for registry.\n * @return {String} base registry url\n */\nexport function combineBaseUrl(protocol: string, host: string, prefix: string = ''): string {\n  debug('combined protocol %o', protocol);\n  debug('combined host %o', host);\n  const newPrefix = wrapPrefix(prefix);\n  debug('combined prefix %o', newPrefix);\n  const groupedURI = new URL(wrapPrefix(prefix), `${protocol}://${host}`);\n  const result = groupedURI.href;\n  debug('combined url %o', result);\n  return result;\n}\n\nexport function validateURL(publicUrl: string | void) {\n  try {\n    const parsed = new URL(publicUrl as string);\n    if (!validProtocols.includes(parsed.protocol.replace(':', ''))) {\n      throw Error('invalid protocol');\n    }\n    return true;\n  } catch (err: any) {\n    // TODO: add error logger here\n    return false;\n  }\n}\n\nexport type RequestOptions = {\n  /**\n   * Request host.\n   */\n  host: string;\n  /**\n   * Request protocol.\n   */\n  protocol: string;\n  /**\n   * Request headers.\n   */\n  headers: { [key: string]: string };\n  remoteAddress?: string;\n  /**\n   * Logged username the request, usually after token verification.\n   */\n  username?: string;\n};\n\nexport function getPublicUrl(url_prefix: string = '', requestOptions: RequestOptions): string {\n  if (validateURL(process.env.VERDACCIO_PUBLIC_URL as string)) {\n    const envURL = new URL(wrapPrefix(url_prefix), process.env.VERDACCIO_PUBLIC_URL as string).href;\n    debug('public url by env %o', envURL);\n    return envURL;\n  } else if (requestOptions.headers['host']) {\n    const host = requestOptions.headers['host'];\n    if (!isHost(host)) {\n      throw new Error('invalid host');\n    }\n    const protoHeader =\n      process.env.VERDACCIO_FORWARDED_PROTO?.toLocaleLowerCase() ??\n      HEADERS.FORWARDED_PROTO.toLowerCase();\n    const protocol = getWebProtocol(requestOptions.headers[protoHeader], requestOptions.protocol);\n    const combinedUrl = combineBaseUrl(protocol, host, url_prefix);\n    debug('public url by request %o', combinedUrl);\n    return combinedUrl;\n  } else {\n    return '/';\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"index.js","names":["debug","buildDebug","validProtocols","isURLhasValidProtocol","uri","test","isHost","url","options","isURLValidator","require_host","allow_trailing_dot","require_valid_protocol","require_port","require_tld","getWebProtocol","headerProtocol","protocol","returnProtocol","defaultProtocol","commaIndex","indexOf","slice","includes","wrapPrefix","prefix","startsWith","endsWith","combineBaseUrl","host","newPrefix","groupedURI","URL","result","href","validateURL","publicUrl","parsed","replace","Error","err","getPublicUrl","url_prefix","requestOptions","process","env","VERDACCIO_PUBLIC_URL","envURL","headers","protoHeader","VERDACCIO_FORWARDED_PROTO","toLocaleLowerCase","HEADERS","FORWARDED_PROTO","toLowerCase","combinedUrl"],"sources":["../src/index.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { URL } from 'url';\nimport isURLValidator from 'validator/lib/isURL';\n\nimport { HEADERS } from '@verdaccio/core';\n\nconst debug = buildDebug('verdaccio:core:url');\n\nconst validProtocols = ['https', 'http'];\n\n/**\n * Check if URI is starting with \"http://\", \"https://\" or \"//\"\n * @param {string} uri\n */\nexport function isURLhasValidProtocol(uri: string): boolean {\n  return /^(https?:)?\\/\\//.test(uri);\n}\n\nexport function isHost(url: string = '', options = {}): boolean {\n  return isURLValidator(url, {\n    require_host: true,\n    allow_trailing_dot: false,\n    require_valid_protocol: false,\n    // @ts-ignore\n    require_port: false,\n    require_tld: false,\n    ...options,\n  });\n}\n\n/**\n * Detect running protocol (http or https)\n */\nexport function getWebProtocol(headerProtocol: string | void, protocol: string): string {\n  let returnProtocol;\n  const [, defaultProtocol] = validProtocols;\n  // HAProxy variant might return http,http with X-Forwarded-Proto\n  if (typeof headerProtocol === 'string' && headerProtocol !== '') {\n    debug('header protocol: %o', protocol);\n    const commaIndex = headerProtocol.indexOf(',');\n    returnProtocol = commaIndex > 0 ? headerProtocol.slice(0, commaIndex) : headerProtocol;\n  } else {\n    debug('req protocol: %o', headerProtocol);\n    returnProtocol = protocol;\n  }\n\n  return validProtocols.includes(returnProtocol) ? returnProtocol : defaultProtocol;\n}\n\nexport function wrapPrefix(prefix: string | void): string {\n  if (prefix === '' || typeof prefix === 'undefined' || prefix === null) {\n    return '';\n  } else if (!prefix.startsWith('/') && prefix.endsWith('/')) {\n    return `/${prefix}`;\n  } else if (!prefix.startsWith('/') && !prefix.endsWith('/')) {\n    return `/${prefix}/`;\n  } else if (prefix.startsWith('/') && !prefix.endsWith('/')) {\n    return `${prefix}/`;\n  } else {\n    return prefix;\n  }\n}\n\n/**\n * Create base url for registry.\n * @return {String} base registry url\n */\nexport function combineBaseUrl(protocol: string, host: string, prefix: string = ''): string {\n  debug('combined protocol %o', protocol);\n  debug('combined host %o', host);\n  const newPrefix = wrapPrefix(prefix);\n  debug('combined prefix %o', newPrefix);\n  const groupedURI = new URL(wrapPrefix(prefix), `${protocol}://${host}`);\n  const result = groupedURI.href;\n  debug('combined url %o', result);\n  return result;\n}\n\nexport function validateURL(publicUrl: string | void) {\n  try {\n    const parsed = new URL(publicUrl as string);\n    if (!validProtocols.includes(parsed.protocol.replace(':', ''))) {\n      throw Error('invalid protocol');\n    }\n    return true;\n  } catch (err: any) {\n    // TODO: add error logger here\n    return false;\n  }\n}\n\nexport type RequestOptions = {\n  /**\n   * Request host.\n   */\n  host: string;\n  /**\n   * Request protocol.\n   */\n  protocol: string;\n  /**\n   * Request headers.\n   */\n  headers: { [key: string]: string };\n  remoteAddress?: string;\n  /**\n   * Logged username the request, usually after token verification.\n   */\n  username?: string;\n};\n\nexport function getPublicUrl(url_prefix: string = '', requestOptions: RequestOptions): string {\n  if (validateURL(process.env.VERDACCIO_PUBLIC_URL as string)) {\n    const envURL = new URL(wrapPrefix(url_prefix), process.env.VERDACCIO_PUBLIC_URL as string).href;\n    debug('public url by env %o', envURL);\n    return envURL;\n  } else if (requestOptions.headers['host']) {\n    const host = requestOptions.headers['host'];\n    if (!isHost(host)) {\n      throw new Error('invalid host');\n    }\n    const protoHeader =\n      process.env.VERDACCIO_FORWARDED_PROTO?.toLocaleLowerCase() ??\n      HEADERS.FORWARDED_PROTO.toLowerCase();\n    const protocol = getWebProtocol(requestOptions.headers[protoHeader], requestOptions.protocol);\n    const combinedUrl = combineBaseUrl(protocol, host, url_prefix);\n    debug('public url by request %o', combinedUrl);\n    return combinedUrl;\n  } else {\n    return '/';\n  }\n}\n"],"mappings":";;;;;;;;;;;;AAAA;AACA;AACA;AAEA;AAA0C;AAE1C,MAAMA,KAAK,GAAG,IAAAC,cAAU,EAAC,oBAAoB,CAAC;AAE9C,MAAMC,cAAc,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC;;AAExC;AACA;AACA;AACA;AACO,SAASC,qBAAqB,CAACC,GAAW,EAAW;EAC1D,OAAO,iBAAiB,CAACC,IAAI,CAACD,GAAG,CAAC;AACpC;AAEO,SAASE,MAAM,CAACC,GAAW,GAAG,EAAE,EAAEC,OAAO,GAAG,CAAC,CAAC,EAAW;EAC9D,OAAO,IAAAC,cAAc,EAACF,GAAG,EAAE;IACzBG,YAAY,EAAE,IAAI;IAClBC,kBAAkB,EAAE,KAAK;IACzBC,sBAAsB,EAAE,KAAK;IAC7B;IACAC,YAAY,EAAE,KAAK;IACnBC,WAAW,EAAE,KAAK;IAClB,GAAGN;EACL,CAAC,CAAC;AACJ;;AAEA;AACA;AACA;AACO,SAASO,cAAc,CAACC,cAA6B,EAAEC,QAAgB,EAAU;EACtF,IAAIC,cAAc;EAClB,MAAM,GAAGC,eAAe,CAAC,GAAGjB,cAAc;EAC1C;EACA,IAAI,OAAOc,cAAc,KAAK,QAAQ,IAAIA,cAAc,KAAK,EAAE,EAAE;IAC/DhB,KAAK,CAAC,qBAAqB,EAAEiB,QAAQ,CAAC;IACtC,MAAMG,UAAU,GAAGJ,cAAc,CAACK,OAAO,CAAC,GAAG,CAAC;IAC9CH,cAAc,GAAGE,UAAU,GAAG,CAAC,GAAGJ,cAAc,CAACM,KAAK,CAAC,CAAC,EAAEF,UAAU,CAAC,GAAGJ,cAAc;EACxF,CAAC,MAAM;IACLhB,KAAK,CAAC,kBAAkB,EAAEgB,cAAc,CAAC;IACzCE,cAAc,GAAGD,QAAQ;EAC3B;EAEA,OAAOf,cAAc,CAACqB,QAAQ,CAACL,cAAc,CAAC,GAAGA,cAAc,GAAGC,eAAe;AACnF;AAEO,SAASK,UAAU,CAACC,MAAqB,EAAU;EACxD,IAAIA,MAAM,KAAK,EAAE,IAAI,OAAOA,MAAM,KAAK,WAAW,IAAIA,MAAM,KAAK,IAAI,EAAE;IACrE,OAAO,EAAE;EACX,CAAC,MAAM,IAAI,CAACA,MAAM,CAACC,UAAU,CAAC,GAAG,CAAC,IAAID,MAAM,CAACE,QAAQ,CAAC,GAAG,CAAC,EAAE;IAC1D,OAAQ,IAAGF,MAAO,EAAC;EACrB,CAAC,MAAM,IAAI,CAACA,MAAM,CAACC,UAAU,CAAC,GAAG,CAAC,IAAI,CAACD,MAAM,CAACE,QAAQ,CAAC,GAAG,CAAC,EAAE;IAC3D,OAAQ,IAAGF,MAAO,GAAE;EACtB,CAAC,MAAM,IAAIA,MAAM,CAACC,UAAU,CAAC,GAAG,CAAC,IAAI,CAACD,MAAM,CAACE,QAAQ,CAAC,GAAG,CAAC,EAAE;IAC1D,OAAQ,GAAEF,MAAO,GAAE;EACrB,CAAC,MAAM;IACL,OAAOA,MAAM;EACf;AACF;;AAEA;AACA;AACA;AACA;AACO,SAASG,cAAc,CAACX,QAAgB,EAAEY,IAAY,EAAEJ,MAAc,GAAG,EAAE,EAAU;EAC1FzB,KAAK,CAAC,sBAAsB,EAAEiB,QAAQ,CAAC;EACvCjB,KAAK,CAAC,kBAAkB,EAAE6B,IAAI,CAAC;EAC/B,MAAMC,SAAS,GAAGN,UAAU,CAACC,MAAM,CAAC;EACpCzB,KAAK,CAAC,oBAAoB,EAAE8B,SAAS,CAAC;EACtC,MAAMC,UAAU,GAAG,IAAIC,QAAG,CAACR,UAAU,CAACC,MAAM,CAAC,EAAG,GAAER,QAAS,MAAKY,IAAK,EAAC,CAAC;EACvE,MAAMI,MAAM,GAAGF,UAAU,CAACG,IAAI;EAC9BlC,KAAK,CAAC,iBAAiB,EAAEiC,MAAM,CAAC;EAChC,OAAOA,MAAM;AACf;AAEO,SAASE,WAAW,CAACC,SAAwB,EAAE;EACpD,IAAI;IACF,MAAMC,MAAM,GAAG,IAAIL,QAAG,CAACI,SAAS,CAAW;IAC3C,IAAI,CAAClC,cAAc,CAACqB,QAAQ,CAACc,MAAM,CAACpB,QAAQ,CAACqB,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE;MAC9D,MAAMC,KAAK,CAAC,kBAAkB,CAAC;IACjC;IACA,OAAO,IAAI;EACb,CAAC,CAAC,OAAOC,GAAQ,EAAE;IACjB;IACA,OAAO,KAAK;EACd;AACF;AAsBO,SAASC,YAAY,CAACC,UAAkB,GAAG,EAAE,EAAEC,cAA8B,EAAU;EAC5F,IAAIR,WAAW,CAACS,OAAO,CAACC,GAAG,CAACC,oBAAoB,CAAW,EAAE;IAC3D,MAAMC,MAAM,GAAG,IAAIf,QAAG,CAACR,UAAU,CAACkB,UAAU,CAAC,EAAEE,OAAO,CAACC,GAAG,CAACC,oBAAoB,CAAW,CAACZ,IAAI;IAC/FlC,KAAK,CAAC,sBAAsB,EAAE+C,MAAM,CAAC;IACrC,OAAOA,MAAM;EACf,CAAC,MAAM,IAAIJ,cAAc,CAACK,OAAO,CAAC,MAAM,CAAC,EAAE;IAAA;IACzC,MAAMnB,IAAI,GAAGc,cAAc,CAACK,OAAO,CAAC,MAAM,CAAC;IAC3C,IAAI,CAAC1C,MAAM,CAACuB,IAAI,CAAC,EAAE;MACjB,MAAM,IAAIU,KAAK,CAAC,cAAc,CAAC;IACjC;IACA,MAAMU,WAAW,GACf,0BAAAL,OAAO,CAACC,GAAG,CAACK,yBAAyB,0DAArC,sBAAuCC,iBAAiB,EAAE,KAC1DC,aAAO,CAACC,eAAe,CAACC,WAAW,EAAE;IACvC,MAAMrC,QAAQ,GAAGF,cAAc,CAAC4B,cAAc,CAACK,OAAO,CAACC,WAAW,CAAC,EAAEN,cAAc,CAAC1B,QAAQ,CAAC;IAC7F,MAAMsC,WAAW,GAAG3B,cAAc,CAACX,QAAQ,EAAEY,IAAI,EAAEa,UAAU,CAAC;IAC9D1C,KAAK,CAAC,0BAA0B,EAAEuD,WAAW,CAAC;IAC9C,OAAOA,WAAW;EACpB,CAAC,MAAM;IACL,OAAO,GAAG;EACZ;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/url",
-  "version": "11.0.0-6-next.16",
+  "version": "11.0.0-6-next.18",
   "description": "url utilities resolver",
   "keywords": [
     "private",
@@ -34,14 +34,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@verdaccio/core": "6.0.0-6-next.50",
+    "@verdaccio/core": "6.0.0-6-next.52",
     "debug": "4.3.4",
     "lodash": "4.17.21",
     "validator": "13.7.0"
   },
   "devDependencies": {
     "@verdaccio/types": "11.0.0-6-next.17",
-    "node-mocks-http": "1.11.0"
+    "node-mocks-http": "1.12.1"
   },
   "funding": {
     "type": "opencollective",

package/tests/getPublicUrl.spec.ts

@@ -295,6 +295,27 @@ describe('env variable', () => {
     delete process.env.VERDACCIO_PUBLIC_URL;
   });
 
+  test('with the VERDACCIO_FORWARDED_PROTO undefined', () => {
+    process.env.VERDACCIO_FORWARDED_PROTO = undefined;
+    const req = httpMocks.createRequest({
+      method: 'GET',
+      headers: {
+        host: 'some.com',
+        [HEADERS.FORWARDED_PROTO]: 'https',
+      },
+      url: '/',
+    });
+
+    expect(
+      getPublicUrl('/test/', {
+        host: req.hostname,
+        headers: req.headers as any,
+        protocol: req.protocol,
+      })
+    ).toEqual('http://some.com/test/');
+    delete process.env.VERDACCIO_FORWARDED_PROTO;
+  });
+
   test('with a invalid X-Forwarded-Proto https and host injection with invalid host', () => {
     process.env.VERDACCIO_PUBLIC_URL = 'http://injection.test.com"><svg onload="alert(1)">';
     const req = httpMocks.createRequest({