D4Science
/
pep-container-image
generated from gCubeCI/Pipeline-Docker-Template
15
0
Fork 1
Code Issues Pull Requests Projects Wiki Activity

Merge pull request 'Add support for multiple authorization scopes for legacy token; JWT token will use only the first authorized scope defined in config.js' (!1) from antonio.calanducci/pep-container-image:master into master 

Reviewed-on: #1
This commit is contained in:
Andrea Dell'Amico 2024-05-22 10:42:08 +02:00
parent 29ae2314e2 1c033b0443
commit efdb169c10
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/config.js
View File

@ -3,8 +3,9 @@ export default { config };
var config = { var config = {
"pep_credentials" : "pep_credentials", "pep_credentials" : "pep_credentials",
"debug": true, "debug": true,
"legacy": true,
"accounting": { "accounting": {
"scope": "authorized_scope", "scopes": ["authorized_scope1", "authorizeed_scope2"],
"service_name": "docker_stack_name", "service_name": "docker_stack_name",
"host": "service_hostname" "host": "service_hostname"
}, },

3
src/nginx.conf
View File

@ -21,7 +21,8 @@ http {
js_import pep.js; js_import pep.js;
# added to bind enforce function # added to bind enforce function
js_set $authorization pep.enforce_legacy; # it seems it's not used anywhere
# js_set $authorization pep.enforce_legacy;
include /etc/nginx/mime.types; include /etc/nginx/mime.types;
default_type application/octet-stream; default_type application/octet-stream;

4
src/pep.js
View File

@ -39,7 +39,7 @@ function enforce_legacy(r) {
} }
debug(context, JSON.stringify(context.config["accounting"], null, 2)); debug(context, JSON.stringify(context.config["accounting"], null, 2));
var allowedcontexts = [context.config["accounting"]["scope"]] var allowedcontexts = context.config["accounting"]["scopes"]
log(context, "Inside NJS enforce for " + r.method + " @ " + r.headersIn.host + "/" + r.uri) log(context, "Inside NJS enforce for " + r.method + " @ " + r.headersIn.host + "/" + r.uri)
debug(context, "debug is " + JSON.stringify(defaultExport["config"])) debug(context, "debug is " + JSON.stringify(defaultExport["config"]))
const token = getGCubeToken(context) const token = getGCubeToken(context)
@ -456,7 +456,7 @@ function buildAccountingRecord(context) {
"serviceName": defaultExport["accounting"]["service_name"], "serviceName": defaultExport["accounting"]["service_name"],
"duration": 0, "duration": 0,
"maxInvocationTime": 0, "maxInvocationTime": 0,
"scope": defaultExport["accounting"]["scope"], "scope": defaultExport["accounting"]["scopes"][0], // qui va cambiato per capire quale è lo scope corretto dell'utente, al momento viene preso il primo
"host": defaultExport["accounting"]["host"], "host": defaultExport["accounting"]["host"],
"startTime": t, "startTime": t,
"id": uuid(), "id": uuid(),