Merge pull request #73 from ananjaykumar2/modify/pii-access-policy

fixed: null value for ppbNumber
datakaveri · Mar 11, 2024 · b35d7b3 · b35d7b3
2 parents 695bd85 + 8c07729
commit b35d7b3
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 14 deletions.
diff --git a/examples/configs/config-dev.json b/examples/configs/config-dev.json
@@ -23,6 +23,8 @@
     {
       "id": "iudx.rs.proxy.authenticator.AuthenticationVerticle",
       "verticleInstances": 1,
+      "keystore": "",
+      "keystorePassword": "",
       "audience": "",
       "authServerHost": "",
       "jwtIgnoreExpiry": true
@@ -59,7 +61,10 @@
       "verticleInstances": 1,
       "dataBrokerIP": "",
       "dataBrokerPort": 1234,
+      "prodVhost": "",
       "internalVhost": "",
+      "externalVhost": "",
+      "adapterQueryPublishExchange": "",
       "dataBrokerUserName": "",
       "dataBrokerPassword": "",
       "dataBrokerManagementPort": 30042,
@@ -68,13 +73,10 @@
       "handshakeTimeout": 6000,
       "requestedChannelMax": 5,
       "networkRecoveryInterval": 500,
-      "automaticRecoveryEnabled": "",
-      "adapterQueryPublishExchange": "",
-      "adapterQueryReplyQueue": ""
+      "automaticRecoveryEnabled": ""
     },
     {
       "id": "iudx.rs.proxy.optional.consentlogs.ConsentLoggingVerticle",
-      "isWorkerVerticle": true,
       "verticleInstances": 1,
       "certFileName": "",
       "password": ""

diff --git a/src/main/java/iudx/rs/proxy/apiserver/AsyncRestApi.java b/src/main/java/iudx/rs/proxy/apiserver/AsyncRestApi.java
@@ -127,6 +127,8 @@ private Future<Void> logConsentResponse(RoutingContext routingContext) {
                     consentLog = "DATA_DENIED";
                     break;
                 }
+                default:
+                    consentLog = "DATA_DENIED";
             }
             LOGGER.info("response ended : {}", routingContext.response());
             LOGGER.info("consent log : {}", consentLog);
@@ -320,6 +322,8 @@ private void adapterResponseForSearchQuery(RoutingContext context, JsonObject js
         if (isAdexInstance) {
             json.put("ppbNumber", extractPPBNo(authInfo)); // this is exclusive for ADeX deployment.
         }
+
+        LOGGER.debug("publishing async query into rmq :" + json);
         databrokerService.executeAdapterQueryRPC(json, handler -> {
             if (handler.succeeded()) {
                 JsonObject adapterResponse = handler.result();

diff --git a/src/main/java/iudx/rs/proxy/apiserver/ParamsValidator.java b/src/main/java/iudx/rs/proxy/apiserver/ParamsValidator.java
@@ -177,7 +177,8 @@ private Future<Boolean> isValidQueryWithFilters(MultiMap paramsMap) {
     filtersFuture.onComplete(handler -> {
       if (handler.succeeded()) {
         JsonObject catItemJson = filtersFuture.result();
-        List<String> filters = new ArrayList<>(catItemJson.getJsonArray("iudxResourceAPIs").getList());
+        LOGGER.debug("for filters:: "+catItemJson);
+        List<String> filters = new ArrayList<>(catItemJson.getJsonArray("iudxResourceAPIs",new JsonArray()).getList());
         if (isTemporalQuery(paramsMap) && !filters.contains("TEMPORAL")) {
           promise.fail("Temporal parameters are not supported by RS group/Item.");
           return;

diff --git a/src/main/java/iudx/rs/proxy/apiserver/handlers/AuthHandler.java b/src/main/java/iudx/rs/proxy/apiserver/handlers/AuthHandler.java
@@ -80,9 +80,14 @@ public void handle(RoutingContext context) {
 
         LOGGER.debug("Info :" + context.request().path());
         String id = getId(context, ID);
+        LOGGER.debug("ID : {}", id);
+
         if (isAdexInstance) {
-            String ppbNumber = getId(context, NGSLILDQUERY_Q);
-            authInfo.put(PPB_NUMBER, ppbNumber);
+            String  ppbNumber = getId(context, NGSLILDQUERY_Q);
+            LOGGER.debug("ppbNumber :{}", ppbNumber);
+             if(ppbNumber!=null){
+                 authInfo.put(PPB_NUMBER, ppbNumber);
+             }
         }
 
         authInfo.put(ID, id);
@@ -91,6 +96,7 @@ public void handle(RoutingContext context) {
         for (String i : idArray) {
             ids.add(i);
         }
+        LOGGER.debug("authInfo: "+authInfo);
         requestJson.put(IDS, ids);
         authenticator.tokenIntrospect(
                 requestJson,
@@ -162,7 +168,7 @@ private String getId(RoutingContext context, String option) {
 
     private String getId4rmRequest(String option) {
         if (option.equalsIgnoreCase(NGSLILDQUERY_Q)) {
-            String ppbnoValue = null;
+            String ppbnoValue = "";
             try {
                 ppbnoValue = extractPpbno(request.getParam(option));
 
@@ -177,7 +183,7 @@ private String getId4rmRequest(String option) {
     private String getId4rmBody(RoutingContext context, String option) {
         JsonObject body = context.body().asJsonObject();
         if (option.equalsIgnoreCase(NGSLILDQUERY_Q) && body != null) {
-            String ppbnoValue = null;
+            String ppbnoValue = "";
             try {
                 ppbnoValue = extractPpbno(body.getString(NGSLILDQUERY_Q));
 
@@ -201,11 +207,18 @@ private String getId4rmBody(RoutingContext context, String option) {
 
     private String extractPpbno(String q) {
         LOGGER.info("q: " + q);
-        int PpbIndex = q.indexOf("Ppbno==");
-        int firstSemiIndex = q.indexOf(';', PpbIndex);
-        firstSemiIndex = firstSemiIndex == -1 ? q.length() : firstSemiIndex;
-        String ppbno = q.substring(PpbIndex + 7, firstSemiIndex);
-        return ppbno;
+        try{
+            int PpbIndex = q.indexOf("Ppbno==");
+            int firstSemiIndex = q.indexOf(';', PpbIndex);
+            firstSemiIndex = firstSemiIndex == -1 ? q.length() : firstSemiIndex;
+            String ppbno = q.substring(PpbIndex + 7, firstSemiIndex);
+            LOGGER.debug("ppbno:: "+ppbno);
+            return ppbno;
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+
     }