Skip to content
This repository has been archived by the owner on Apr 20, 2022. It is now read-only.

fix:issue-103 #106

Closed
wants to merge 1 commit into from
Closed

fix:issue-103 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions core/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ def search_and_save_vul(engine, method_pool_model, method_pool, strategy):
sender="tasks.search_and_save_vul",
vul_meta=method_pool_model,
vul_level=vul_strategy['level'],
hook_strategy_id=strategy.get("strategy").id,
strategy_id=vul_strategy['id'],
vul_stack=stack,
top_stack=source_sign,
Expand Down
19 changes: 10 additions & 9 deletions signals/handlers/vul_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ def parse_taint_position(source_method, vul_meta, taint_value):
return param_names


def save_vul(vul_meta, vul_level, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs):
def save_vul(vul_meta, vul_level, hook_strategy_id, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs):
logger.info(
f'save vul, strategy id: {strategy_id}, from: {"normal" if "replay_id" not in kwargs else "replay"}, id: {vul_meta.id}')
f'save vul, hook strategy id: {hook_strategy_id}, from: {"normal" if "replay_id" not in kwargs else "replay"}, id: {vul_meta.id}')
# 如果是重放请求，且重放请求类型为漏洞验证，更新漏洞状态为
taint_value = kwargs['taint_value']
timestamp = int(time.time())
Expand All @@ -235,7 +235,7 @@ def save_vul(vul_meta, vul_level, strategy_id, vul_stack, top_stack, bottom_stac
taint_position = ''

vul = IastVulnerabilityModel.objects.filter(
strategy_id=strategy_id,
hook_strategy_id=hook_strategy_id,
uri=vul_meta.uri,
http_method=vul_meta.http_method,
agent=vul_meta.agent,
Expand Down Expand Up @@ -267,6 +267,7 @@ def save_vul(vul_meta, vul_level, strategy_id, vul_stack, top_stack, bottom_stac
from dongtai.models.hook_type import HookType
hook_type = HookType.objects.filter(vul_strategy_id=strategy_id).first()
vul = IastVulnerabilityModel.objects.create(
hook_strategy_id=hook_strategy_id,
strategy_id=strategy_id,
# fixme: delete field hook_type
hook_type=hook_type if hook_type else HookType.objects.first(),
Expand Down Expand Up @@ -333,7 +334,7 @@ def create_vul_recheck_task(vul_id, agent, timestamp):
)


def handler_replay_vul(vul_meta, vul_level, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs):
def handler_replay_vul(vul_meta, vul_level, hook_strategy_id, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs):
timestamp = int(time.time())
vul = IastVulnerabilityModel.objects.filter(id=kwargs['relation_id']).first()
logger.info(f'handle vul replay, current strategy:{vul.strategy_id}, target hook_type:{strategy_id}')
Expand All @@ -351,13 +352,13 @@ def handler_replay_vul(vul_meta, vul_level, strategy_id, vul_stack, top_stack, b
update_time=timestamp
)
else:
vul = save_vul(vul_meta, vul_level, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs)
vul = save_vul(vul_meta, vul_level, hook_strategy_id, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs)
create_vul_recheck_task(vul_id=vul.id, agent=vul.agent, timestamp=timestamp)
return vul


@receiver(vul_found)
def handler_vul(vul_meta, vul_level, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs):
def handler_vul(vul_meta, vul_level, hook_strategy_id, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs):
"""
保存漏洞数据
:param vul_meta:
Expand All @@ -378,15 +379,15 @@ def handler_vul(vul_meta, vul_level, strategy_id, vul_stack, top_stack, bottom_s
if replay_type == const.VUL_REPLAY:
kwargs['relation_id'] = relation_id
kwargs['replay_id'] = replay_id
vul = handler_replay_vul(vul_meta, vul_level, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs)
vul = handler_replay_vul(vul_meta, vul_level, hook_strategy_id, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs)
elif replay_type == const.REQUEST_REPLAY:
# 数据包调试数据暂不检测漏洞
vul = None
else:
vul = save_vul(vul_meta, vul_level, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs)
vul = save_vul(vul_meta, vul_level, hook_strategy_id, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs)
create_vul_recheck_task(vul_id=vul.id, agent=vul.agent, timestamp=timestamp)
except Exception as e:
vul = save_vul(vul_meta, vul_level, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs)
vul = save_vul(vul_meta, vul_level, hook_strategy_id, strategy_id, vul_stack, top_stack, bottom_stack, **kwargs)
create_vul_recheck_task(vul_id=vul.id, agent=vul.agent, timestamp=timestamp)

if vul:
Expand Down