Skip to content

fix(keycloak): bind ReadOnly permission to explicit resources to prevent multi-team isolation bypass #71313

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
waterWang wants to merge 1 commit into
base: main
Choose a base branch
from
+42 −16
Open

fix(keycloak): bind ReadOnly permission to explicit resources to prevent multi-team isolation bypass #71313

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
29 changes: 18 additions & 11 deletions providers/keycloak/src/airflow/providers/keycloak/auth_manager/cli/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def _attach_default_role_permissions(
permission_name="ReadOnly",
policy_name=_role_policy_name(role_name),
scope_names=["GET", "MENU", "LIST"],
resource_names=[],
resource_names=list(TEAM_SCOPED_RESOURCE_NAMES) + list(GLOBAL_SCOPED_RESOURCE_NAMES),
decision_strategy="AFFIRMATIVE",
_dry_run=_dry_run,
)
Expand Down Expand Up @@ -300,7 +300,7 @@ def _attach_default_role_permissions(
permission_name="Admin",
policy_name=_role_policy_name(role_name),
scope_names=_get_extended_resource_methods() + ["LIST"],
resource_names=[],
resource_names=list(TEAM_SCOPED_RESOURCE_NAMES) + list(GLOBAL_SCOPED_RESOURCE_NAMES),
_dry_run=_dry_run,
)

Expand Down Expand Up @@ -426,6 +426,7 @@ def _get_permissions_to_create(
"name": "ReadOnly",
"type": "scope-based",
"scope_names": ["GET", "MENU", "LIST"],
"resources": list(TEAM_SCOPED_RESOURCE_NAMES) + list(GLOBAL_SCOPED_RESOURCE_NAMES),
},
{
"name": "Admin",
Expand Down Expand Up @@ -463,10 +464,7 @@ def _get_permissions_to_create(
"name": f"ReadOnly-{team}",
"type": "scope-based",
"scope_names": ["GET", "LIST"],
"resources": [
f"{KeycloakResource.DAG.value}:{team}",
f"{KeycloakResource.TEAM.value}:{team}",
],
"resources": [f"{resource}:{team}" for resource in TEAM_SCOPED_RESOURCE_NAMES],
},
{
"name": f"User-{team}",
Expand All @@ -492,9 +490,11 @@ def _get_permissions_to_create(
"name": "Admin",
"type": "scope-based",
"scope_names": _get_extended_resource_methods() + ["LIST"],
"resources": [
f"{resource}:{team}" for team in teams for resource in TEAM_SCOPED_RESOURCE_NAMES
],
"resources": (
[f"{resource}:{team}" for team in teams for resource in TEAM_SCOPED_RESOURCE_NAMES]
+ list(TEAM_SCOPED_RESOURCE_NAMES)
+ list(GLOBAL_SCOPED_RESOURCE_NAMES)
),
}
)
perm_configs.append(
Expand All @@ -505,6 +505,14 @@ def _get_permissions_to_create(
"resources": list(TEAM_SCOPED_RESOURCE_NAMES) + list(GLOBAL_SCOPED_RESOURCE_NAMES),
}
)
perm_configs.append(
{
"name": "ReadOnly",
"type": "scope-based",
"scope_names": ["GET", "MENU", "LIST"],
"resources": list(TEAM_SCOPED_RESOURCE_NAMES) + list(GLOBAL_SCOPED_RESOURCE_NAMES),
}
)
perm_configs.append(
{
"name": "ViewAccess",
Expand Down Expand Up @@ -780,8 +788,7 @@ def _attach_team_permissions(
f"{KeycloakResource.DAG.value}:{team}",
]
team_readable_resources = [
f"{KeycloakResource.DAG.value}:{team}",
f"{KeycloakResource.TEAM.value}:{team}",
f"{resource}:{team}" for resource in sorted(TEAM_SCOPED_RESOURCE_NAMES)
]
team_scoped_resources = [f"{resource}:{team}" for resource in sorted(TEAM_SCOPED_RESOURCE_NAMES)]

Expand Down
29 changes: 24 additions & 5 deletions providers/keycloak/tests/unit/keycloak/auth_manager/cli/test_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
SUPER_ADMIN_ROLE_NAME,
TEAM_ROLE_NAMES,
TEAM_SCOPED_RESOURCE_NAMES,
GLOBAL_SCOPED_RESOURCE_NAMES,
_get_extended_resource_methods,
_get_resource_methods,
add_user_to_team_command,
Expand Down Expand Up @@ -274,6 +275,7 @@ def test_create_permissions(
"logic": "POSITIVE",
"decisionStrategy": "UNANIMOUS",
"scopes": ["1", "2", "3"], # GET, MENU, LIST
"resources": ["r1", "r2", "r3"], # Dag, Asset, Connection (matched from TEAM_SCOPED + GLOBAL_SCOPED)
},
),
call(
Expand Down Expand Up @@ -412,7 +414,18 @@ def test_create_permissions_with_teams(self, mock_get_client):
"logic": "POSITIVE",
"decisionStrategy": "UNANIMOUS",
"scopes": ["1", "3"],
"resources": ["r1"],
"resources": ["r1", "r2", "r3", "r4"], # Dag:team-a, Connection:team-a, Pool:team-a, Variable:team-a
},
)
client.create_client_authz_scope_permission.assert_any_call(
client_id="test-id",
payload={
"name": "ReadOnly",
"type": "scope",
"logic": "POSITIVE",
"decisionStrategy": "UNANIMOUS",
"scopes": ["1", "2", "3"],
"resources": ["r6", "r7", "r8", "r9", "r10", "r11", "r12"], # non-team resources
},
)
client.create_client_authz_resource_based_permission.assert_any_call(
Expand Down Expand Up @@ -468,7 +481,7 @@ def test_create_permissions_attaches_default_role_policies(
permission_name="ReadOnly",
policy_name=f"Allow-{role_name}",
scope_names=["GET", "MENU", "LIST"],
resource_names=[],
resource_names=list(TEAM_SCOPED_RESOURCE_NAMES) + list(GLOBAL_SCOPED_RESOURCE_NAMES),
decision_strategy="AFFIRMATIVE",
_dry_run=False,
)
Expand All @@ -478,7 +491,7 @@ def test_create_permissions_attaches_default_role_policies(
permission_name="Admin",
policy_name="Allow-Admin",
scope_names=_get_extended_resource_methods() + ["LIST"],
resource_names=[],
resource_names=list(TEAM_SCOPED_RESOURCE_NAMES) + list(GLOBAL_SCOPED_RESOURCE_NAMES),
_dry_run=False,
)
mock_attach_scope_policy.assert_any_call(
Expand All @@ -487,7 +500,7 @@ def test_create_permissions_attaches_default_role_policies(
permission_name="Admin",
policy_name="Allow-SuperAdmin",
scope_names=_get_extended_resource_methods() + ["LIST"],
resource_names=[],
resource_names=list(TEAM_SCOPED_RESOURCE_NAMES) + list(GLOBAL_SCOPED_RESOURCE_NAMES),
_dry_run=False,
)
mock_attach_resource_policy.assert_any_call(
Expand Down Expand Up @@ -573,7 +586,13 @@ def test_create_team_command(
permission_name="ReadOnly-team-a",
policy_name="Allow-Viewer-team-a",
scope_names=["GET", "LIST"],
resource_names=["Dag:team-a", "Team:team-a"],
resource_names=[
"Connection:team-a",
"Dag:team-a",
"Pool:team-a",
"Team:team-a",
"Variable:team-a",
],
_dry_run=False,
)
mock_attach_policy.assert_any_call(
Expand Down