RESTful Forward Rule: Replace Target Base URL and Keycloak Server ID …

…by Web Application name #1924
dcm4che · Apr 15, 2019 · 81b7f40 · 81b7f40
1 parent 8c5b17d
commit 81b7f40
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/dcm4chee-arc-rs-client/src/main/java/org/dcm4chee/arc/rs/client/RSForward.java b/dcm4chee-arc-rs-client/src/main/java/org/dcm4chee/arc/rs/client/RSForward.java
@@ -89,21 +89,23 @@ public void forward(
         arcAE.findRSForwardRules(rsOp, request).forEach(rule -> {
             try {
                 WebApplication webApplication = iWebAppCache.findWebApplication(rule.getWebAppName());
-                String serviceURL = webApplication.getServiceURL().toString();
-                String targetURI = serviceURL + (serviceURL.endsWith("rs/") ? "" : "/") + appendURI;
-                if (!targetURI.equals(request.getRequestURL().toString())) {
-                    if (rsOp == RSOperation.CreatePatient)
-                        targetURI += patientID;
-                    rsClient.scheduleRequest(
-                            getMethod(rsOp),
-                            targetURI,
-                            in,
-                            webApplication.getKeycloakClientID(),
-                            rule.isTlsAllowAnyHostname(),
-                            rule.isTlsDisableTrustManager());
-                    LOG.info("Forwarded {} {} from {}@{} using RSForward rule {} to device {}. Target URL is {}",
-                            request.getMethod(), request.getRequestURI(), request.getRemoteUser(),
-                            request.getRemoteHost(), rule, webApplication.getDevice().getDeviceName(), targetURI);
+                if (webApplication.containsServiceClass(WebApplication.ServiceClass.DCM4CHEE_ARC_AET)) {
+                    String serviceURL = webApplication.getServiceURL().toString();
+                    String targetURI = serviceURL + (serviceURL.endsWith("rs/") ? "" : "/") + appendURI;
+                    if (!targetURI.equals(request.getRequestURL().toString())) {
+                        if (rsOp == RSOperation.CreatePatient)
+                            targetURI += patientID;
+                        rsClient.scheduleRequest(
+                                getMethod(rsOp),
+                                targetURI,
+                                in,
+                                webApplication.getKeycloakClientID(),
+                                rule.isTlsAllowAnyHostname(),
+                                rule.isTlsDisableTrustManager());
+                        LOG.info("Forwarded RSOperation {} {} {} from {}@{} using RSForward rule {} to device {}. Target URL is {}",
+                                rsOp, request.getMethod(), request.getRequestURI(), request.getRemoteUser(),
+                                request.getRemoteHost(), rule, webApplication.getDevice().getDeviceName(), targetURI);
+                    }
                 }
             } catch (Exception e) {
                 LOG.warn("Failed to apply RSForwardRule {} to {} {} from {}@{} for RSOperation {} :\n",