Skip to content

fix(db): parameterize Kingbase get_tables/get_fields queries (CWE-89) #1298

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

Open
sebastionoss wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(db): parameterize Kingbase get_tables/get_fields queries (CWE-89) #1298

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
4 changes: 2 additions & 2 deletions backend/apps/db/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ def get_tables(ds: CoreDatasource):
return res_list
elif equals_ignore_case(ds.type, 'kingbase'):
with get_driver_connection(ds) as conn, conn.cursor() as cursor:
cursor.execute(sql.format(sql_param))
cursor.execute(sql, (sql_param,))
res = cursor.fetchall()
res_list = [TableSchema(*item) for item in res]
return res_list
Expand Down Expand Up @@ -577,7 +577,7 @@ def get_fields(ds: CoreDatasource, table_name: str = None):
return res_list
elif equals_ignore_case(ds.type, 'kingbase'):
with get_driver_pool(ds).connection() as conn, conn.cursor() as cursor:
cursor.execute(sql.format(p1, p2))
cursor.execute(sql, (p1, p2) if p2 is not None and p2 != "" else (p1,))
res = cursor.fetchall()
res_list = [ColumnSchema(*item) for item in res]
return res_list
Expand Down
6 changes: 3 additions & 3 deletions backend/apps/db/db_sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def get_table_sql(ds: CoreDatasource, conf: DatasourceConf, db_version: str = ''
pg_namespace n ON n.oid = c.relnamespace
LEFT JOIN
pg_description d ON d.objoid = c.oid AND d.objsubid = 0
WHERE n.nspname = '{0}'
WHERE n.nspname = %s
AND c.relkind IN ('r', 'v', 'p', 'm')
AND c.relname NOT LIKE 'pg_%'
AND c.relname NOT LIKE 'sql_%'
Expand Down Expand Up @@ -308,11 +308,11 @@ def get_field_sql(ds: CoreDatasource, conf: DatasourceConf, table_name: str = No
pg_catalog.pg_class c ON a.attrelid = c.oid
JOIN
pg_catalog.pg_namespace n ON n.oid = c.relnamespace
WHERE n.nspname = '{0}'
WHERE n.nspname = %s
AND a.attnum > 0
AND NOT a.attisdropped \
"""
sql2 = " AND c.relname = '{1}'" if table_name is not None and table_name != "" else ""
sql2 = " AND c.relname = %s" if table_name is not None and table_name != "" else ""
return sql1 + sql2, conf.dbSchema, table_name
elif equals_ignore_case(ds.type, "es"):
return "", None, None
Expand Down
Loading