From c53e5ecd30a22c145f94edd05f3d6b4b6a07809b Mon Sep 17 00:00:00 2001 From: pycook Date: Wed, 10 Jan 2024 16:52:27 +0800 Subject: [PATCH] fix(api): grant by attr (#373) --- cmdb-api/Pipfile | 4 ++-- cmdb-api/api/views/cmdb/ci_type.py | 2 +- cmdb-api/requirements.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmdb-api/Pipfile b/cmdb-api/Pipfile index 46e4b40..d69b2ff 100644 --- a/cmdb-api/Pipfile +++ b/cmdb-api/Pipfile @@ -5,8 +5,8 @@ name = "pypi" [packages] # Flask -Flask = "==2.3.2" -Werkzeug = ">=2.3.6" +Flask = "==2.2.5" +Werkzeug = "==2.2.3" click = ">=5.0" # Api Flask-RESTful = "==0.3.10" diff --git a/cmdb-api/api/views/cmdb/ci_type.py b/cmdb-api/api/views/cmdb/ci_type.py index 65dadcc..4eb6150 100644 --- a/cmdb-api/api/views/cmdb/ci_type.py +++ b/cmdb-api/api/views/cmdb/ci_type.py @@ -465,7 +465,7 @@ class CITypeGrantView(APIView): acl.grant_resource_to_role_by_rid(type_name, rid, ResourceTypeEnum.CI_TYPE, perms, rebuild=False) - if request.values.get('ci_filter') or request.values.get('attr_filter'): + if 'ci_filter' in request.values or 'attr_filter' in request.values: CIFilterPermsCRUD().add(type_id=type_id, rid=rid, **request.values) else: from api.tasks.acl import role_rebuild diff --git a/cmdb-api/requirements.txt b/cmdb-api/requirements.txt index 516f93d..c1c0ac6 100644 --- a/cmdb-api/requirements.txt +++ b/cmdb-api/requirements.txt @@ -8,7 +8,7 @@ elasticsearch==7.17.9 email-validator==1.3.1 environs==4.2.0 flasgger==0.9.5 -Flask==2.3.2 +Flask==2.2.5 Flask-Bcrypt==1.0.1 flask-babel==4.0.0 Flask-Caching==2.0.2 @@ -46,7 +46,7 @@ supervisor==4.0.3 timeout-decorator==0.5.0 toposort==1.10 treelib==1.6.1 -Werkzeug>=2.3.6 +Werkzeug==2.2.3 WTForms==3.0.0 shamir~=17.12.0 pycryptodomex>=3.19.0