summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main
diff options
context:
space:
mode:
authorvempo <vitaliy.emporopulo@amdocs.com>2018-04-04 15:59:32 +0300
committerOren Kleks <orenkle@amdocs.com>2018-04-08 04:51:30 +0000
commit14345a8e2cb17d002bcea294130ac9fb64b6b83e (patch)
tree9d87800ab351d53259367c13404f74b07f3ddc13 /openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main
parent6040ee42d045f4dfaaf29a4cdd9ed93c6f20cff9 (diff)
Fixed proxy instead of resource type in audit
Change-Id: I1b3c22105f27e9d3dee0947815d32eb453a56831 Issue-ID: SDC-1190 Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main')
-rw-r--r--openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/jaxrs/LoggingRequestFilter.java62
1 files changed, 61 insertions, 1 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/jaxrs/LoggingRequestFilter.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/jaxrs/LoggingRequestFilter.java
index 06660f35f4..498587414a 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/jaxrs/LoggingRequestFilter.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/jaxrs/LoggingRequestFilter.java
@@ -19,6 +19,8 @@ package org.openecomp.sdc.logging.servlet.jaxrs;
import static org.openecomp.sdc.logging.LoggingConstants.DEFAULT_PARTNER_NAME_HEADER;
import static org.openecomp.sdc.logging.LoggingConstants.DEFAULT_REQUEST_ID_HEADER;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
import java.util.UUID;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
@@ -26,6 +28,8 @@ import javax.ws.rs.container.ResourceInfo;
import javax.ws.rs.core.Context;
import javax.ws.rs.ext.Provider;
import org.openecomp.sdc.logging.api.ContextData;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
import org.openecomp.sdc.logging.api.LoggingContext;
import org.openecomp.sdc.logging.servlet.HttpHeader;
@@ -60,6 +64,8 @@ public class LoggingRequestFilter implements ContainerRequestFilter {
static final String START_TIME_KEY = "audit.start.time";
+ private static final Logger LOGGER = LoggerFactory.getLogger(LoggingRequestFilter.class);
+
private ResourceInfo resource;
private HttpHeader requestIdHeader = new HttpHeader(DEFAULT_REQUEST_ID_HEADER);
@@ -79,6 +85,7 @@ public class LoggingRequestFilter implements ContainerRequestFilter {
* Configuration parameter for request ID HTTP header.
*/
public void setRequestIdHeaders(String requestIdHeaders) {
+ LOGGER.debug("Valid request ID headers: {}", requestIdHeaders);
this.requestIdHeader = new HttpHeader(requestIdHeaders.split(MULTI_VALUE_SEPARATOR));
}
@@ -86,6 +93,7 @@ public class LoggingRequestFilter implements ContainerRequestFilter {
* Configuration parameter for partner name HTTP header.
*/
public void setPartnerNameHeaders(String partnerNameHeaders) {
+ LOGGER.debug("Valid partner name headers: {}", partnerNameHeaders);
this.partnerNameHeader = new HttpHeader(partnerNameHeaders.split(MULTI_VALUE_SEPARATOR));
}
@@ -95,6 +103,12 @@ public class LoggingRequestFilter implements ContainerRequestFilter {
if (resource == null) {
// JAX-RS could not find a mapping this response, probably due to HTTP 404 (not found),
// 405 (method not allowed), 415 (unsupported media type), etc. with a message in Web server log
+
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("No matching resource was found for URI '{}' and method '{}'",
+ containerRequestContext.getUriInfo().getPath(), containerRequestContext.getMethod());
+ }
+
return;
}
@@ -103,7 +117,7 @@ public class LoggingRequestFilter implements ContainerRequestFilter {
LoggingContext.clear();
ContextData.ContextDataBuilder contextData = ContextData.builder();
- contextData.serviceName(resource.getResourceClass().getName() + "." + resource.getResourceMethod().getName());
+ contextData.serviceName(getServiceName());
String partnerName = partnerNameHeader.getAny(containerRequestContext::getHeaderString);
if (partnerName != null) {
@@ -115,4 +129,50 @@ public class LoggingRequestFilter implements ContainerRequestFilter {
LoggingContext.put(contextData.build());
}
+
+ private String getServiceName() {
+
+ Class<?> resourceClass = resource.getResourceClass();
+ Method resourceMethod = resource.getResourceMethod();
+
+ if (Proxy.isProxyClass(resourceClass)) {
+ LOGGER.debug("Proxy class injected for JAX-RS resource");
+ return getServiceNameFromJavaProxy(resourceClass, resourceMethod);
+ }
+
+ return formatServiceName(resourceClass, resourceMethod);
+ }
+
+ private String getServiceNameFromJavaProxy(Class<?> proxyType, Method resourceMethod) {
+
+ for (Class<?> interfaceType : proxyType.getInterfaces()) {
+
+ if (isMatchingInterface(interfaceType, resourceMethod)) {
+ return formatServiceName(interfaceType, resourceMethod);
+ }
+ }
+
+ LOGGER.debug("Failed to find method '{}' in interfaces implemented by injected Java proxy", resourceMethod);
+ return formatServiceName(proxyType, resourceMethod);
+ }
+
+ private String formatServiceName(Class<?> resourceClass, Method resourceMethod) {
+ return resourceClass.getName() + "#" + resourceMethod.getName();
+ }
+
+ private boolean isMatchingInterface(Class<?> candidateType, Method requestedMethod) {
+
+ try {
+
+ Method candidate = candidateType.getDeclaredMethod(requestedMethod.getName(),
+ requestedMethod.getParameterTypes());
+ return candidate != null;
+
+ } catch (NoSuchMethodException ignored) {
+ // ignore and move on to the next
+ LOGGER.debug("Failed to find method '{}' in interface '{}'", requestedMethod, candidateType);
+ }
+
+ return false;
+ }
}