Working on RBAC.

This commit is contained in:
charles-gauthereau
2024-10-27 15:56:43 +01:00
parent b62261896b
commit 4f8cb485c3
12 changed files with 150 additions and 16 deletions
View File
+9
View File
@@ -22,3 +22,12 @@ def create_user(db: Session, user: schemas.UserCreate):
db.commit()
db.refresh(db_user)
return db_user
def create_admin_user(db: Session, user: schemas.AdminUserCreate):
fake_hashed_password = services.get_password_hash(user.password)
db_user = models.User(email=user.email, hashed_password=fake_hashed_password, role=user.role)
db.add(db_user)
db.commit()
db.refresh(db_user)
return db_user
+4 -2
View File
@@ -1,7 +1,8 @@
from sqlalchemy import Column, Boolean, String, Float
from sqlalchemy import Column, Boolean, String, Float, Enum
from sqlalchemy.orm import relationship
from apps.base.models import Model
from apps.users.roles import Role
class User(Model):
@@ -10,4 +11,5 @@ class User(Model):
email = Column(String, unique=True, index=True)
hashed_password = Column(String)
is_active = Column(Boolean, default=True)
role = Column(Enum(Role), default=Role.USER) # Add a role attribute
# role = Column(String) # Ensure role is defined
+21
View File
@@ -0,0 +1,21 @@
from enum import Enum
class Role(str, Enum):
ADMIN = "admin"
MODERATOR = "moderator"
USER = "user"
class Permission(str, Enum):
CREATE = "create"
READ = "read"
UPDATE = "update"
DELETE = "delete"
role_permissions = {
Role.ADMIN: [Permission.CREATE, Permission.READ, Permission.UPDATE, Permission.DELETE],
Role.MODERATOR: [Permission.CREATE, Permission.READ, Permission.UPDATE],
Role.USER: [Permission.READ]
}
+6
View File
@@ -1,4 +1,5 @@
from apps.base.schemas import Schema
from apps.users.roles import Role
class UserBase(Schema):
@@ -12,6 +13,7 @@ class UserCreate(UserBase):
class User(UserBase):
id: int
is_active: bool
role: Role
class Config:
from_attributes = True
@@ -28,3 +30,7 @@ class TokenData(Schema):
class UserInDB(User):
hashed_password: str
class AdminUserCreate(UserCreate):
role: Role
+49 -3
View File
@@ -1,13 +1,16 @@
from datetime import datetime, timedelta, timezone
from typing import Annotated
from fastapi import Request
from fastapi import Depends, HTTPException, status
from fastapi import Depends, HTTPException, status, Security
from fastapi.security import OAuth2PasswordBearer
from jose import JWTError, jwt
from passlib.context import CryptContext
from sqlalchemy.orm import Session
from functools import wraps
from apps.users.crud import get_user_by_email
from apps.users.roles import Permission, role_permissions
from apps.users.schemas import TokenData, User, UserInDB
from middleware.db_connection import get_db
from settings import config
@@ -64,22 +67,24 @@ def create_access_token(data: dict, expires_delta: timedelta | None = None):
async def get_current_user(token: Annotated[str, Depends(oauth2_scheme)], db: Session = Depends(get_db)):
print(token)
credentials_exception = HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail="Could not validate credentials",
headers={"WWW-Authenticate": "Bearer"},
)
try:
print(token)
payload = jwt.decode(token, config.SECRET_KEY, algorithms=[ALGORITHM])
print(payload)
print("payload", payload)
username: str = payload.get("sub")
if username is None:
raise credentials_exception
token_data = TokenData(username=username)
except JWTError:
raise credentials_exception
print(token_data.username)
user = get_user_by_email(db, email=token_data.username)
print(user)
if user is None:
raise credentials_exception
return user
@@ -91,3 +96,44 @@ async def get_current_active_user(
if not current_user.is_active:
raise HTTPException(status_code=400, detail="Inactive user")
return current_user
def permission_required(permission: Permission):
def decorator(func):
@wraps(func)
async def decorated_function(*args, **kwargs):
print("test", kwargs)
request: Request = kwargs.get("request")
db: Session = kwargs.get("db")
if not request:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail="Missing request object",
)
# Get the authorization header
authorization_header = request.headers.get("Authorization")
# Extract the token from the authorization header
if not authorization_header:
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail="Missing authorization header",
)
# Assuming the token is in the format "Bearer <token>"
token = authorization_header.split(" ")[1]
current_user = await get_current_user(token=token, db=db)
# Check if the user has the required permission
if permission not in role_permissions[current_user.role]:
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN,
detail="You do not have the required permission",
)
# Call the decorated function with the original arguments
return await func(*args, **kwargs)
return decorated_function
return decorator