From 3c48a65ef10fb2bd46af5cd4333a26b69f31ab53 Mon Sep 17 00:00:00 2001 From: Chrystian Huot Date: Mon, 17 Aug 2020 08:47:45 -0400 Subject: [PATCH] Version 4.4.2 - Fix api keys validation to support patched talkgroups --- README.md | 8 +- client/package-lock.json | 138 +++++++++++++------------- client/package.json | 6 +- package.json | 2 +- server/lib/rdio-scanner/controller.js | 10 +- server/package-lock.json | 44 ++++---- server/package.json | 6 +- 7 files changed, 113 insertions(+), 101 deletions(-) diff --git a/README.md b/README.md index 790ee0a..64a3613 100644 --- a/README.md +++ b/README.md @@ -48,4 +48,10 @@ The server side of [Rdio Scanner](https://github.com/chuot/rdio-scanner) can mon You can ask your questions or post your comments on the [Gitter Rdio Scanner Lobby](https://gitter.im/rdio-scanner/Lobby) where the community continues to grow. -## And as usual: Happy Rdio scanning ! \ No newline at end of file +## Show your appreciation / Support the author + +If you like [Rdio Scanner](https://github.com/chuot/rdio-scanner) please consider **starring the repository** to show you appreciation to the author for his hard work. It cost nothing but is really appreciated. + +If you use [Rdio Scanner](https://github.com/chuot/rdio-scanner) for commercial purposes or derive income from it, please consider [sponsoring this project](https://github.com/sponsors/chuot) to help support continued development. + +**Happy Rdio scanning !** \ No newline at end of file diff --git a/client/package-lock.json b/client/package-lock.json index 00e8e22..d697ed5 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,16 +1,16 @@ { "name": "rdio-scanner-client", - "version": "4.4.1", + "version": "4.4.2", "lockfileVersion": 1, "requires": true, "dependencies": { "@angular-devkit/architect": { - "version": "0.1000.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.5.tgz", - "integrity": "sha512-BhNqB7fmmrDQwxoJ3zdw5FslFD+nYGgMTiC48ERVYJVuN3BK6xtt2OGA7vho3eJ13OE5cPGUi8crQDRROgxxQg==", + "version": "0.1000.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.6.tgz", + "integrity": "sha512-IZ8yiiW+LQ5mI3VbNHzisTIn0j6D1inQZgcZtc5W2A7fFNvBlIh6vGU3mB6Qvg678Gt6tlvnNT6/R9A9Ct7VnA==", "dev": true, "requires": { - "@angular-devkit/core": "10.0.5", + "@angular-devkit/core": "10.0.6", "rxjs": "6.5.5" }, "dependencies": { @@ -32,15 +32,15 @@ } }, "@angular-devkit/build-angular": { - "version": "0.1000.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1000.5.tgz", - "integrity": "sha512-YOlYdOksFsirCV7l2S0T/k9phRtT5eR+Pk3uWHXGfrkCBzFlAHw1EqOlJLOOSuN+stGHHYnKES2WUVJRJXLlCQ==", + "version": "0.1000.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1000.6.tgz", + "integrity": "sha512-tKyVD8Wqfo2wFdfWmc7OMzFn30Zl37heEusnMrQD5/zZ3Hw4Nqt2kf3pf3hbWl1GExUVFYyRNoCOCh9DaIfh0w==", "dev": true, "requires": { - "@angular-devkit/architect": "0.1000.5", - "@angular-devkit/build-optimizer": "0.1000.5", - "@angular-devkit/build-webpack": "0.1000.5", - "@angular-devkit/core": "10.0.5", + "@angular-devkit/architect": "0.1000.6", + "@angular-devkit/build-optimizer": "0.1000.6", + "@angular-devkit/build-webpack": "0.1000.6", + "@angular-devkit/core": "10.0.6", "@babel/core": "7.9.6", "@babel/generator": "7.9.6", "@babel/plugin-transform-runtime": "7.9.6", @@ -48,7 +48,7 @@ "@babel/runtime": "7.9.6", "@babel/template": "7.8.6", "@jsdevtools/coverage-istanbul-loader": "3.0.3", - "@ngtools/webpack": "10.0.5", + "@ngtools/webpack": "10.0.6", "ajv": "6.12.3", "autoprefixer": "9.8.0", "babel-loader": "8.1.0", @@ -128,9 +128,9 @@ } }, "@angular-devkit/build-optimizer": { - "version": "0.1000.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.5.tgz", - "integrity": "sha512-H6jTF7TOYq909HR6M3Bu8lScqrG1qznK2XMefK3m1I1jBJ+WO4bL7hrhTp/CIY3d+47txep+XqhitDWD/6ikpg==", + "version": "0.1000.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.6.tgz", + "integrity": "sha512-R8zDEAvd9PeUKvOKh6I7xp3w+MViCwjGKoOZcznjH/i/9PQjOHCMwU5S48RQloQjMGu96eDMUGOVnd9qkzXUEw==", "dev": true, "requires": { "loader-utils": "2.0.0", @@ -148,13 +148,13 @@ } }, "@angular-devkit/build-webpack": { - "version": "0.1000.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1000.5.tgz", - "integrity": "sha512-233EbW+6IKJEV20IG9Qzlz8MdDedzoTheB+lx9tTPn21m0ph2vmpTsNOsmMWwvdBBgXbv3pW3SMbJiqDCh7u4w==", + "version": "0.1000.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1000.6.tgz", + "integrity": "sha512-R01bJWuvckU5IdjcqoCeikLBpHRqt5fgfD0a4Hsg3evqW6xxXcSgc+YhWfeEmyU/nF/kVel8G2bFyPzhZP4QdQ==", "dev": true, "requires": { - "@angular-devkit/architect": "0.1000.5", - "@angular-devkit/core": "10.0.5", + "@angular-devkit/architect": "0.1000.6", + "@angular-devkit/core": "10.0.6", "rxjs": "6.5.5" }, "dependencies": { @@ -176,9 +176,9 @@ } }, "@angular-devkit/core": { - "version": "10.0.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.5.tgz", - "integrity": "sha512-ZaF1EYniIo+yRLvvaKnLrjYCdKeg2U3YtbA932M2AIfjgfFv/9mnAbH4jmZsBZhCstxZPz+ItwJesdR20h4Z1Q==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.6.tgz", + "integrity": "sha512-mVvqSEoeErZ7bAModk95EAa6R9Nl23rvX+/TXuKVTK2dziMFBOrwHjb1DYhnZxFIH4xfUftCx+BWHjXBXCPYlA==", "dev": true, "requires": { "ajv": "6.12.3", @@ -206,12 +206,12 @@ } }, "@angular-devkit/schematics": { - "version": "10.0.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.5.tgz", - "integrity": "sha512-UeeV8O0IydxCKj2oejygs80oIAQXPYrJHo0PQ/fa0RH6rtV3wZwirdy+yqq/BDGhtV/5VQSVCvu6uyAtGGMgNg==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.6.tgz", + "integrity": "sha512-V3T4cf+jVKiPYyBrSVHf3ZSnk4wIc1WEaaeFta56HccEGQCQpvAFKqDurmtMHer50Hhaxhn7IC3Oi5kPnvkNyQ==", "dev": true, "requires": { - "@angular-devkit/core": "10.0.5", + "@angular-devkit/core": "10.0.6", "ora": "4.0.4", "rxjs": "6.5.5" }, @@ -251,16 +251,16 @@ } }, "@angular/cli": { - "version": "10.0.5", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.5.tgz", - "integrity": "sha512-Qsa90IGPApJS9HL6Ih7Z8S8mIdriWYEintsT9cfI0WMVYyjvSNZQBf1SvnNU3IEboV4RFnpfXJNmQz1Q4KsRFQ==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.6.tgz", + "integrity": "sha512-gQbQA/CsCyMf9RKEv1hJBCdBebV2BHeT4lGi56Eii0IkvZD5WIH0dNfQzR+6ErqGDgE1EI+9YCuX3psMEvCRUA==", "dev": true, "requires": { - "@angular-devkit/architect": "0.1000.5", - "@angular-devkit/core": "10.0.5", - "@angular-devkit/schematics": "10.0.5", - "@schematics/angular": "10.0.5", - "@schematics/update": "0.1000.5", + "@angular-devkit/architect": "0.1000.6", + "@angular-devkit/core": "10.0.6", + "@angular-devkit/schematics": "10.0.6", + "@schematics/angular": "10.0.6", + "@schematics/update": "0.1000.6", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.1.1", @@ -1666,12 +1666,12 @@ } }, "@ngtools/webpack": { - "version": "10.0.5", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.0.5.tgz", - "integrity": "sha512-jMHfLXFzmgRlZbHgS71BEIKDyHbkfKrJL1sWEs3Ylox+TEIYzJiGfnem5ZGpr8wplz8HMMJ+xngtABePvc3/0w==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.0.6.tgz", + "integrity": "sha512-AbSDhPmsljkZO2jHFpge/5AHLQIrbscWgo4brrhF7NQ5TvPgE0Xn0wU7gxB9++hVUKQLGnnbAvewJyB/uYb9Nw==", "dev": true, "requires": { - "@angular-devkit/core": "10.0.5", + "@angular-devkit/core": "10.0.6", "enhanced-resolve": "4.1.1", "rxjs": "6.5.5", "webpack-sources": "1.4.3" @@ -1738,23 +1738,23 @@ } }, "@schematics/angular": { - "version": "10.0.5", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.5.tgz", - "integrity": "sha512-zg8QxgW3uLva/MSKMRYfV7dzj00SUki4nxYN4j1rw42VlwNPnFrPtzFVEilL6N7wFgoHP/6cZRgm4bfXYvLBvg==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.6.tgz", + "integrity": "sha512-TPBpo0GnMJLvKE6rYZDkSy9pnkMH55rSJ6nfLDpQ5zzmhoD/QnASUr8trfTFs3+MqmPlX61xI00+HmStmI8sJQ==", "dev": true, "requires": { - "@angular-devkit/core": "10.0.5", - "@angular-devkit/schematics": "10.0.5" + "@angular-devkit/core": "10.0.6", + "@angular-devkit/schematics": "10.0.6" } }, "@schematics/update": { - "version": "0.1000.5", - "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1000.5.tgz", - "integrity": "sha512-xodvq3X4B90u8myMEp9ESPnD2aC4YtNXj1FOcJ+BnguRA7q9rq9EL9Xqdef8sx3PObbSiKC0OFLyxgw76WuC3Q==", + "version": "0.1000.6", + "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1000.6.tgz", + "integrity": "sha512-GGfPGPjRF/MA4EeJ+h1ebzoYDzChF4BV7SaTfpT107LPCD3McRjKS39Jw2qH/ArGNSbrbJ8fYNOIj3g/uh1GoA==", "dev": true, "requires": { - "@angular-devkit/core": "10.0.5", - "@angular-devkit/schematics": "10.0.5", + "@angular-devkit/core": "10.0.6", + "@angular-devkit/schematics": "10.0.6", "@yarnpkg/lockfile": "1.1.0", "ini": "1.3.5", "npm-package-arg": "^8.0.0", @@ -2593,9 +2593,9 @@ "dev": true }, "bn.js": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz", - "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", + "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==", "dev": true }, "body-parser": { @@ -2951,9 +2951,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001113", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001113.tgz", - "integrity": "sha512-qMvjHiKH21zzM/VDZr6oosO6Ri3U0V2tC015jRXjOecwQCJtsU5zklTNTk31jQbIOP8gha0h1ccM/g0ECP+4BA==", + "version": "1.0.30001114", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001114.tgz", + "integrity": "sha512-ml/zTsfNBM+T1+mjglWRPgVsu2L76GAaADKX5f4t0pbhttEp0WMawJsHDYlFkVZkoA+89uvBRrVrEE4oqenzXQ==", "dev": true }, "canonical-path": { @@ -6547,9 +6547,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, "lodash.clonedeep": { @@ -6983,9 +6983,9 @@ } }, "minizlib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz", - "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dev": true, "requires": { "minipass": "^3.0.0", @@ -7339,9 +7339,9 @@ } }, "npm-registry-fetch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz", - "integrity": "sha512-yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.6.tgz", + "integrity": "sha512-SEp9m7fPe8FIKzhg2JS+xs+w4YY9mEwRlMcEZRELph7rdoygIQGY6B+g0+wdZqokHE8f57ZkexxYWqFO0FkfCw==", "dev": true, "requires": { "JSONStream": "^1.3.4", @@ -10596,15 +10596,15 @@ "dev": true }, "tar": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz", - "integrity": "sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==", + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz", + "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==", "dev": true, "requires": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", "minipass": "^3.0.0", - "minizlib": "^2.1.0", + "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" }, diff --git a/client/package.json b/client/package.json index b8ca954..171079f 100644 --- a/client/package.json +++ b/client/package.json @@ -17,8 +17,8 @@ "zone.js": "~0.10.3" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1000.5", - "@angular/cli": "^10.0.5", + "@angular-devkit/build-angular": "~0.1000.6", + "@angular/cli": "^10.0.6", "@angular/compiler-cli": "~10.0.9", "@types/node": "~14.0.27", "codelyzer": "^6.0.0", @@ -33,5 +33,5 @@ "build": "ng build --base-href ./ --prod", "start": "ng serve" }, - "version": "4.4.1" + "version": "4.4.2" } diff --git a/package.json b/package.json index 04d7f20..11ecdea 100644 --- a/package.json +++ b/package.json @@ -11,5 +11,5 @@ "start": "node run", "update": "node update" }, - "version": "4.4.1" + "version": "4.4.2" } diff --git a/server/lib/rdio-scanner/controller.js b/server/lib/rdio-scanner/controller.js index 8d1b775..7ba7ce6 100644 --- a/server/lib/rdio-scanner/controller.js +++ b/server/lib/rdio-scanner/controller.js @@ -677,7 +677,6 @@ class Controller extends EventEmitter { if (socket.isAuthenticated) { socket.send(JSON.stringify([wsCommand.config, await this.getConfig(socket.scope)])); - } else { socket.send(JSON.stringify([wsCommand.pin])); } @@ -689,7 +688,14 @@ class Controller extends EventEmitter { validateApiKey(apiKey, system, talkgroup) { const scope = this.getScope(apiKey, this.config.apiKeys); - return Array.isArray(scope[system]) && scope[system].includes(talkgroup); + return Array.isArray(scope[system]) && ( + scope[system].includes(talkgroup) || + this.config.systems.some((sys) => { + return sys.id === system && sys.talkgroups.some((tg) => { + return Array.isArray(tg.patches) && tg.patches.includes(talkgroup); + }) + }) + ); } } diff --git a/server/package-lock.json b/server/package-lock.json index e3b96ce..de677b9 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,6 +1,6 @@ { "name": "rdio-scanner-server", - "version": "4.4.1", + "version": "4.4.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -309,9 +309,9 @@ "dev": true }, "ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -680,9 +680,9 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "bn.js": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz", - "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", + "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==", "dev": true }, "body-parser": { @@ -1816,9 +1816,9 @@ "dev": true }, "eslint": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz", - "integrity": "sha512-QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz", + "integrity": "sha512-1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -1979,9 +1979,9 @@ }, "dependencies": { "estraverse": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz", - "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", "dev": true } } @@ -2826,9 +2826,9 @@ } }, "helmet": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.0.0.tgz", - "integrity": "sha512-HyoRKKHhWhO6+EBfgRLkuZR4/+NXc1nJB7x0bWwW89i9eoPciK0qUqyZNOA/zowpgrW9C4+J5toqMkZrpBOlkg==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.1.0.tgz", + "integrity": "sha512-KWy75fYN8hOG2Rhl8e5B3WhOzb0by1boQum85TiddIE9iu6gV+TXbUjVC17wfej0o/ZUpqB9kxM0NFCZRMzf+Q==" }, "hmac-drbg": { "version": "1.0.1", @@ -3323,9 +3323,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" }, "long": { "version": "4.0.0", @@ -4544,9 +4544,9 @@ "integrity": "sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=" }, "postgres-date": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz", - "integrity": "sha512-pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA==" + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.6.tgz", + "integrity": "sha512-o2a4gxeFcox+CgB3Ig/kNHBP23PiEXHCXx7pcIIsvzoNz4qv+lKTyiSkjOXIMNUl12MO/mOYl2K6wR9X5K6Plg==" }, "postgres-interval": { "version": "1.2.0", diff --git a/server/package.json b/server/package.json index b239276..397c236 100644 --- a/server/package.json +++ b/server/package.json @@ -6,7 +6,7 @@ "dotenv": "^8.2.0", "express": "^4.17.1", "form-data": "^3.0.0", - "helmet": "^4.0.0", + "helmet": "^4.1.0", "mariadb": "^2.4.2", "mime-types": "^2.1.27", "multer": "^1.4.2", @@ -20,7 +20,7 @@ "ws": "^7.3.1" }, "devDependencies": { - "eslint": "^7.6.0", + "eslint": "^7.7.0", "webpack": "^4.44.1", "webpack-cli": "^3.3.12", "webpack-node-externals": "^2.5.1" @@ -39,5 +39,5 @@ "build": "webpack", "start": "nodemon" }, - "version": "4.4.1" + "version": "4.4.2" }