Skip to content
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

Jump to bottom

vul_list-change #724

Merged
merged 1 commit into from
Jun 23, 2022
Merged

vul_list-change #724

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
8 changes: 4 additions & 4 deletions dongtai_web/aggr_vul/aggr_vul_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from dongtai_common.models import AGGREGATION_ORDER, LANGUAGE_ID_DICT, SHARE_CONFIG_DICT, APP_LEVEL_RISK, LICENSE_RISK, \
SCA_AVAILABILITY_DICT


logger = logging.getLogger("django")


Expand Down Expand Up @@ -100,14 +99,14 @@ def post(self, request):
query_condition = query_condition + user_auth_info.get("user_condition_str")

if keywords:
query_base = "SELECT DISTINCT(vul.id),vul.*,rel.create_time, " \
query_base = "SELECT DISTINCT(vul.id),vul.*, " \
" MATCH( `vul`.`vul_name`,`vul`.`aql`,`vul`.`vul_serial` ) AGAINST ( %s IN NATURAL LANGUAGE MODE ) AS `score`" \
" from iast_asset_vul_relation as rel " \
"left JOIN iast_asset_vul as vul on rel.asset_vul_id=vul.id " \
"left JOIN iast_asset as asset on rel.asset_id=asset.id " + join_table + query_condition

else:
query_base = "SELECT DISTINCT(vul.id),vul.*,rel.create_time from iast_asset_vul_relation as rel " \
query_base = "SELECT DISTINCT(vul.id),vul.* from iast_asset_vul_relation as rel " \
"left JOIN iast_asset_vul as vul on rel.asset_vul_id=vul.id " \
"left JOIN iast_asset as asset on rel.asset_id=asset.id " + join_table + query_condition

Expand All @@ -124,6 +123,7 @@ def post(self, request):
else:
all_vul = IastAssetVul.objects.raw(query_base + " order by %s limit %s,%s; " % (new_order, begin_num, end_num))
content_list = []

if all_vul:
vul_ids = []
# print(all_vul.query.__str__())
Expand All @@ -148,7 +148,7 @@ def post(self, request):
"license_level": item.license_level,
"license_risk_name": LICENSE_RISK.get(str(item.license_level),"") ,
"vul_cve_nums": item.vul_cve_nums,
"package_name": item.aql,
"package_name": item.package_name,
"package_safe_version": item.package_safe_version,
"package_latest_version": item.package_latest_version,
"package_language": item.package_language,
Expand Down
3 changes: 3 additions & 0 deletions dongtai_web/aggr_vul/app_vul_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ def post(self, request):
status_obj = {}
for tmp_status in status:
status_obj[tmp_status.id] = tmp_status.name
for i in end['data']:
i['status__name'] = status_obj.get(i['status_id'], "")


return R.success(data={
'messages': end['data'],
Expand Down