From 3b058ee74dd7e011d01f280fa103f7a17faff060 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 12 Feb 2024 11:13:38 +0200 Subject: [PATCH] [ develop | DONE | CHANGED] Cache: update isAllowed Method, correct https check, decode urls before check --- services/cache/mecache/cache.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/cache/mecache/cache.js b/services/cache/mecache/cache.js index 3a785991..5a93e89b 100644 --- a/services/cache/mecache/cache.js +++ b/services/cache/mecache/cache.js @@ -57,7 +57,7 @@ let cache = () => { const end = histogram.startTimer({scheme: scheme, target: target, cache: 'miss'}); res.sendResponse = res.send; res.send = (body) => { - if(isAllowedToBeCached(scheme, target)) { + if(isAllowedToBeCached(decodeURI(scheme), decodeURI(target))) { let alreadyCached = lruCache.has(key); entries.set(lruCache.size); if (!alreadyCached) { @@ -85,9 +85,9 @@ let cache = () => { }; function isAllowedToBeCached(scheme, target){ if(environment != "development"){ - return scheme.indexOf("https%3A%2F%2F")!=-1 && ( target.indexOf(".openaire.eu%2F") !=-1 || target.indexOf(".zenodo.org%2Fapi%2F") !=-1 || target.indexOf("lab.idiap.ch%2Fenermaps" != -1)) + return scheme.indexOf("https")!=-1 && ( target.indexOf(".openaire.eu/") !=-1 || target.indexOf(".zenodo.org/api/") !=-1 || target.indexOf("lab.idiap.ch/enermaps" != -1)) } else if(environment == "development"){ - return target.indexOf(".openaire.eu%2F") !=-1 || target.indexOf(".di.uoa.gr") !=-1 || target.indexOf("dev-openaire.d4science.org") !=-1 || target.indexOf("lab.idiap.ch%2Fenermaps") != -1 + return target.indexOf(".openaire.eu/") !=-1 || target.indexOf(".di.uoa.gr") !=-1 || target.indexOf("dev-openaire.d4science.org") !=-1 || target.indexOf("lab.idiap.ch/enermaps") != -1 } return true; }