Commit 085b979f authored by Robert Butora's avatar Robert Butora
Browse files

auth: enable more log in AuthPolicy

parent ac038433

data-access/servlet/src/main/java/auth/authz/AuthPolicy.java

+10 −10
Original line number Diff line number Diff line
@@ -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) )

         {

data-access/servlet/src/main/java/auth/authz/AuthPolicyDb.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

data-access/servlet/src/main/java/auth/authz/webapi/AuthZSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -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;