ske087
1f6217d347
Portal: - Replace is_admin boolean with role column (admin/advanced/standard) - Settings UI: 3-tier portal role select + per-app role dropdowns - /portal-return endpoint: re-establishes session from JWT for sub-app back-links - /api/internal/nv-users: internal endpoint for NetworkView user sync - portal/migrate_roles.py: one-time DB migration script - Role badges (admin/advanced/standard) in topbar and settings table DigiServer: - Add editor and viewer roles (portal advanced->editor, standard->viewer) - PlaylistPermission model: grant viewer users edit access to specific playlists - app/utils/access.py: shared editor_required, admin_required, can_edit_playlist helpers - Content routes: editor_required on create/delete, per-playlist permission check on mutations - Admin: playlist_permissions route + template to manage viewer playlist grants - Base template: hide Admin nav for viewers, Portal button (⬡) returns to portal - content_list_new: hide create/delete for viewers; Manage vs View button per permission - manage_playlist_content: view-only mode when user lacks edit permission NetworkView: - backend/src/middleware/rbac.js: requireRole + requireWriteAccess helpers - site_permissions table: one site per advanced user - All mutating routes guarded (admin=all, advanced=assigned site, viewer=read-only) - Portal SSO auto-upsert: user row synced from X-Auth-Role on every request - GET /api/users: merges portal users list with local NV data (all 4 portal users visible) - GET/PUT /api/users/:id/site-permission: assign site to advanced user - Settings Users tab: role badges, site dropdown for advanced, (portal only) indicator - Sidebar: ⬡ Portal button between Settings and Logout - Frontend build: VITE_API_BASE=/networkview/api now set in start-dev.sh IT Assets / Server Monitor: - portal_sso.py updated: map advanced->editor/viewer, standard->readonly - AdminUser model: add editor role + is_editor property
96 lines
3.0 KiB
Python
96 lines
3.0 KiB
Python
"""
|
|
Internal blueprint — service-to-service endpoints.
|
|
|
|
These routes are NOT exposed through nginx to the public internet.
|
|
They are called from the portal when it needs to pre-provision users.
|
|
Protected with a shared secret in the X-Internal-Token header.
|
|
"""
|
|
import os
|
|
import secrets as _secrets
|
|
from flask import Blueprint, request, jsonify, current_app
|
|
|
|
from app.extensions import db, bcrypt
|
|
|
|
internal_bp = Blueprint('internal', __name__, url_prefix='/internal')
|
|
|
|
|
|
def _check_token():
|
|
"""Return True if the request carries a valid internal sync token."""
|
|
expected = current_app.config.get('INTERNAL_SYNC_SECRET', '')
|
|
provided = request.headers.get('X-Internal-Token', '')
|
|
if not expected or not provided:
|
|
return False
|
|
# Constant-time comparison to prevent timing attacks
|
|
return _secrets.compare_digest(expected, provided)
|
|
|
|
|
|
@internal_bp.route('/sync-user', methods=['POST'])
|
|
def sync_user():
|
|
"""
|
|
Create or update a portal-managed user in DigiServer's local DB.
|
|
|
|
Request JSON:
|
|
{
|
|
"username": "<portal username>",
|
|
"role": "admin" | "user"
|
|
}
|
|
"""
|
|
if not _check_token():
|
|
return jsonify({'error': 'forbidden'}), 403
|
|
|
|
data = request.get_json(silent=True) or {}
|
|
username = (data.get('username') or '').strip()
|
|
role_raw = (data.get('role') or 'viewer').strip()
|
|
# Accept both old ('user') and new ('advanced'/'standard') role names from portal
|
|
if role_raw == 'admin':
|
|
role = 'admin'
|
|
elif role_raw in ('advanced', 'editor'):
|
|
role = 'editor'
|
|
else:
|
|
role = 'viewer'
|
|
|
|
if not username:
|
|
return jsonify({'error': 'username required'}), 400
|
|
|
|
from app.models.user import User
|
|
try:
|
|
user = User.query.filter_by(username=username).first()
|
|
if user:
|
|
if user.role != role:
|
|
user.role = role
|
|
db.session.commit()
|
|
status = 'updated'
|
|
else:
|
|
pw_hash = bcrypt.generate_password_hash(
|
|
_secrets.token_hex(32)
|
|
).decode('utf-8')
|
|
user = User(username=username, password=pw_hash, role=role)
|
|
db.session.add(user)
|
|
db.session.commit()
|
|
status = 'created'
|
|
|
|
return jsonify({'status': status, 'username': username, 'role': role}), 200
|
|
|
|
except Exception as exc:
|
|
db.session.rollback()
|
|
current_app.logger.error('sync-user error: %s', exc)
|
|
return jsonify({'error': 'internal error'}), 500
|
|
|
|
|
|
@internal_bp.route('/users', methods=['GET'])
|
|
def list_users():
|
|
"""Return a list of portal-managed users (for portal Settings UI)."""
|
|
if not _check_token():
|
|
return jsonify({'error': 'forbidden'}), 403
|
|
|
|
from app.models.user import User
|
|
users = User.query.order_by(User.username).all()
|
|
return jsonify([
|
|
{
|
|
'username': u.username,
|
|
'role': u.role,
|
|
'last_login': u.last_login.isoformat() if u.last_login else None,
|
|
}
|
|
for u in users
|
|
]), 200
|