From 87f00af3ed99541735fe39a0235a21a4fe3cc77b Mon Sep 17 00:00:00 2001 From: lucio lelii Date: Mon, 7 Mar 2022 11:10:17 +0100 Subject: [PATCH] solved an issue on policy creation --- .../authportletmanager/server/AuthServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java b/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java index d565914..cf4d779 100644 --- a/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java +++ b/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java @@ -425,8 +425,16 @@ implements AuthManagerService { ScopeProvider.instance.set(context); SecurityTokenProvider.instance.set(token); for (PolicyAuth policy: policiesAuth){ - ServiceAccess service=new ServiceAccess(policy.getService().getServiceName(), policy.getService().getServiceClass(), policy.getService().getServiceId()); + + String serviceName = policy.getService().getServiceName().toLowerCase().equals("all")?null:policy.getService().getServiceName(); + String serviceClass = policy.getService().getServiceClass().toLowerCase().equals("all")?null:policy.getService().getServiceClass(); + String serviceId = policy.getService().getServiceId().toLowerCase().equals("all")?null:policy.getService().getServiceId(); + + ServiceAccess service=new ServiceAccess(serviceName, serviceClass, serviceId); + + Action access =Action.valueOf(policy.getAccessString()); + logger.debug("policy translate:"+policy.getCallerTypeAsString()); if (policy.getCallerTypeAsString().equalsIgnoreCase(TypeCaller.user.toString())){ logger.debug("add policy with user"); @@ -441,7 +449,7 @@ implements AuthManagerService { String[] policyService=policy.getCallerAsString().split(":"); String serviceName=policyService[0].trim(); String serviceClass=policyService[1].trim(); - String serviceId="All"; + String serviceId="*"; if (policyService.length==3) serviceId=policy.getCallerAsString().split(":")[2]; ServiceAccess serviceCaller =new ServiceAccess(serviceName, serviceClass, serviceId);