Commit 75bed9b3 by Jason Song Committed by GitHub

Merge pull request #504 from lepdou/bugfix_openapi3

bugfix: UserAccessFilter filter openapi request
parents 26b44e2f 57c7264c
package com.ctrip.framework.apollo.portal.spi.ctrip.filters;
import com.ctrip.framework.apollo.portal.constant.CatEventType;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.base.Strings;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
public class UserAccessFilter implements Filter {
......@@ -30,8 +33,15 @@ public class UserAccessFilter implements Filter {
String requestUri = ((HttpServletRequest) request).getRequestURI();
if (!isStaticResource(requestUri)) {
Tracer.logEvent(CatEventType.USER_ACCESS, userInfoHolder.getUser().getUserId());
try {
if (!isOpenAPIRequest(requestUri) && !isStaticResource(requestUri)) {
UserInfo userInfo = userInfoHolder.getUser();
if (userInfo != null) {
Tracer.logEvent(CatEventType.USER_ACCESS, userInfo.getUserId());
}
}
} catch (Throwable e) {
Tracer.logError("Record user access info error.", e);
}
chain.doFilter(request, response);
......@@ -42,6 +52,10 @@ public class UserAccessFilter implements Filter {
}
private boolean isOpenAPIRequest(String uri) {
return !Strings.isNullOrEmpty(uri) && uri.startsWith("/openapi");
}
private boolean isStaticResource(String uri) {
return !Strings.isNullOrEmpty(uri) && uri.matches(STATIC_RESOURCE_REGEX);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment