fix(optimizer): allow bedelia and operators access to ai room reservation optimizer v3.4.5
This commit is contained in:
@@ -6,7 +6,7 @@ from flask_babel import Babel, gettext as _
|
||||
from config.config import Config
|
||||
|
||||
# Initialize extensions
|
||||
__version__ = "3.4.4"
|
||||
__version__ = "3.4.5"
|
||||
db = SQLAlchemy()
|
||||
migrate = Migrate()
|
||||
cors = CORS()
|
||||
|
||||
@@ -7,7 +7,7 @@ OPENAPI_SPEC = {
|
||||
"info": {
|
||||
"title": "Edu-Space REST API",
|
||||
"description": "Enterprise Academic & Physical Space Management REST API with JWT Authentication and Role-Based Access Control.",
|
||||
"version": "3.4.4"
|
||||
"version": "3.4.5"
|
||||
},
|
||||
"servers": [
|
||||
{
|
||||
|
||||
@@ -8,6 +8,33 @@ from app.utils.jwt_decorators import jwt_required
|
||||
genetic_bp = Blueprint('genetic_algorithm', __name__, url_prefix='/api/genetic')
|
||||
|
||||
|
||||
def check_optimizer_permission(user, requires_write=False):
|
||||
"""
|
||||
Verifica si el usuario tiene permiso para consultar o ejecutar el optimizador de reservas.
|
||||
Permitido para Administradores, Bedelía, Docentes o usuarios con permisos RBAC en 'optimizer'.
|
||||
"""
|
||||
if not user:
|
||||
return False
|
||||
|
||||
# 1. Administrador (método o rol)
|
||||
if hasattr(user, 'is_admin') and user.is_admin():
|
||||
return True
|
||||
|
||||
role = (getattr(user, 'role', '') or '').strip().lower()
|
||||
if role in ['admin', 'administrador', 'bedelia']:
|
||||
return True
|
||||
if role in ['docente', 'teacher']:
|
||||
return True
|
||||
|
||||
# 2. RBAC granular
|
||||
if hasattr(user, 'has_permission'):
|
||||
if requires_write:
|
||||
return user.has_permission('optimizer', 'read_write')
|
||||
return user.has_permission('optimizer', 'read') or user.has_permission('optimizer', 'read_write')
|
||||
|
||||
return False
|
||||
|
||||
|
||||
@genetic_bp.route('/optimize', methods=['POST'])
|
||||
@jwt_required
|
||||
def optimize_reservations():
|
||||
@@ -39,8 +66,8 @@ def optimize_reservations():
|
||||
except ValueError:
|
||||
return jsonify({'error': 'Invalid end_date format. Use ISO format.'}), 400
|
||||
|
||||
# Check if user has permission (admin, teacher or RBAC optimizer write)
|
||||
if not (g.jwt_user.is_admin() or g.jwt_user.has_permission('optimizer', 'read_write') or g.jwt_user.role in ['ADMIN', 'teacher']):
|
||||
# Check if user has permission (admin, bedelia, teacher or RBAC optimizer write)
|
||||
if not check_optimizer_permission(g.jwt_user, requires_write=True):
|
||||
return jsonify({'error': 'Insufficient permissions to optimize reservations'}), 403
|
||||
|
||||
# Initialize optimizer and run optimization
|
||||
@@ -84,7 +111,7 @@ def apply_optimization():
|
||||
return jsonify({'error': 'reservations must be a list'}), 400
|
||||
|
||||
# Check if user has permission
|
||||
if not (g.jwt_user.is_admin() or g.jwt_user.has_permission('optimizer', 'read_write') or g.jwt_user.role in ['ADMIN', 'teacher']):
|
||||
if not check_optimizer_permission(g.jwt_user, requires_write=True):
|
||||
return jsonify({'error': 'Insufficient permissions to apply reservations'}), 403
|
||||
|
||||
# Initialize optimizer and apply reservations
|
||||
@@ -124,7 +151,7 @@ def preview_optimization():
|
||||
return jsonify({'error': 'commission_ids must be a non-empty list'}), 400
|
||||
|
||||
# Check if user has permission
|
||||
if g.jwt_user.role not in ['ADMIN', 'teacher']:
|
||||
if not check_optimizer_permission(g.jwt_user, requires_write=False):
|
||||
return jsonify({'error': 'Insufficient permissions to preview optimization'}), 403
|
||||
|
||||
# Initialize optimizer and run optimization
|
||||
@@ -171,7 +198,7 @@ def get_commissions():
|
||||
"""Get available commissions for optimization"""
|
||||
try:
|
||||
# Check if user has permission
|
||||
if g.jwt_user.role not in ['ADMIN', 'teacher']:
|
||||
if not check_optimizer_permission(g.jwt_user, requires_write=False):
|
||||
return jsonify({'error': 'Insufficient permissions'}), 403
|
||||
|
||||
from app.models.subject import Commission, Subject
|
||||
@@ -183,6 +210,8 @@ def get_commissions():
|
||||
for commission in commissions:
|
||||
commission_dict = commission.to_dict()
|
||||
commission_dict['get_full_code'] = commission.get_full_code()
|
||||
commission_dict['subject_name'] = commission.subject.name if commission.subject else 'Sin Asignatura'
|
||||
commission_dict['subject_code'] = commission.subject.code if commission.subject else ''
|
||||
commissions_data.append(commission_dict)
|
||||
|
||||
return jsonify({
|
||||
@@ -201,7 +230,7 @@ def get_algorithm_status():
|
||||
"""Get genetic algorithm configuration status"""
|
||||
try:
|
||||
# Check if user has permission
|
||||
if g.jwt_user.role not in ['ADMIN']:
|
||||
if not check_optimizer_permission(g.jwt_user, requires_write=False):
|
||||
return jsonify({'error': 'Insufficient permissions'}), 403
|
||||
|
||||
# Get system status
|
||||
@@ -249,7 +278,7 @@ genetic_web_bp = Blueprint('genetic_algorithm_web', __name__)
|
||||
@jwt_required
|
||||
def genetic_optimizer():
|
||||
"""Render the genetic algorithm optimizer interface"""
|
||||
if not (g.jwt_user.has_permission('optimizer', 'read') or (g.jwt_user.role and g.jwt_user.role.upper() == 'ADMIN')):
|
||||
if not check_optimizer_permission(g.jwt_user, requires_write=False):
|
||||
return render_template('auth/403.html'), 403
|
||||
|
||||
return render_template('genetic_optimizer.html')
|
||||
+1
-1
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
||||
|
||||
setup(
|
||||
name="edu-space-admin",
|
||||
version="3.4.4",
|
||||
version="3.4.5",
|
||||
description="Administrative interface for Edu-Space Classroom Management System",
|
||||
author="Edu-Space Development Team",
|
||||
author_email="admin@edu-space.com",
|
||||
|
||||
Reference in New Issue
Block a user