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.

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

Fixed side effect of menu filtering causing disappearing menus #39229

Merged
merged 1 commit into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions airflow/auth/managers/base_auth_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from functools import cached_property
from typing import TYPE_CHECKING, Container, Literal, Sequence

from flask_appbuilder.menu import MenuItem
from sqlalchemy import select

from airflow.auth.managers.models.resource_details import (
Expand All @@ -34,7 +35,6 @@

if TYPE_CHECKING:
from flask import Blueprint
from flask_appbuilder.menu import MenuItem
from sqlalchemy.orm import Session

from airflow.auth.managers.models.base_user import BaseUser
Expand Down Expand Up @@ -397,13 +397,21 @@ def filter_permitted_menu_items(self, menu_items: list[MenuItem]) -> list[MenuIt
)
accessible_items = []
for menu_item in items:
menu_item_copy = MenuItem(
name=menu_item.name,
icon=menu_item.icon,
label=menu_item.label,
childs=[],
baseview=menu_item.baseview,
cond=menu_item.cond,
)
if menu_item.childs:
accessible_children = []
for child in menu_item.childs:
if self.security_manager.has_access(ACTION_CAN_ACCESS_MENU, child.name):
accessible_children.append(child)
menu_item.childs = accessible_children
accessible_items.append(menu_item)
menu_item_copy.childs = accessible_children
accessible_items.append(menu_item_copy)
return accessible_items

@abstractmethod
Expand Down
40 changes: 40 additions & 0 deletions tests/auth/managers/test_base_auth_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,3 +313,43 @@ def test_filter_permitted_menu_items(self, mock_security_manager, auth_manager):
assert result[1].name == "item3"
assert len(result[1].childs) == 1
assert result[1].childs[0].name == "item3.1"

@patch.object(EmptyAuthManager, "security_manager")
def test_filter_permitted_menu_items_twice(self, mock_security_manager, auth_manager):
mock_security_manager.has_access.side_effect = [
# 1st call
True, # menu 1
False, # menu 2
True, # menu 3
True, # Item 3.1
False, # Item 3.2
# 2nd call
False, # menu 1
True, # menu 2
True, # menu 3
False, # Item 3.1
True, # Item 3.2
]

menu = Menu()
menu.add_link("item1")
menu.add_link("item2")
menu.add_link("item3")
menu.add_link("item3.1", category="item3")
menu.add_link("item3.2", category="item3")

result = auth_manager.filter_permitted_menu_items(menu.get_list())

assert len(result) == 2
assert result[0].name == "item1"
assert result[1].name == "item3"
assert len(result[1].childs) == 1
assert result[1].childs[0].name == "item3.1"

result = auth_manager.filter_permitted_menu_items(menu.get_list())

assert len(result) == 2
assert result[0].name == "item2"
assert result[1].name == "item3"
assert len(result[1].childs) == 1
assert result[1].childs[0].name == "item3.2"