Skip to content

fix(api): Code scanning alerts #254

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
pycook merged 1 commit into from
Nov 6, 2023
Merged

fix(api): Code scanning alerts #254

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
5 changes: 3 additions & 2 deletions cmdb-api/api/lib/cmdb/attribute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ def _get_choice_values_from_other(choice_other):
elif choice_other.get('script'):
try:
x = compile(choice_other['script'], '', "exec")
exec(x)
res = locals()['ChoiceValue']().values() or []
local_ns = {}
exec(x, {}, local_ns)
res = local_ns['ChoiceValue']().values() or []
return [[i, {}] for i in res]
except Exception as e:
current_app.logger.error("get choice values from script: {}".format(e))
Expand Down
7 changes: 4 additions & 3 deletions cmdb-api/api/lib/cmdb/auto_discovery/auto_discovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ def parse_plugin_script(script):
attributes = []
try:
x = compile(script, '', "exec")
exec(x)
unique_key = locals()['AutoDiscovery']().unique_key
attrs = locals()['AutoDiscovery']().attributes() or []
local_ns = {}
exec(x, {}, local_ns)

Check failure

Code scanning / CodeQL

Code injection

This code execution depends on a [user-provided value](1). This code execution depends on a [user-provided value](2).
unique_key = local_ns['AutoDiscovery']().unique_key
attrs = local_ns['AutoDiscovery']().attributes() or []
except Exception as e:
return abort(400, str(e))

Expand Down
5 changes: 3 additions & 2 deletions cmdb-api/api/lib/cmdb/search/ci/db/search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from flask import current_app
from flask_login import current_user
from jinja2 import Template
from sqlalchemy import text

from api.extensions import db
from api.lib.cmdb.cache import AttributeCache
Expand Down Expand Up @@ -312,7 +313,7 @@ def _execute_sql(self, query_sql):
start = time.time()
execute = db.session.execute
# current_app.logger.debug(v_query_sql)
res = execute(v_query_sql).fetchall()
res = execute(text(v_query_sql)).fetchall()

Check failure

Code scanning / CodeQL

SQL query built from user-controlled sources

This SQL query depends on a [user-provided value](1). This SQL query depends on a [user-provided value](2). This SQL query depends on a [user-provided value](3). This SQL query depends on a [user-provided value](4).
end_time = time.time()
current_app.logger.debug("query ci ids time is: {0}".format(end_time - start))

Expand Down Expand Up @@ -525,7 +526,7 @@ def _facet_build(self):
if k:
table_name = TableMap(attr=attr).table_name
query_sql = FACET_QUERY.format(table_name, self.query_sql, attr.id)
result = db.session.execute(query_sql).fetchall()
result = db.session.execute(text(query_sql)).fetchall()

Check failure

Code scanning / CodeQL

SQL query built from user-controlled sources

This SQL query depends on a [user-provided value](1). This SQL query depends on a [user-provided value](2). This SQL query depends on a [user-provided value](3). This SQL query depends on a [user-provided value](4).
facet[k] = result

facet_result = dict()
Expand Down