From 91e0ff6afc3ff15c06ad9d9e10dc7d714dc3513c Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Sat, 9 Nov 2024 23:43:35 +0100
Subject: [PATCH] auth: eliminates IA2-User -> VlkbUser type converter
---
.../webapi => BACKUP/auth}/IA2TokenConvFilter.java | 0
.../servlet/src/main/java/auth/authz/AuthPolicy.java | 9 +++++----
.../src/main/webapp/WEB-INF/web-cutout-ia2token.xml | 10 ----------
3 files changed, 5 insertions(+), 14 deletions(-)
rename data-access/{servlet/src/main/java/auth/oidc/webapi => BACKUP/auth}/IA2TokenConvFilter.java (100%)
diff --git a/data-access/servlet/src/main/java/auth/oidc/webapi/IA2TokenConvFilter.java b/data-access/BACKUP/auth/IA2TokenConvFilter.java
similarity index 100%
rename from data-access/servlet/src/main/java/auth/oidc/webapi/IA2TokenConvFilter.java
rename to data-access/BACKUP/auth/IA2TokenConvFilter.java
diff --git a/data-access/servlet/src/main/java/auth/authz/AuthPolicy.java b/data-access/servlet/src/main/java/auth/authz/AuthPolicy.java
index dc37a64..1c5efc1 100644
--- a/data-access/servlet/src/main/java/auth/authz/AuthPolicy.java
+++ b/data-access/servlet/src/main/java/auth/authz/AuthPolicy.java
@@ -71,12 +71,13 @@ public class AuthPolicy
}
else
{
- if(principal instanceof VlkbUser)
+ if(principal instanceof it.inaf.ia2.aa.data.User)
{
- VlkbUser vlkbUser = (VlkbUser) principal;
+ it.inaf.ia2.aa.data.User vlkbUser = (it.inaf.ia2.aa.data.User) principal;
- userName = vlkbUser.getName();
- userGroups = vlkbUser.getGroupsAsArray();
+ userName = vlkbUser.getName();
+ List<String> groups = vlkbUser.getGroups();
+ userGroups = groups.toArray(new String[0]);
userGroupsValid = true;
access = Access.PUBLIC_AND_AUTHORIZED_PRIVATE;
diff --git a/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml b/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml
index 9bd042b..b14435c 100644
--- a/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml
+++ b/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml
@@ -21,16 +21,6 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <filter>
- <filter-name>UserTypeConverter</filter-name>
- <filter-class>IA2TokenConvFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>UserTypeConverter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
<filter>
<filter-name>AuthZFilter</filter-name>
<filter-class>AuthZFilter</filter-class>
--
GitLab