-
Notifications
You must be signed in to change notification settings - Fork 1
feat(workspaces): add rwx perms to blueprints and ranges #147
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
Closed
Closed
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
3ca6f4c
feat(workspaces): add rwx perms to blueprints and ranges
Adamkadaban cfd38d8
fix(tests): fix unit test for range crud admin check to check perms i…
Adamkadaban 8b8887a
fix(types): fix mypy issues in rwx
Adamkadaban 350593b
test(rwx): add tests for blueprint and range permissions
Adamkadaban 718acf9
style(rwx): fix ruff and black errors for range and blueprint perms
Adamkadaban 2cb5136
Merge branch 'workspaces-staging' into adam/workspaces2/perms
Adamkadaban 43133e7
fix(rwx): move id and perm type to mixin
Adamkadaban b08cbb4
fix(rwx): make all schemas inherit rwx
Adamkadaban 5ec03d1
fix(rwx): make all schemas inherit rwx computed fields
Adamkadaban a42af7f
fix(rwx): no longer delete rw fields now that theyre in base schema
Adamkadaban 439ad61
fix(rwx): remove duplicate test data
Adamkadaban f1d57b5
fix(rwx): move from literalstring to enum for perm types
Adamkadaban 7b58b3a
fix(rwx): better permission checks in crud
Adamkadaban 6be6579
fix(rwx): better permission checks in crud
Adamkadaban 80f6bf8
fix(rwx): improve type hints for range model
Adamkadaban 763a8ce
fix(rwx): various formatting and doc fixes
Adamkadaban ff934c9
fix(rwx): styling and type fixes
Adamkadaban d482741
fix(rwx): clean up redundant tests
Adamkadaban 6022ece
fix(rwx): clean up redundant tests
Adamkadaban 06ea902
fix(rwx): type safety issues
Adamkadaban File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,313 @@ | ||
| import logging | ||
|
|
||
| from sqlalchemy import select | ||
| from sqlalchemy.exc import SQLAlchemyError | ||
| from sqlalchemy.ext.asyncio import AsyncSession | ||
|
|
||
| from ..enums.permissions import BlueprintPermissionType, DeployedRangePermissionType | ||
| from ..models.permission_models import ( | ||
| BlueprintRangePermissionModel, | ||
| DeployedRangePermissionModel, | ||
| ) | ||
| from ..models.range_models import BlueprintRangeModel, DeployedRangeModel | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| async def grant_blueprint_permission( | ||
| db: AsyncSession, | ||
| blueprint_range_id: int, | ||
| user_id: int, | ||
| permission_type: BlueprintPermissionType, | ||
| requesting_user_id: int, | ||
| ) -> BlueprintRangePermissionModel: | ||
| """Grant permission to a blueprint range. | ||
|
|
||
| Args: | ||
| ---- | ||
| db: Database session | ||
| blueprint_range_id: ID of blueprint range to grant permission for | ||
| user_id: ID of user to grant permission to | ||
| permission_type: Type of permission to grant | ||
| requesting_user_id: ID of user requesting to grant permission (must be owner) | ||
|
|
||
| Returns: | ||
| ------- | ||
| BlueprintRangePermissionModel: The created permission | ||
|
|
||
| Raises: | ||
| ------ | ||
| SQLAlchemyError: If database operation fails | ||
| ValueError: If requesting user is not the owner | ||
|
|
||
| """ | ||
| stmt = select(BlueprintRangeModel).where( | ||
| BlueprintRangeModel.id == blueprint_range_id | ||
| ) | ||
| result = await db.execute(stmt) | ||
| blueprint_range = result.scalar_one_or_none() | ||
|
|
||
| if not blueprint_range: | ||
| msg = f"Blueprint range {blueprint_range_id} not found" | ||
| raise ValueError(msg) | ||
|
|
||
| if blueprint_range.owner_id != requesting_user_id: | ||
| msg = f"Only the owner can grant permissions on blueprint range {blueprint_range_id}" | ||
| raise ValueError(msg) | ||
|
|
||
| permission = BlueprintRangePermissionModel( | ||
| blueprint_range_id=blueprint_range_id, | ||
| user_id=user_id, | ||
| permission_type=permission_type, | ||
| ) | ||
|
|
||
| db.add(permission) | ||
|
|
||
| try: | ||
| await db.flush() | ||
| await db.refresh(permission) | ||
| logger.debug( | ||
| "Granted %s permission on blueprint range %s to user %s", | ||
| permission_type, | ||
| blueprint_range_id, | ||
| user_id, | ||
| ) | ||
| except SQLAlchemyError as e: | ||
| logger.exception( | ||
| "Failed to grant %s permission on blueprint range %s to user %s: %s", | ||
| permission_type, | ||
| blueprint_range_id, | ||
| user_id, | ||
| e, | ||
| ) | ||
| raise | ||
|
|
||
| return permission | ||
|
|
||
|
|
||
| async def grant_deployed_permission( | ||
| db: AsyncSession, | ||
| deployed_range_id: int, | ||
| user_id: int, | ||
| permission_type: DeployedRangePermissionType, | ||
| requesting_user_id: int, | ||
| ) -> DeployedRangePermissionModel: | ||
| """Grant permission to a deployed range. | ||
|
|
||
| Args: | ||
| ---- | ||
| db: Database session | ||
| deployed_range_id: ID of deployed range to grant permission for | ||
| user_id: ID of user to grant permission to | ||
| permission_type: Type of permission to grant | ||
| requesting_user_id: ID of user requesting to grant permission (must be owner) | ||
|
|
||
| Returns: | ||
| ------- | ||
| DeployedRangePermissionModel: The created permission | ||
|
|
||
| Raises: | ||
| ------ | ||
| SQLAlchemyError: If database operation fails | ||
| ValueError: If requesting user is not the owner | ||
|
|
||
| """ | ||
| stmt = select(DeployedRangeModel).where(DeployedRangeModel.id == deployed_range_id) | ||
| result = await db.execute(stmt) | ||
| deployed_range = result.scalar_one_or_none() | ||
|
|
||
| if not deployed_range: | ||
| msg = f"Deployed range {deployed_range_id} not found" | ||
| raise ValueError(msg) | ||
|
|
||
| if deployed_range.owner_id != requesting_user_id: | ||
| msg = f"User {requesting_user_id} is not the owner of deployed range {deployed_range_id}" | ||
| raise ValueError(msg) | ||
|
|
||
| permission = DeployedRangePermissionModel( | ||
| deployed_range_id=deployed_range_id, | ||
| user_id=user_id, | ||
| permission_type=permission_type, | ||
| ) | ||
|
|
||
| db.add(permission) | ||
Adamkadaban marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| try: | ||
| await db.flush() | ||
| await db.refresh(permission) | ||
| logger.debug( | ||
| "Granted %s permission on deployed range %s to user %s", | ||
| permission_type, | ||
| deployed_range_id, | ||
| user_id, | ||
| ) | ||
| except SQLAlchemyError as e: | ||
| logger.exception( | ||
| "Failed to grant %s permission on deployed range %s to user %s: %s", | ||
| permission_type, | ||
| deployed_range_id, | ||
| user_id, | ||
| e, | ||
| ) | ||
| raise | ||
|
|
||
| return permission | ||
|
|
||
|
|
||
| async def revoke_blueprint_permission( | ||
| db: AsyncSession, | ||
| blueprint_range_id: int, | ||
| user_id: int, | ||
| permission_type: BlueprintPermissionType, | ||
| requesting_user_id: int, | ||
| ) -> bool: | ||
| """Revoke permission from a blueprint range. | ||
|
|
||
| Args: | ||
| ---- | ||
| db: Database session | ||
| blueprint_range_id: ID of blueprint range to revoke permission from | ||
| user_id: ID of user to revoke permission from | ||
| permission_type: Type of permission to revoke | ||
| requesting_user_id: ID of user requesting to revoke permission (must be owner) | ||
|
|
||
| Returns: | ||
| ------- | ||
| bool: True if permission was revoked, False if not found | ||
|
|
||
| Raises: | ||
| ------ | ||
| SQLAlchemyError: If database operation fails | ||
| ValueError: If requesting user is not the owner | ||
|
|
||
| """ | ||
| # Check ownership | ||
| stmt = select(BlueprintRangeModel).where( | ||
| BlueprintRangeModel.id == blueprint_range_id | ||
| ) | ||
| result = await db.execute(stmt) | ||
| blueprint_range = result.scalar_one_or_none() | ||
|
|
||
| if not blueprint_range: | ||
| msg = f"Blueprint range {blueprint_range_id} not found" | ||
| raise ValueError(msg) | ||
|
|
||
| if blueprint_range.owner_id != requesting_user_id: | ||
| msg = f"User {requesting_user_id} is not the owner of blueprint range {blueprint_range_id}" | ||
| raise ValueError(msg) | ||
|
|
||
| permission_stmt = select(BlueprintRangePermissionModel).where( | ||
| BlueprintRangePermissionModel.blueprint_range_id == blueprint_range_id, | ||
| BlueprintRangePermissionModel.user_id == user_id, | ||
| BlueprintRangePermissionModel.permission_type == permission_type, | ||
| ) | ||
| result = await db.execute(permission_stmt) | ||
| permission = result.scalar_one_or_none() | ||
|
|
||
| if not permission: | ||
| logger.warning( | ||
| "Permission %s on blueprint range %s for user %s not found", | ||
| permission_type, | ||
| blueprint_range_id, | ||
| user_id, | ||
| ) | ||
| return False | ||
|
|
||
| try: | ||
| await db.delete(permission) | ||
| await db.flush() | ||
| logger.debug( | ||
| "Revoked %s permission on blueprint range %s from user %s", | ||
| permission_type, | ||
| blueprint_range_id, | ||
| user_id, | ||
| ) | ||
| except SQLAlchemyError as e: | ||
| logger.exception( | ||
| "Failed to revoke %s permission on blueprint range %s from user %s: %s", | ||
| permission_type, | ||
| blueprint_range_id, | ||
| user_id, | ||
| e, | ||
| ) | ||
| raise | ||
|
|
||
| return True | ||
|
|
||
|
|
||
| async def revoke_deployed_permission( | ||
| db: AsyncSession, | ||
| deployed_range_id: int, | ||
| user_id: int, | ||
| permission_type: DeployedRangePermissionType, | ||
| requesting_user_id: int, | ||
| ) -> bool: | ||
| """Revoke permission from a deployed range. | ||
|
|
||
| Args: | ||
| ---- | ||
| db: Database session | ||
| deployed_range_id: ID of deployed range to revoke permission from | ||
| user_id: ID of user to revoke permission from | ||
| permission_type: Type of permission to revoke | ||
| requesting_user_id: ID of user requesting to revoke permission (must be owner) | ||
|
|
||
| Returns: | ||
| ------- | ||
| bool: True if permission was revoked, False if not found | ||
|
|
||
| Raises: | ||
| ------ | ||
| SQLAlchemyError: If database operation fails | ||
| ValueError: If requesting user is not the owner | ||
|
|
||
| """ | ||
| stmt = select(DeployedRangeModel).where(DeployedRangeModel.id == deployed_range_id) | ||
| result = await db.execute(stmt) | ||
| deployed_range = result.scalar_one_or_none() | ||
|
|
||
| if not deployed_range: | ||
| msg = f"Deployed range {deployed_range_id} not found" | ||
| raise ValueError(msg) | ||
|
|
||
| if deployed_range.owner_id != requesting_user_id: | ||
| msg = f"User {requesting_user_id} is not the owner of deployed range {deployed_range_id}" | ||
| raise ValueError(msg) | ||
|
|
||
| permission_stmt = select(DeployedRangePermissionModel).where( | ||
| DeployedRangePermissionModel.deployed_range_id == deployed_range_id, | ||
| DeployedRangePermissionModel.user_id == user_id, | ||
| DeployedRangePermissionModel.permission_type == permission_type, | ||
| ) | ||
| result = await db.execute(permission_stmt) | ||
| permission = result.scalar_one_or_none() | ||
|
|
||
| if not permission: | ||
| logger.warning( | ||
| "Permission %s on deployed range %s for user %s not found", | ||
| permission_type, | ||
| deployed_range_id, | ||
| user_id, | ||
| ) | ||
| return False | ||
|
|
||
| try: | ||
| await db.delete(permission) | ||
| await db.flush() | ||
| logger.debug( | ||
| "Revoked %s permission on deployed range %s from user %s", | ||
| permission_type, | ||
| deployed_range_id, | ||
| user_id, | ||
| ) | ||
| except SQLAlchemyError as e: | ||
| logger.exception( | ||
| "Failed to revoke %s permission on deployed range %s from user %s: %s", | ||
| permission_type, | ||
| deployed_range_id, | ||
| user_id, | ||
| e, | ||
| ) | ||
| raise | ||
|
|
||
| return True | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.