@@ -191,8 +191,6 @@ def get_bound_application_ids(instance: Dict) -> List[str]:
191191 application_ids .add (str (app_id ))
192192
193193 def collect (node_data ):
194- if node_data .get ("application_id" ):
195- application_ids .add (str (node_data .get ("application_id" )))
196194 for app_id in node_data .get ("application_ids" ) or []:
197195 application_ids .add (str (app_id ))
198196
@@ -275,23 +273,18 @@ def get_authorized_application_ids(user_id: str, workspace_id: str, application_
275273 工作空间管理员默认拥有全部应用权限;其他用户必须在 workspace_user_resource_permission
276274 中存在针对该应用的显式授权记录(默认拒绝)。
277275 """
278- if not application_ids or not user_id :
276+ if not application_ids :
279277 return []
280278 application_ids = list ({str (a ) for a in application_ids })
281- workspace_application_ids = {
282- str (app_id ) for app_id in QuerySet (Application ).filter (
283- id__in = application_ids , workspace_id = workspace_id
284- ).values_list ("id" , flat = True )
285- }
286279 if is_workspace_manage (user_id , workspace_id ):
287- return [ app_id for app_id in application_ids if app_id in workspace_application_ids ]
280+ return application_ids
288281 granted_application_ids = {
289282 str (permission .target )
290283 for permission in QuerySet (WorkspaceUserResourcePermission ).filter (
291284 workspace_id = workspace_id ,
292285 user_id = user_id ,
293286 auth_target_type = AuthTargetType .APPLICATION .value ,
294- target__in = workspace_application_ids ,
287+ target__in = application_ids ,
295288 )
296289 if "VIEW" in permission .permission_list or "ROLE" in permission .permission_list
297290 }
@@ -313,10 +306,6 @@ def validate_bound_tool_permissions(user_id: str, workspace_id: str, instance: D
313306 )
314307 raise AppApiException (403 , str (message ))
315308
316- validate_bound_application_permissions (user_id , workspace_id , instance )
317-
318-
319- def validate_bound_application_permissions (user_id : str , workspace_id : str , instance : Dict ):
320309 application_ids = get_bound_application_ids (instance )
321310 if application_ids :
322311 authorized_application_ids = set (get_authorized_application_ids (user_id , workspace_id , application_ids ))
@@ -331,15 +320,6 @@ def validate_bound_application_permissions(user_id: str, workspace_id: str, inst
331320 raise AppApiException (403 , str (message ))
332321
333322
334- def validate_application_resource_permissions (user_id , application ):
335- """校验实际保存或执行的应用配置;发布后的聊天使用应用所属用户的资源授权。"""
336- validate_bound_tool_permissions (user_id , application .workspace_id , {
337- key : getattr (application , key ) for key in (
338- "work_flow" , "tool_ids" , "skill_tool_ids" , "mcp_tool_ids" , "application_ids"
339- )
340- })
341-
342-
343323def get_base_node_work_flow (work_flow ):
344324 node_list = work_flow .get ("nodes" )
345325 base_node_list = [node for node in node_list if node .get ("id" ) == "base-node" ]
@@ -956,7 +936,6 @@ def insert_simple(self, instance: Dict):
956936 user_id = self .data .get ("user_id" )
957937 workspace_id = self .data .get ("workspace_id" )
958938 ApplicationCreateSerializer .SimplateRequest (data = instance ).is_valid (user_id = user_id , raise_exception = True )
959- validate_bound_tool_permissions (user_id , workspace_id , instance )
960939 application_model = ApplicationCreateSerializer .SimplateRequest .to_application_model (
961940 user_id , workspace_id , instance
962941 )
@@ -989,7 +968,6 @@ def import_(self, instance: dict, is_import_tool, with_valid=True):
989968 except Exception as e :
990969 raise AppApiException (1001 , _ ("Unsupported file format" ))
991970 application = mk_instance .application
992- validate_bound_application_permissions (user_id , workspace_id , application )
993971 tool_list = mk_instance .get_tool_list ()
994972 # 已存在且有权限的工具复用, 无权限或不存在则生成新id新建
995973 update_tool_map , tool_list = resolve_import_tools (tool_list , user_id , workspace_id )
@@ -1355,7 +1333,6 @@ def publish(self, instance, with_valid=True):
13551333 application = (
13561334 QuerySet (Application ).filter (id = self .data .get ("application_id" ), workspace_id = workspace_id ).first ()
13571335 )
1358- validate_application_resource_permissions (user_id , application )
13591336 if application .type == ApplicationTypeChoices .WORK_FLOW :
13601337 work_flow = application .work_flow
13611338 if work_flow is None :
@@ -1615,7 +1592,6 @@ def update_template_workflow(self, instance: Dict, app: Application):
16151592 except Exception as e :
16161593 raise AppApiException (1001 , _ ("Unsupported file format" ))
16171594 application = mk_instance .application
1618- validate_bound_application_permissions (self .data .get ("user_id" ), app .workspace_id , application )
16191595 tool_list = mk_instance .get_tool_list ()
16201596 # 已存在且有权限的工具复用, 无权限或不存在则生成新id新建
16211597 update_tool_map , tool_list = resolve_import_tools (tool_list , self .data .get ("user_id" ), app .workspace_id )
0 commit comments