From 909d1d2a2a86b7b6a709b7220737e5cfc390c7d9 Mon Sep 17 00:00:00 2001
From: Fabien Forestier <fforestier@MacBookAir.local>
Date: Wed, 2 Sep 2020 13:06:10 +0200
Subject: [PATCH] Use startsWith instead of === to detect if the user has
rights on a particular layer
---
helpers/userAccesses.helpers.js | 46 +++++++-----
package-lock.json | 122 ++++++++++++++++----------------
package.json | 2 +-
3 files changed, 92 insertions(+), 78 deletions(-)
diff --git a/helpers/userAccesses.helpers.js b/helpers/userAccesses.helpers.js
index 61ddfdf..39f136e 100644
--- a/helpers/userAccesses.helpers.js
+++ b/helpers/userAccesses.helpers.js
@@ -1,31 +1,45 @@
const axios = require('axios');
-module.exports.validateUserAccesses = async (legacyAuthMiddlewareUrl, headers, pathToLayer, service) => {
+module.exports.validateUserAccesses = async (
+ legacyAuthMiddlewareUrl,
+ headers,
+ pathToLayer,
+ service
+) => {
const options = {};
if (headers.cookie) {
options.Cookie = headers.cookie;
}
- if(headers["x-xsrf-token"]) {
- options["x-xsrf-token"] = headers['x-xsrf-token'];
+ if (headers['x-xsrf-token']) {
+ options['x-xsrf-token'] = headers['x-xsrf-token'];
}
- const response = await axios.get(`${legacyAuthMiddlewareUrl}/user/resources`, {
- headers: options,
- }).catch((err) => {
- throw {
- err,
- status: err.response.status,
- message: "Request to Legacy Auth Middleware failed",
- };
- });
+ const response = await axios
+ .get(`${legacyAuthMiddlewareUrl}/user/resources`, {
+ headers: options,
+ })
+ .catch((err) => {
+ throw {
+ err,
+ status: err.response.status,
+ message: 'Request to Legacy Auth Middleware failed',
+ };
+ });
- if (response.data &&
- response.data.length > 0 &&
- response.data.find(e => e.urlPattern === pathToLayer && e.serviceName === service && new Date(e.validUntil) > new Date())) {
+ if (
+ response.data &&
+ response.data.length > 0 &&
+ response.data.find(
+ (e) =>
+ pathToLayer.startsWith(e.urlPattern) &&
+ e.serviceName === service &&
+ new Date(e.validUntil) > new Date()
+ )
+ ) {
return true;
}
return false;
-}
\ No newline at end of file
+};
diff --git a/package-lock.json b/package-lock.json
index 0f390b2..0bb92d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "query-proxy",
- "version": "2.0.0",
+ "version": "2.1.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -9,7 +9,7 @@
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
"integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
"requires": {
- "mime-types": "~2.1.24",
+ "mime-types": "2.1.26",
"negotiator": "0.6.2"
}
},
@@ -24,7 +24,7 @@
"integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
"requires": {
"follow-redirects": "1.5.10",
- "is-buffer": "^2.0.2"
+ "is-buffer": "2.0.4"
},
"dependencies": {
"debug": {
@@ -40,7 +40,7 @@
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
"requires": {
- "debug": "=3.1.0"
+ "debug": "3.1.0"
}
},
"ms": {
@@ -56,15 +56,15 @@
"integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
"requires": {
"bytes": "3.1.0",
- "content-type": "~1.0.4",
+ "content-type": "1.0.4",
"debug": "2.6.9",
- "depd": "~1.1.2",
+ "depd": "1.1.2",
"http-errors": "1.7.2",
"iconv-lite": "0.4.24",
- "on-finished": "~2.3.0",
+ "on-finished": "2.3.0",
"qs": "6.7.0",
"raw-body": "2.4.0",
- "type-is": "~1.6.17"
+ "type-is": "1.6.18"
},
"dependencies": {
"debug": {
@@ -129,7 +129,7 @@
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.2"
}
},
"denque": {
@@ -177,36 +177,36 @@
"resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
"integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
"requires": {
- "accepts": "~1.3.7",
+ "accepts": "1.3.7",
"array-flatten": "1.1.1",
"body-parser": "1.19.0",
"content-disposition": "0.5.3",
- "content-type": "~1.0.4",
+ "content-type": "1.0.4",
"cookie": "0.4.0",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
- "depd": "~1.1.2",
- "encodeurl": "~1.0.2",
- "escape-html": "~1.0.3",
- "etag": "~1.8.1",
- "finalhandler": "~1.1.2",
+ "depd": "1.1.2",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "etag": "1.8.1",
+ "finalhandler": "1.1.2",
"fresh": "0.5.2",
"merge-descriptors": "1.0.1",
- "methods": "~1.1.2",
- "on-finished": "~2.3.0",
- "parseurl": "~1.3.3",
+ "methods": "1.1.2",
+ "on-finished": "2.3.0",
+ "parseurl": "1.3.3",
"path-to-regexp": "0.1.7",
- "proxy-addr": "~2.0.5",
+ "proxy-addr": "2.0.6",
"qs": "6.7.0",
- "range-parser": "~1.2.1",
+ "range-parser": "1.2.1",
"safe-buffer": "5.1.2",
"send": "0.17.1",
"serve-static": "1.14.1",
"setprototypeof": "1.1.1",
- "statuses": "~1.5.0",
- "type-is": "~1.6.18",
+ "statuses": "1.5.0",
+ "type-is": "1.6.18",
"utils-merge": "1.0.1",
- "vary": "~1.1.2"
+ "vary": "1.1.2"
},
"dependencies": {
"debug": {
@@ -230,12 +230,12 @@
"integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
"requires": {
"debug": "2.6.9",
- "encodeurl": "~1.0.2",
- "escape-html": "~1.0.3",
- "on-finished": "~2.3.0",
- "parseurl": "~1.3.3",
- "statuses": "~1.5.0",
- "unpipe": "~1.0.0"
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "on-finished": "2.3.0",
+ "parseurl": "1.3.3",
+ "statuses": "1.5.0",
+ "unpipe": "1.0.0"
},
"dependencies": {
"debug": {
@@ -258,7 +258,7 @@
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
"integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
"requires": {
- "debug": "^3.0.0"
+ "debug": "3.2.6"
}
},
"forwarded": {
@@ -276,10 +276,10 @@
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
"integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
"requires": {
- "depd": "~1.1.2",
+ "depd": "1.1.2",
"inherits": "2.0.3",
"setprototypeof": "1.1.1",
- "statuses": ">= 1.5.0 < 2",
+ "statuses": "1.5.0",
"toidentifier": "1.0.0"
}
},
@@ -288,9 +288,9 @@
"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
"integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
"requires": {
- "eventemitter3": "^4.0.0",
- "follow-redirects": "^1.0.0",
- "requires-port": "^1.0.0"
+ "eventemitter3": "4.0.0",
+ "follow-redirects": "1.9.0",
+ "requires-port": "1.0.0"
}
},
"iconv-lite": {
@@ -298,7 +298,7 @@
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"requires": {
- "safer-buffer": ">= 2.1.2 < 3"
+ "safer-buffer": "2.1.2"
}
},
"inherits": {
@@ -311,15 +311,15 @@
"resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.14.1.tgz",
"integrity": "sha512-94W+X//GHM+1GJvDk6JPc+8qlM7Dul+9K+lg3/aHixPN7ZGkW6qlvX0DG6At9hWtH2v3B32myfZqWoANUJYGJA==",
"requires": {
- "cluster-key-slot": "^1.1.0",
- "debug": "^4.1.1",
- "denque": "^1.1.0",
- "lodash.defaults": "^4.2.0",
- "lodash.flatten": "^4.4.0",
+ "cluster-key-slot": "1.1.0",
+ "debug": "4.1.1",
+ "denque": "1.4.1",
+ "lodash.defaults": "4.2.0",
+ "lodash.flatten": "4.4.0",
"redis-commands": "1.5.0",
- "redis-errors": "^1.2.0",
- "redis-parser": "^3.0.0",
- "standard-as-callback": "^2.0.1"
+ "redis-errors": "1.2.0",
+ "redis-parser": "3.0.0",
+ "standard-as-callback": "2.0.1"
},
"dependencies": {
"debug": {
@@ -327,7 +327,7 @@
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.2"
}
}
}
@@ -418,7 +418,7 @@
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
"integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
"requires": {
- "forwarded": "~0.1.2",
+ "forwarded": "0.1.2",
"ipaddr.js": "1.9.1"
}
},
@@ -458,7 +458,7 @@
"resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
"integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=",
"requires": {
- "redis-errors": "^1.0.0"
+ "redis-errors": "1.2.0"
}
},
"requires-port": {
@@ -482,18 +482,18 @@
"integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
"requires": {
"debug": "2.6.9",
- "depd": "~1.1.2",
- "destroy": "~1.0.4",
- "encodeurl": "~1.0.2",
- "escape-html": "~1.0.3",
- "etag": "~1.8.1",
+ "depd": "1.1.2",
+ "destroy": "1.0.4",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "etag": "1.8.1",
"fresh": "0.5.2",
- "http-errors": "~1.7.2",
+ "http-errors": "1.7.2",
"mime": "1.6.0",
"ms": "2.1.1",
- "on-finished": "~2.3.0",
- "range-parser": "~1.2.1",
- "statuses": "~1.5.0"
+ "on-finished": "2.3.0",
+ "range-parser": "1.2.1",
+ "statuses": "1.5.0"
},
"dependencies": {
"debug": {
@@ -523,9 +523,9 @@
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
"integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
"requires": {
- "encodeurl": "~1.0.2",
- "escape-html": "~1.0.3",
- "parseurl": "~1.3.3",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "parseurl": "1.3.3",
"send": "0.17.1"
}
},
@@ -555,7 +555,7 @@
"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
"requires": {
"media-typer": "0.3.0",
- "mime-types": "~2.1.24"
+ "mime-types": "2.1.26"
}
},
"unpipe": {
diff --git a/package.json b/package.json
index fa65b9b..53421a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "query-proxy",
- "version": "2.1.0",
+ "version": "2.1.1",
"description": "",
"main": "index.js",
"scripts": {
--
GitLab