diff options
author | Fiachra Corcoran <fiachra.corcoran@est.tech> | 2022-12-22 08:15:24 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2022-12-22 08:15:24 +0000 |
commit | 495ebf460ae2ca936981e4ed28a11224de69b64e (patch) | |
tree | 2881f80acede7dd8f907c8a42c08d3df180074bf /datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscribeServlet.java | |
parent | 63b13a0cddf45b4cfd1691dd5b95a205af355898 (diff) | |
parent | faf64da8b0307b6c0afa6637617f61c7c48bb8e2 (diff) |
Merge "[DMAAP-DR-PROV] Remove aaf & cadi"2.1.12
Diffstat (limited to 'datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscribeServlet.java')
-rw-r--r-- | datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscribeServlet.java | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscribeServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscribeServlet.java index 2ee58d6e..6faecff5 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscribeServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscribeServlet.java @@ -263,66 +263,6 @@ public class SubscribeServlet extends ProxyServlet { } sub.setFeedid(feedid); sub.setSubscriber(bhdr); // set from X-DMAAP-DR-ON-BEHALF-OF header - /* - * START - AAF changes - * TDP EPIC US# 307413 - * CADI code - check on permissions based on Legacy/AAF users to allow to create/add subscription - */ - String feedAafInstance = feed.getAafInstance(); - String subAafInstance = sub.getAafInstance(); - boolean subAafLegacyEmptyOrNull = (subAafInstance == null - || "".equals(subAafInstance) || "legacy".equalsIgnoreCase(subAafInstance)); - - // This extra check added to verify AAF feed with AAF subscriber having empty aaf instance check - if (feedAafInstance == null || "".equals(feedAafInstance) || "legacy".equalsIgnoreCase(feedAafInstance)) { - if (subAafLegacyEmptyOrNull) { - AuthorizationResponse aresp = authz.decide(req); - if (!aresp.isAuthorized()) { - message = POLICY_ENGINE; - elr.setMessage(message); - elr.setResult(HttpServletResponse.SC_FORBIDDEN); - eventlogger.error(elr.toString()); - sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger); - return; - } - } else { - //If Legacy Feed and AAF instance provided in Subscriber JSON - message = "AAF Subscriber can not be added to legacy Feed- " + feedid; - elr.setMessage(message); - elr.setResult(HttpServletResponse.SC_FORBIDDEN); - eventlogger.error(elr.toString()); - sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger); - return; - } - } else { - //New AAF Requirement to add legacy subscriber to AAF Feed - if (subAafLegacyEmptyOrNull) { - AuthorizationResponse aresp = authz.decide(req); - if (!aresp.isAuthorized()) { - message = POLICY_ENGINE; - elr.setMessage(message); - elr.setResult(HttpServletResponse.SC_FORBIDDEN); - eventlogger.error(elr.toString()); - sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger); - return; - } - } else { - //New AAF Requirement to add subscriber by publisher on publisher approval only - String permission = getSubscriberPermission(subAafInstance, BaseServlet.APPROVE_SUB_PERMISSION); - eventlogger.info("SubscribeServlet.doPost().. Permission String - " + permission); - if (!req.isUserInRole(permission)) { - message = "AAF disallows access to permission - " + permission; - elr.setMessage(message); - elr.setResult(HttpServletResponse.SC_FORBIDDEN); - eventlogger.error(elr.toString()); - sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger); - return; - } - } - } - /* - * END - AAF changes - */ // Check if this subscription already exists; not an error (yet), just warn Subscription sub2 = Subscription.getSubscriptionMatching(sub); if (sub2 != null) { |