mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-10-15 17:14:07 +00:00
feat(dashboard): permission grants count in every dashboard permission check
What someone may do on the dashboard is now their GM level's permissions plus the grants on their account, minus its denies (PermissionGrants.h). A deny beats a grant; denies never apply to GM 9, and settings and permissions_manage stay GM 9 only. The account's grants are read with every request (like its GM level), so a change applies at once, and they are passed through every check: RouteUtils::Can, CanViewCharacter, the rank rules (self_* and manage_equal_rank), routes guarded by a permission, the templates' `can`, the API documentation, API access, API key scopes (a key never does more than its owner may now) and WebSocket subscriptions. New permission grants_manage (GM 9 by default) and the API to manage grants: GET /api/grants/catalog, GET /api/grants, POST /api/grants, POST /api/grants/:id/remove. Nobody grants or takes away what they don't hold themselves (a permission, every permission of a group, a command they may use, every command up to their own GM level), and only on accounts the rank rules let them manage (their own with self_moderation). Commands with a fixed level or a floor above GM 1 (/execute) can't be granted. Every change goes in the audit log (grant_permission, deny_permission, remove_grant). Also: the Showcase gate and the traffic subscription now check their permission by name. Check: grant a GM 2 account accounts_ban (it can ban, and the Ban button shows); deny a GM 8 account accounts_view (the accounts list is refused); give an expiry a minute ahead and see it stop; try to grant a permission your account doesn't have (refused); dWebTests PermissionGrantsTests. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
#include "AuthTokenHandler.h"
|
||||
#include "PermissionGrantsLoader.h"
|
||||
#include "ApiKeyService.h"
|
||||
#include "DashboardAuthService.h"
|
||||
#include "Game.h"
|
||||
@@ -82,6 +83,7 @@ bool AuthTokenHandler::ProcessHTTPContext(HTTPContext& context, HTTPReply& reply
|
||||
if (source == eTokenSource::HEADER && ApiKeyService::LooksLikeKey(token)) {
|
||||
const auto keyResult = ApiKeyService::Authenticate(token, context, reply);
|
||||
if (keyResult == ApiKeyService::eResult::INVALID) LOG_DEBUG("API key validation failed from %s", context.clientIP.c_str());
|
||||
if (context.isAuthenticated) context.grants = PermissionGrants::Load(context.accountId);
|
||||
return keyResult != ApiKeyService::eResult::REFUSED;
|
||||
}
|
||||
|
||||
@@ -95,6 +97,8 @@ bool AuthTokenHandler::ProcessHTTPContext(HTTPContext& context, HTTPReply& reply
|
||||
context.authenticatedUser = result.username;
|
||||
context.accountId = result.accountId;
|
||||
context.gmLevel = result.gmLevel;
|
||||
// Read on every request like the GM level, so a grant given or taken away applies at once
|
||||
context.grants = PermissionGrants::Load(result.accountId);
|
||||
context.userData["auth_source"] = source == eTokenSource::COOKIE ? "cookie" : "header";
|
||||
if (DashboardAuthService::NeedsTwoFactorSetup(result.accountId, result.gmLevel)) context.userData["needs_2fa"] = "1";
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user