Skip to content

Feat ratelimiter server #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mazp99 merged 7 commits into from
Dec 18, 2023
Merged

Feat ratelimiter server #614

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c243df2
fix：日志输出太频繁，修改解析json报错为trace级别
mazp99 Dec 1, 2023
af15cba
refactor：重构了服务端配置存储的方式，以及将匹配方式从for循环改为stream流
mazp99 Dec 1, 2023
e64c18f
feat：添加了dubbo直接调用的黑名单过滤
mazp99 Dec 1, 2023
20c8656
feat：速率限制器
mazp99 Dec 8, 2023
51d792b
refactor： 将stream修改为for循环
mazp99 Dec 13, 2023
84c2911
feat：新增匹配请求头值的黑名单匹配，使用正则匹配
mazp99 Dec 13, 2023
bdfa411
feat：将速率限制改为了服务端获取
mazp99 Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat：添加了dubbo直接调用的黑名单过滤 
之前在请求头添加黑名单请求头来进行标识，现在有需求在中间端进行拉黑，作出了适配
  • Loading branch information
@mazp99
mazp99 committed Dec 1, 2023
commit e64c18f3d2c7072a5ab07a5b10df030775686906
60 changes: 37 additions & 23 deletions ...-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/controller/impl/DubboImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.alibaba.fastjson2.JSONArray;
import io.dongtai.iast.common.config.ConfigBuilder;
import io.dongtai.iast.common.config.ConfigKey;
import io.dongtai.iast.common.config.RequestDenyList;
import io.dongtai.iast.common.string.ObjectFormatResult;
import io.dongtai.iast.core.EngineManager;
import io.dongtai.iast.core.handler.bypass.BlackUrlBypass;
Expand Down Expand Up @@ -97,7 +98,41 @@ public static void collectDubboRequestSource(Object handler, Object invocation,
if (requestMeta == null) {
return;
}
if (null != headers.get(BlackUrlBypass.getHeaderKey()) && headers.get(BlackUrlBypass.getHeaderKey()).equals("true")) {

Map<String, String> sHeaders = new HashMap<String, String>();
if (headers != null) {
for (Map.Entry<String, ?> entry : headers.entrySet()) {
if (entry.getValue() == null) {
continue;
}
sHeaders.put(entry.getKey(), entry.getValue().toString());
}
}

Map<String, String> oldHeaders = (Map<String, String>) requestMeta.get("headers");
sHeaders.putAll(oldHeaders);
requestMeta.put("headers", sHeaders);
if (!sHeaders.isEmpty()) {
String traceIdKey = ContextManager.getHeaderKey();
if (sHeaders.containsKey(traceIdKey)) {
ContextManager.parseTraceId(sHeaders.get(traceIdKey));
} else {
String newTraceId = ContextManager.currentTraceId();
sHeaders.put(traceIdKey, newTraceId);
}
}
//获取采集黑名单配置集合
RequestDenyList requestDenyList = ConfigBuilder.getInstance().get(ConfigKey.REQUEST_DENY_LIST);

//不为空开始进行判断
if (requestDenyList != null){
if (requestDenyList.match(requestMeta.get("requestURL").toString(),sHeaders)) {
BlackUrlBypass.setIsBlackUrl(true);
return;
}
}
//此判断为节点拉黑判断
if (null != sHeaders.get(BlackUrlBypass.getHeaderKey()) && sHeaders.get(BlackUrlBypass.getHeaderKey()).equals("true")) {
BlackUrlBypass.setIsBlackUrl(true);
return;
}
Expand Down Expand Up @@ -135,30 +170,10 @@ public static void collectDubboRequestSource(Object handler, Object invocation,
SourceNode sourceNode = new SourceNode(src, tgt, null);
TaintPoolUtils.trackObject(event, sourceNode, arguments, 0, true);

Map<String, String> sHeaders = new HashMap<String, String>();
if (headers != null) {
for (Map.Entry<String, ?> entry : headers.entrySet()) {
if (entry.getValue() == null) {
continue;
}
sHeaders.put(entry.getKey(), entry.getValue().toString());
}
}


// if (handler.toString().startsWith("hessian")) {
Map<String, String> oldHeaders = (Map<String, String>) requestMeta.get("headers");
sHeaders.putAll(oldHeaders);
// }

if (!sHeaders.isEmpty()) {
String traceIdKey = ContextManager.getHeaderKey();
if (sHeaders.containsKey(traceIdKey)) {
ContextManager.parseTraceId(sHeaders.get(traceIdKey));
} else {
String newTraceId = ContextManager.currentTraceId();
sHeaders.put(traceIdKey, newTraceId);
}
}

if (event.getTargetHashes().isEmpty()) {
return;
Expand All @@ -175,7 +190,6 @@ public static void collectDubboRequestSource(Object handler, Object invocation,
TaintRanges tr = new TaintRanges(new TaintRange(0, len));
event.targetRanges.add(0, new MethodEvent.MethodEventTargetRange(hash, tr));

requestMeta.put("headers", sHeaders);
JSONArray arr = new JSONArray();
for (Object arg : arguments) {
// 2023-9-5 11:31:53 直接拿完整的string可能会OOM（排队上报时可能会挤压占用较多的内存），这里只传递format之后的
Expand Down