@verdaccio/server 6.0.0-6-next.54 → 6.0.0-6-next.56

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,44 @@
1
1
  # @verdaccio/server
2
2
 
3
+ ## 6.0.0-6-next.56
4
+
5
+ ### Minor Changes
6
+
7
+ - 16e38df8: feat: trustProxy property
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies [16e38df8]
12
+ - @verdaccio/config@6.0.0-6-next.67
13
+ - @verdaccio/core@6.0.0-6-next.67
14
+ - @verdaccio/store@6.0.0-6-next.47
15
+ - @verdaccio/api@6.0.0-6-next.50
16
+ - @verdaccio/auth@6.0.0-6-next.46
17
+ - @verdaccio/loaders@6.0.0-6-next.36
18
+ - @verdaccio/middleware@6.0.0-6-next.46
19
+ - verdaccio-audit@11.0.0-6-next.30
20
+ - @verdaccio/web@6.0.0-6-next.54
21
+ - @verdaccio/utils@6.0.0-6-next.35
22
+ - @verdaccio/logger@6.0.0-6-next.35
23
+
24
+ ## 6.0.0-6-next.55
25
+
26
+ ### Patch Changes
27
+
28
+ - 7ef599cc: fix: missing version on footer
29
+ - Updated dependencies [7ef599cc]
30
+ - @verdaccio/middleware@6.0.0-6-next.45
31
+ - @verdaccio/api@6.0.0-6-next.49
32
+ - @verdaccio/auth@6.0.0-6-next.45
33
+ - @verdaccio/core@6.0.0-6-next.66
34
+ - @verdaccio/loaders@6.0.0-6-next.35
35
+ - @verdaccio/logger@6.0.0-6-next.34
36
+ - verdaccio-audit@11.0.0-6-next.29
37
+ - @verdaccio/store@6.0.0-6-next.46
38
+ - @verdaccio/web@6.0.0-6-next.53
39
+ - @verdaccio/config@6.0.0-6-next.66
40
+ - @verdaccio/utils@6.0.0-6-next.34
41
+
3
42
  ## 6.0.0-6-next.54
4
43
 
5
44
  ### Patch Changes
package/build/server.js CHANGED
@@ -22,13 +22,20 @@ var _web = _interopRequireDefault(require("@verdaccio/web"));
22
22
  var _debug2 = _interopRequireDefault(require("./debug"));
23
23
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
24
24
  const debug = (0, _debug.default)('verdaccio:server');
25
+ const {
26
+ version
27
+ } = require('../package.json');
25
28
  const defineAPI = async function (config, storage) {
29
+ var _config$server;
26
30
  const auth = new _auth.Auth(config);
27
31
  await auth.init();
28
32
  const app = (0, _express.default)();
29
33
  // run in production mode by default, just in case
30
34
  // it shouldn't make any difference anyway
31
35
  app.set('env', process.env.NODE_ENV || 'production');
36
+ if ((_config$server = config.server) !== null && _config$server !== void 0 && _config$server.trustProxy) {
37
+ app.set('trust proxy', config.server.trustProxy);
38
+ }
32
39
  app.use((0, _cors.default)());
33
40
  app.use((0, _middleware.rateLimit)(config.serverSettings.rateLimit));
34
41
  const errorReportingMiddlewareWrap = (0, _middleware.errorReportingMiddleware)(_logger.logger);
@@ -74,6 +81,10 @@ const defineAPI = async function (config, storage) {
74
81
 
75
82
  // For WebUI & WebUI API
76
83
  if (_lodash.default.get(config, 'web.enable', true)) {
84
+ app.use((_req, res, next) => {
85
+ res.locals.app_version = version ?? '';
86
+ next();
87
+ });
77
88
  app.use(await (0, _web.default)(config, auth, storage));
78
89
  } else {
79
90
  app.get('/', function (req, res, next) {
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","names":["debug","buildDebug","defineAPI","config","storage","auth","Auth","init","app","express","set","process","env","NODE_ENV","use","cors","rateLimit","serverSettings","errorReportingMiddlewareWrap","errorReportingMiddleware","logger","log","userAgent","compression","get","req","res","next","url","_debug","hookDebug","configPath","plugins","asyncLoadPlugin","middlewares","plugin","register_middlewares","length","info","push","AuditMiddleware","enabled","strict_ssl","forEach","apiEndpoint","_","webMiddleware","errorUtils","getNotFound","API_ERROR","WEB_DISABLED","err","isError","code","statusCode","HTTP_STATUS","NOT_MODIFIED","isFunction","locals","report_error","noop","final","startServer","configHash","AppConfig","Storage","error","msg","Error"],"sources":["../src/server.ts"],"sourcesContent":["import compression from 'compression';\nimport cors from 'cors';\nimport buildDebug from 'debug';\nimport express from 'express';\nimport { HttpError } from 'http-errors';\nimport _ from 'lodash';\nimport AuditMiddleware from 'verdaccio-audit';\n\nimport apiEndpoint from '@verdaccio/api';\nimport { Auth } from '@verdaccio/auth';\nimport { Config as AppConfig } from '@verdaccio/config';\nimport { API_ERROR, HTTP_STATUS, errorUtils, pluginUtils } from '@verdaccio/core';\nimport { asyncLoadPlugin } from '@verdaccio/loaders';\nimport { logger } from '@verdaccio/logger';\nimport { errorReportingMiddleware, final, log, rateLimit, userAgent } from '@verdaccio/middleware';\nimport { Storage } from '@verdaccio/store';\nimport { ConfigYaml } from '@verdaccio/types';\nimport { Config as IConfig } from '@verdaccio/types';\nimport webMiddleware from '@verdaccio/web';\n\nimport { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types/custom';\nimport hookDebug from './debug';\n\nconst debug = buildDebug('verdaccio:server');\n\nconst defineAPI = async function (config: IConfig, storage: Storage): Promise<any> {\n const auth: Auth = new Auth(config);\n await auth.init();\n const app = express();\n // run in production mode by default, just in case\n // it shouldn't make any difference anyway\n app.set('env', process.env.NODE_ENV || 'production');\n app.use(cors());\n app.use(rateLimit(config.serverSettings.rateLimit));\n\n const errorReportingMiddlewareWrap = errorReportingMiddleware(logger);\n\n // Router setup\n app.use(log(logger));\n app.use(errorReportingMiddlewareWrap);\n app.use(userAgent(config));\n app.use(compression());\n\n app.get(\n '/favicon.ico',\n function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {\n req.url = '/-/static/favicon.png';\n next();\n }\n );\n\n // Hook for tests only\n if (config._debug) {\n hookDebug(app, config.configPath);\n }\n\n const plugins: pluginUtils.ExpressMiddleware<IConfig, {}, Auth>[] = await asyncLoadPlugin(\n config.middlewares,\n {\n config,\n logger,\n },\n function (plugin) {\n return typeof plugin.register_middlewares !== 'undefined';\n }\n );\n\n if (plugins.length === 0) {\n logger.info('none middleware plugins has been defined, adding audit middleware by default');\n // @ts-ignore\n plugins.push(new AuditMiddleware({ enabled: true, strict_ssl: true }, { config, logger }));\n }\n\n plugins.forEach((plugin: pluginUtils.ExpressMiddleware<IConfig, {}, Auth>) => {\n plugin.register_middlewares(app, auth, storage);\n });\n\n // For npm request\n // @ts-ignore\n app.use(apiEndpoint(config, auth, storage));\n\n // For WebUI & WebUI API\n if (_.get(config, 'web.enable', true)) {\n app.use(await webMiddleware(config, auth, storage));\n } else {\n app.get('/', function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer) {\n next(errorUtils.getNotFound(API_ERROR.WEB_DISABLED));\n });\n }\n\n // Catch 404\n app.get('/*', function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer) {\n next(errorUtils.getNotFound('resource not found'));\n });\n\n app.use(function (\n err: HttpError,\n req: $RequestExtend,\n res: $ResponseExtend,\n next: $NextFunctionVer\n ) {\n if (_.isError(err)) {\n if (err.code === 'ECONNABORT' && res.statusCode === HTTP_STATUS.NOT_MODIFIED) {\n return next();\n }\n if (_.isFunction(res.locals.report_error) === false) {\n // in case of very early error this middleware may not be loaded before error is generated\n // fixing that\n errorReportingMiddlewareWrap(req, res, _.noop);\n }\n res.locals.report_error(err);\n } else {\n // Fall to Middleware.final\n return next(err);\n }\n });\n\n app.use(final);\n\n return app;\n};\n\nexport default (async function startServer(configHash: ConfigYaml): Promise<any> {\n debug('start server');\n const config: IConfig = new AppConfig({ ...configHash } as any);\n // register middleware plugins\n debug('loaded filter plugin');\n // @ts-ignore\n const storage: Storage = new Storage(config);\n try {\n // waits until init calls have been initialized\n debug('storage init start');\n await storage.init(config);\n debug('storage init end');\n } catch (err: any) {\n logger.error({ error: err.msg }, 'storage has failed: @{error}');\n throw new Error(err);\n }\n return await defineAPI(config, storage);\n});\n"],"mappings":"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"}
1
+ {"version":3,"file":"server.js","names":["debug","buildDebug","version","require","defineAPI","config","storage","auth","Auth","init","app","express","set","process","env","NODE_ENV","server","trustProxy","use","cors","rateLimit","serverSettings","errorReportingMiddlewareWrap","errorReportingMiddleware","logger","log","userAgent","compression","get","req","res","next","url","_debug","hookDebug","configPath","plugins","asyncLoadPlugin","middlewares","plugin","register_middlewares","length","info","push","AuditMiddleware","enabled","strict_ssl","forEach","apiEndpoint","_","_req","locals","app_version","webMiddleware","errorUtils","getNotFound","API_ERROR","WEB_DISABLED","err","isError","code","statusCode","HTTP_STATUS","NOT_MODIFIED","isFunction","report_error","noop","final","startServer","configHash","AppConfig","Storage","error","msg","Error"],"sources":["../src/server.ts"],"sourcesContent":["import compression from 'compression';\nimport cors from 'cors';\nimport buildDebug from 'debug';\nimport express from 'express';\nimport { HttpError } from 'http-errors';\nimport _ from 'lodash';\nimport AuditMiddleware from 'verdaccio-audit';\n\nimport apiEndpoint from '@verdaccio/api';\nimport { Auth } from '@verdaccio/auth';\nimport { Config as AppConfig } from '@verdaccio/config';\nimport { API_ERROR, HTTP_STATUS, errorUtils, pluginUtils } from '@verdaccio/core';\nimport { asyncLoadPlugin } from '@verdaccio/loaders';\nimport { logger } from '@verdaccio/logger';\nimport { errorReportingMiddleware, final, log, rateLimit, userAgent } from '@verdaccio/middleware';\nimport { Storage } from '@verdaccio/store';\nimport { ConfigYaml } from '@verdaccio/types';\nimport { Config as IConfig } from '@verdaccio/types';\nimport webMiddleware from '@verdaccio/web';\n\nimport { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types/custom';\nimport hookDebug from './debug';\n\nconst debug = buildDebug('verdaccio:server');\nconst { version } = require('../package.json');\n\nconst defineAPI = async function (config: IConfig, storage: Storage): Promise<any> {\n const auth: Auth = new Auth(config);\n await auth.init();\n const app = express();\n // run in production mode by default, just in case\n // it shouldn't make any difference anyway\n app.set('env', process.env.NODE_ENV || 'production');\n if (config.server?.trustProxy) {\n app.set('trust proxy', config.server.trustProxy);\n }\n app.use(cors());\n app.use(rateLimit(config.serverSettings.rateLimit));\n\n const errorReportingMiddlewareWrap = errorReportingMiddleware(logger);\n\n // Router setup\n app.use(log(logger));\n app.use(errorReportingMiddlewareWrap);\n app.use(userAgent(config));\n app.use(compression());\n\n app.get(\n '/favicon.ico',\n function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {\n req.url = '/-/static/favicon.png';\n next();\n }\n );\n\n // Hook for tests only\n if (config._debug) {\n hookDebug(app, config.configPath);\n }\n\n const plugins: pluginUtils.ExpressMiddleware<IConfig, {}, Auth>[] = await asyncLoadPlugin(\n config.middlewares,\n {\n config,\n logger,\n },\n function (plugin) {\n return typeof plugin.register_middlewares !== 'undefined';\n }\n );\n\n if (plugins.length === 0) {\n logger.info('none middleware plugins has been defined, adding audit middleware by default');\n // @ts-ignore\n plugins.push(new AuditMiddleware({ enabled: true, strict_ssl: true }, { config, logger }));\n }\n\n plugins.forEach((plugin: pluginUtils.ExpressMiddleware<IConfig, {}, Auth>) => {\n plugin.register_middlewares(app, auth, storage);\n });\n\n // For npm request\n // @ts-ignore\n app.use(apiEndpoint(config, auth, storage));\n\n // For WebUI & WebUI API\n if (_.get(config, 'web.enable', true)) {\n app.use((_req, res, next) => {\n res.locals.app_version = version ?? '';\n next();\n });\n app.use(await webMiddleware(config, auth, storage));\n } else {\n app.get('/', function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer) {\n next(errorUtils.getNotFound(API_ERROR.WEB_DISABLED));\n });\n }\n\n // Catch 404\n app.get('/*', function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer) {\n next(errorUtils.getNotFound('resource not found'));\n });\n\n app.use(function (\n err: HttpError,\n req: $RequestExtend,\n res: $ResponseExtend,\n next: $NextFunctionVer\n ) {\n if (_.isError(err)) {\n if (err.code === 'ECONNABORT' && res.statusCode === HTTP_STATUS.NOT_MODIFIED) {\n return next();\n }\n if (_.isFunction(res.locals.report_error) === false) {\n // in case of very early error this middleware may not be loaded before error is generated\n // fixing that\n errorReportingMiddlewareWrap(req, res, _.noop);\n }\n res.locals.report_error(err);\n } else {\n // Fall to Middleware.final\n return next(err);\n }\n });\n\n app.use(final);\n\n return app;\n};\n\nexport default (async function startServer(configHash: ConfigYaml): Promise<any> {\n debug('start server');\n const config: IConfig = new AppConfig({ ...configHash } as any);\n // register middleware plugins\n debug('loaded filter plugin');\n // @ts-ignore\n const storage: Storage = new Storage(config);\n try {\n // waits until init calls have been initialized\n debug('storage init start');\n await storage.init(config);\n debug('storage init end');\n } catch (err: any) {\n logger.error({ error: err.msg }, 'storage has failed: @{error}');\n throw new Error(err);\n }\n return await defineAPI(config, storage);\n});\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@verdaccio/server",
3
- "version": "6.0.0-6-next.54",
3
+ "version": "6.0.0-6-next.56",
4
4
  "description": "server logic",
5
5
  "main": "./build/index.js",
6
6
  "types": "build/index.d.ts",
@@ -30,17 +30,17 @@
30
30
  "npm": ">=6"
31
31
  },
32
32
  "dependencies": {
33
- "@verdaccio/api": "6.0.0-6-next.48",
34
- "@verdaccio/auth": "6.0.0-6-next.44",
35
- "@verdaccio/core": "6.0.0-6-next.65",
36
- "@verdaccio/config": "6.0.0-6-next.65",
37
- "@verdaccio/loaders": "6.0.0-6-next.34",
38
- "@verdaccio/logger": "6.0.0-6-next.33",
39
- "@verdaccio/middleware": "6.0.0-6-next.44",
40
- "@verdaccio/store": "6.0.0-6-next.45",
41
- "@verdaccio/utils": "6.0.0-6-next.33",
42
- "@verdaccio/web": "6.0.0-6-next.52",
43
- "verdaccio-audit": "11.0.0-6-next.28",
33
+ "@verdaccio/api": "6.0.0-6-next.50",
34
+ "@verdaccio/auth": "6.0.0-6-next.46",
35
+ "@verdaccio/core": "6.0.0-6-next.67",
36
+ "@verdaccio/config": "6.0.0-6-next.67",
37
+ "@verdaccio/loaders": "6.0.0-6-next.36",
38
+ "@verdaccio/logger": "6.0.0-6-next.35",
39
+ "@verdaccio/middleware": "6.0.0-6-next.46",
40
+ "@verdaccio/store": "6.0.0-6-next.47",
41
+ "@verdaccio/utils": "6.0.0-6-next.35",
42
+ "@verdaccio/web": "6.0.0-6-next.54",
43
+ "verdaccio-audit": "11.0.0-6-next.30",
44
44
  "compression": "1.7.4",
45
45
  "cors": "2.8.5",
46
46
  "debug": "4.3.4",
@@ -49,7 +49,7 @@
49
49
  },
50
50
  "devDependencies": {
51
51
  "@types/node": "16.18.10",
52
- "@verdaccio/proxy": "6.0.0-6-next.43",
52
+ "@verdaccio/proxy": "6.0.0-6-next.45",
53
53
  "@verdaccio/test-helper": "2.0.0-6-next.8",
54
54
  "http-errors": "1.8.1"
55
55
  },
package/src/server.ts CHANGED
@@ -22,6 +22,7 @@ import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types/cust
22
22
  import hookDebug from './debug';
23
23
 
24
24
  const debug = buildDebug('verdaccio:server');
25
+ const { version } = require('../package.json');
25
26
 
26
27
  const defineAPI = async function (config: IConfig, storage: Storage): Promise<any> {
27
28
  const auth: Auth = new Auth(config);
@@ -30,6 +31,9 @@ const defineAPI = async function (config: IConfig, storage: Storage): Promise<an
30
31
  // run in production mode by default, just in case
31
32
  // it shouldn't make any difference anyway
32
33
  app.set('env', process.env.NODE_ENV || 'production');
34
+ if (config.server?.trustProxy) {
35
+ app.set('trust proxy', config.server.trustProxy);
36
+ }
33
37
  app.use(cors());
34
38
  app.use(rateLimit(config.serverSettings.rateLimit));
35
39
 
@@ -81,6 +85,10 @@ const defineAPI = async function (config: IConfig, storage: Storage): Promise<an
81
85
 
82
86
  // For WebUI & WebUI API
83
87
  if (_.get(config, 'web.enable', true)) {
88
+ app.use((_req, res, next) => {
89
+ res.locals.app_version = version ?? '';
90
+ next();
91
+ });
84
92
  app.use(await webMiddleware(config, auth, storage));
85
93
  } else {
86
94
  app.get('/', function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer) {