permissions systems 2.0

This commit is contained in:
2019-01-09 07:47:32 -06:00
parent 6fcb2d5edf
commit 21b4a7ce81
10 changed files with 121 additions and 65 deletions
@@ -188,9 +188,9 @@ class LoginController extends Controller
* @param charId
*/
private function SetRole($role, $charId) {
$permission = new UserPermission;
$permission = new UserRole;
$permission->character_id = $charId;
$permission->permission = $role;
$permission->role = $role;
$permission->save();
}
@@ -235,13 +235,13 @@ class LoginController extends Controller
private function GetRole($refreshToken, $charId) {
$accountType = $this->GetAccountType($refreshToken, $charId);
if($accountType == 'Guest') {
$role = 'role.guest';
$role = 'Guest';
} else if($accountType == 'Legacy'){
$role = 'role.user';
$role = 'User';
} else if($accountType == 'W4RP') {
$role = 'role.user';
$role = 'User';
} else {
$role = 'role.none';
$role = 'None';
}
return $role;
+1
View File
@@ -61,6 +61,7 @@ class Kernel extends HttpKernel
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
'callback' => \App\Http\Middleware\Callback::class,
'role' => \App\Http\Middleware\RequireRole::class,
'permission' => \App\Http\Middleware\RequirePermission::class,
];
}
+3 -50
View File
@@ -18,58 +18,11 @@ class RequirePermission
*/
public function handle($request, Closure $next, $permission)
{
$confirmed = false;
if(strpos($permission, 'role.') !== false) {
$confirmed = $this->CheckRole($permission);
} else {
$confirmed = $this->CheckPermission($permission);
}
if($confirmed === false) {
abort(403, "You don't have permission to access this area.");
}
$perms = UserPermission::where(['character_id' => auth()->user()->character_id, 'permission'=> $permission])->get(['permission']);
abort_unless(auth()->check() && isset($perms[0]->permission), 403, "You don't have the correct permission to be in this area.");
return $next($request);
}
private function CheckPermission($permission) {
$confirmed = false;
$checks = UserPermission::where(['character_id' => auth()->user()->character_id, 'permission' => $permission])->get(['permission']);
foreach($checks as $check) {
if($check === $permission) {
return true;
}
}
return false;
}
private function CheckRole($role) {
$confirmed = false;
$ranking = [
'role.none' => 0,
'role.guest' => 1,
'role.user' => 2,
'role.director' => 3,
'role.admin' => 4,
];
//Using eloquent let's get the roles for the character
$checks = UserPermission::where('character_id', auth()->user()->character_id)->get(['permission']);
foreach($checks as $check) {
if(!isset($check->permission)) {
abort(403, "You don't have the correct role to view this area.");
}
if(strpos($role, 'role.') !== false) {
if($ranking[$check->permission] >= $ranking[$role]) {
$confirmed = true;
}
}
}
return $confirmed;
}
}
+42
View File
@@ -0,0 +1,42 @@
<?php
namespace App\Http\Middleware;
use Closure;
class RequireRole
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next, $role)
{
$confirmed = false;
$ranking = [
'None' => 0,
'Guest' => 1,
'User' => 2,
'Admin' => 3,
'SuperUser' => 4,
];
$check = UserPermission::where('character_id', auth()->user()->character_id)->get(['role']);
if(!isset($check[0]->role)) {
abort(403, "You don't any roles. You don't belong here.");
}
if($ranking[$check->permission] >= $ranking[$role]) {
$confirmed = true;
}
abort_unless(auth()->check() && $confirmed, 403, "You don't have the correct role to be in this area.");
return $next($request);
}
}