Skip to content

Consolidate method names between Airflow Security Manager and FAB default #18726

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
jhtimmins merged 26 commits into from
Oct 22, 2021
Merged

Consolidate method names between Airflow Security Manager and FAB default #18726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
69152ac
Replace add_view_menu with create_resource.
jhtimmins Oct 4, 2021
9f1e7d3
Replace add_permission_view_menu with create_permission.
jhtimmins Oct 4, 2021
2be031e
Replace find_permission_view_menu with get_permission.
jhtimmins Oct 4, 2021
9f005b8
Replace find_view_menu with get_resource.
jhtimmins Oct 4, 2021
9efcafe
Replace get_all_view_menu with get_all_resources.
jhtimmins Oct 4, 2021
1278c26
Replace find_permission with get_action.
jhtimmins Oct 4, 2021
af13d33
Replace del_permission_view_menu with delete_permission.
jhtimmins Oct 4, 2021
7cc01fe
Replace del_view_menu with delete_resource.
jhtimmins Oct 4, 2021
441a4ba
Replace del_permission with delete_action.
jhtimmins Oct 4, 2021
0b013e4
Replace add_permission_role with add_permission_to_role.
jhtimmins Oct 4, 2021
bd3e46b
Replace find_permissions_view_menu with get_resource_permissions.
jhtimmins Oct 4, 2021
29a6559
Replace self.del_permission_role wth remove_permission_from_role.
jhtimmins Oct 4, 2021
97b1073
Replace exist_permission_on_roles with permission_exists_in_one_or_mo…
jhtimmins Oct 4, 2021
69dde73
Replace find_roles_permission_view_menus with filter_roles_by_perm_wi…
jhtimmins Oct 5, 2021
926e340
Replace get_db_role_permissions with get_role_permissions_from_db.
jhtimmins Oct 5, 2021
9a07cdc
Replace add_permission with create_action.
jhtimmins Oct 5, 2021
ab51964
Remove unused exist_permission_on_view function.
jhtimmins Oct 5, 2021
8c0e302
Rename local variables.
jhtimmins Oct 5, 2021
925dfaa
Remove sqla model names from SecurityManager base class.
jhtimmins Oct 5, 2021
6c0cdde
Update names in add_permissions_view.
jhtimmins Oct 5, 2021
3a03921
Flake8.
jhtimmins Oct 5, 2021
b17ca17
Use updated perm names.
jhtimmins Oct 5, 2021
3c24e8c
Use updated perm names for local vars.
jhtimmins Oct 5, 2021
911088d
Use black.
jhtimmins Oct 5, 2021
92c78ea
Reorder import statements.
jhtimmins Oct 5, 2021
1f591a0
Remove accidental renaming of BaseSecurityManager.roles.
jhtimmins Oct 22, 2021
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: 3 additions & 1 deletion airflow/migrations/versions/2c6edca13270_resource_based_permissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,9 @@ def remap_permissions():
for new_action_name, new_resource_name in new:
new_permission = appbuilder.sm.create_permission(new_action_name, new_resource_name)
for role in appbuilder.sm.get_all_roles():
if appbuilder.sm.exist_permission_on_roles(old_resource_name, old_action_name, [role.id]):
if appbuilder.sm.permission_exists_in_one_or_more_roles(
old_resource_name, old_action_name, [role.id]
):
appbuilder.sm.add_permission_to_role(role, new_permission)
appbuilder.sm.remove_permission_from_role(role, old_permission)
appbuilder.sm.delete_permission(old_action_name, old_resource_name)
Expand Down
4 changes: 2 additions & 2 deletions airflow/migrations/versions/82b7c48c147f_remove_can_read_permission_on_config_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def upgrade():
)

for role in roles_to_modify:
if appbuilder.sm.exist_permission_on_roles(
if appbuilder.sm.permission_exists_in_one_or_more_roles(
permissions.RESOURCE_CONFIG, permissions.ACTION_CAN_READ, [role.id]
):
appbuilder.sm.remove_permission_from_role(role, can_read_on_config_perm)
Expand All @@ -64,7 +64,7 @@ def downgrade():
)

for role in roles_to_modify:
if not appbuilder.sm.exist_permission_on_roles(
if not appbuilder.sm.permission_exists_in_one_or_more_roles(
permissions.RESOURCE_CONFIG, permissions.ACTION_CAN_READ, [role.id]
):
appbuilder.sm.add_permission_to_role(role, can_read_on_config_perm)
4 changes: 3 additions & 1 deletion airflow/migrations/versions/a13f7613ad25_resource_based_permissions_for_default_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ def remap_permissions():
for new_action_name, new_resource_name in new:
new_permission = appbuilder.sm.create_permission(new_action_name, new_resource_name)
for role in appbuilder.sm.get_all_roles():
if appbuilder.sm.exist_permission_on_roles(old_resource_name, old_action_name, [role.id]):
if appbuilder.sm.permission_exists_in_one_or_more_roles(
old_resource_name, old_action_name, [role.id]
):
appbuilder.sm.add_permission_to_role(role, new_permission)
appbuilder.sm.remove_permission_from_role(role, old_permission)
appbuilder.sm.delete_permission(old_action_name, old_resource_name)
Expand Down
314 changes: 179 additions & 135 deletions airflow/www/fab_security/manager.py
View file
Open in desktop

Large diffs are not rendered by default.

Loading