From 085b979fb416e9c38302a64bfb446fc43a2be802 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Sat, 9 Nov 2024 23:20:51 +0100
Subject: [PATCH] auth: enable more log in AuthPolicy
---
.../src/main/java/auth/authz/AuthPolicy.java | 20 +++++++++----------
.../main/java/auth/authz/AuthPolicyDb.java | 4 ++--
.../java/auth/authz/webapi/AuthZSettings.java | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
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 0471714..dc37a64 100644
--- a/data-access/servlet/src/main/java/auth/authz/AuthPolicy.java
+++ b/data-access/servlet/src/main/java/auth/authz/AuthPolicy.java
@@ -159,7 +159,7 @@ public class AuthPolicy
public String[] filterAuthorized(String[] pubdidArr, String dbConnUrl, String dbUserName, String dbPassword)
{
- this.dbConnUrl = dbConnUrl;
+ //this.dbConnUrl = dbConnUrl;
this.dbUserName = dbUserName;
this.dbPassword = dbPassword;
@@ -169,7 +169,7 @@ public class AuthPolicy
private String[] filterAuthorized(ArrayList<String> pubdidList, String dbConnUrl)
{
- //LOGGER.fine("with List <String> trace");
+ LOGGER.fine("with List <String> trace");
switch(access)
{
case PUBLIC_ONLY :
@@ -191,7 +191,7 @@ public class AuthPolicy
{
LOGGER.fine("trace");
assert pubdids != null;
- //LOGGER.finer("PublisherDID list original : " + String.join(" ", pubdids));
+ LOGGER.finer("PublisherDID list original : " + String.join(" ", pubdids));
List<AuthPolicyDb.PubdidGroups> privateUniqPubdids = db_queryPrivateUniqPubdidGroups(dbConnUrl, pubdids);
List<String> notAuthorizedUniqPubdids = pubdidsNotPublic(privateUniqPubdids, userGroups);
@@ -200,14 +200,14 @@ public class AuthPolicy
removeNotAuthorized(pubdids, notAuthorizedUniqPubdids);
- //LOGGER.finest("PublisherDID list filtered : " + (pubdids.isEmpty() ? "" : String.join(" ", pubdids)));
+ LOGGER.finest("PublisherDID list filtered : " + (pubdids.isEmpty() ? "" : String.join(" ", pubdids)));
}
private List<String> pubdidsNotPublic(List<AuthPolicyDb.PubdidGroups> pubdidList, String[] userGroups)
{
LOGGER.fine("trace");
- //LOGGER.finer("userGroups: " + String.join(" ",userGroups));
+ LOGGER.finer("userGroups: " + String.join(" ",userGroups));
List<String> pubdidsNotAuthorizedList = new LinkedList<String>();
ListIterator<AuthPolicyDb.PubdidGroups> it = pubdidList.listIterator();
@@ -216,7 +216,7 @@ public class AuthPolicy
{
AuthPolicyDb.PubdidGroups pubdidGroups = it.next();
- //LOGGER.finest(pubdidGroups.pubdid + " : " + String.join(" ",pubdidGroups.groups));
+ LOGGER.finest(pubdidGroups.pubdid + " : " + String.join(" ",pubdidGroups.groups));
if( true )// isIntersectionEmpty(pubdidGroups.groups, userGroups) )
{
@@ -233,7 +233,7 @@ public class AuthPolicy
{
LOGGER.fine("trace");
assert pubdids != null;
- //LOGGER.finer("PublisherDID list original : " + String.join(" ", pubdids));
+ LOGGER.finer("PublisherDID list original : " + String.join(" ", pubdids));
List<AuthPolicyDb.PubdidGroups> privateUniqPubdids = db_queryPrivateUniqPubdidGroups(dbConnUrl, pubdids);
List<String> notAuthorizedUniqPubdids = pubdidsNotAuthorized(privateUniqPubdids, userGroups);
@@ -242,7 +242,7 @@ public class AuthPolicy
removeNotAuthorized(pubdids, notAuthorizedUniqPubdids);
- //LOGGER.finest("PublisherDID list filtered : " + (pubdids.isEmpty() ? "" : String.join(" ", pubdids)));
+ LOGGER.finest("PublisherDID list filtered : " + (pubdids.isEmpty() ? "" : String.join(" ", pubdids)));
}
@@ -270,7 +270,7 @@ public class AuthPolicy
AuthPolicyDb adb;
synchronized(AuthPolicyDb.class)
{
- AuthPolicyDb.dbConnUrl = this.dbConnUrl;
+ //AuthPolicyDb.dbConnUrl = this.dbConnUrl;
AuthPolicyDb.dbUserName = this.dbUserName;
AuthPolicyDb.dbPassword = this.dbPassword;
@@ -306,7 +306,7 @@ public class AuthPolicy
{
AuthPolicyDb.PubdidGroups pubdidGroups = it.next();
- //LOGGER.finest(pubdidGroups.pubdid + " : " + String.join(" ",pubdidGroups.groups));
+ LOGGER.finest(pubdidGroups.pubdid + " : " + String.join(" ",pubdidGroups.groups));
if( isIntersectionEmpty(pubdidGroups.groups, userGroups) )
{
diff --git a/data-access/servlet/src/main/java/auth/authz/AuthPolicyDb.java b/data-access/servlet/src/main/java/auth/authz/AuthPolicyDb.java
index 8c42103..41f81e5 100644
--- a/data-access/servlet/src/main/java/auth/authz/AuthPolicyDb.java
+++ b/data-access/servlet/src/main/java/auth/authz/AuthPolicyDb.java
@@ -34,7 +34,7 @@ public class AuthPolicyDb
private static final String DB_DRIVER = "org.postgresql.Driver";
private static final Settings settings = Settings.getInstance();
static public Settings.DBConn dbconn = settings.dbConn;
- static public String dbConnUrl;
+// static public String dbConnUrl;
static public String dbUserName;
static public String dbPassword;
@@ -209,7 +209,7 @@ public class AuthPolicyDb
String password = userInfo[1];
String dbConnJdbcUrl = "jdbc:" + dbConnUrl.replace(userInfoString + "@", "");
- // */ LOGGER.finest("DBMS URL: " + dbConnUrl);
+ // LOGGER.finest("DBMS URL: " + dbConnUrl);*/
// LOGGER.finest("DBMS userName: " + dbUserName);
// LOGGER.finest("DBMS password: " + dbPassword);
diff --git a/data-access/servlet/src/main/java/auth/authz/webapi/AuthZSettings.java b/data-access/servlet/src/main/java/auth/authz/webapi/AuthZSettings.java
index ecb811e..4b3b982 100644
--- a/data-access/servlet/src/main/java/auth/authz/webapi/AuthZSettings.java
+++ b/data-access/servlet/src/main/java/auth/authz/webapi/AuthZSettings.java
@@ -77,8 +77,8 @@ class AuthZSettings
LOGGER.fine("trace");
DBConn dbconn = new AuthZSettings.DBConn();
- dbconn.uri = properties.getProperty("db_uri", "jdbc:postgresql://localhost:5432/vialactea").strip();
- dbconn.schema = properties.getProperty("db_schema", "datasets").strip();
+ dbconn.uri = properties.getProperty("db_uri", "").strip();
+ dbconn.schema = properties.getProperty("db_schema", "").strip();
dbconn.user_name = properties.getProperty("db_user_name", "").strip();
dbconn.password = properties.getProperty("db_password", "").strip();
return dbconn;
--
GitLab