mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-06 20:07:09 +00:00
Code Issues Projects Releases Wiki Activity

PermissibleBase: fixed root permissible being unaware of changes in some cases

Browse Source 
for example, Player->recalculatePermissions() was not called when a player's op status changed, nor when a permission attachment altered permissions (potential secvuln for broadcasting).
This commit is contained in:
Dylan K. Taylor 2020-11-28 19:22:30 +00:00
parent 011d1713c0
commit ee7fad2271
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/permission/PermissibleBase.php
View File

@ -47,13 +47,17 @@ class PermissibleBase implements Permissible{
//TODO: permissions need to be recalculated here, or inherited permissions won't work //TODO: permissions need to be recalculated here, or inherited permissions won't work
} }
private function getRootPermissible() : Permissible{
return $this->parent ?? $this;
}
public function isOp() : bool{ public function isOp() : bool{
return $this->op; return $this->op;
} }
public function onOpStatusChange(bool $value) : void{ public function onOpStatusChange(bool $value) : void{
$this->op = $value; $this->op = $value;
$this->recalculatePermissions(); $this->getRootPermissible()->recalculatePermissions();
} }
/** /**
@ -93,13 +97,13 @@ class PermissibleBase implements Permissible{
throw new PluginException("Plugin " . $plugin->getDescription()->getName() . " is disabled"); throw new PluginException("Plugin " . $plugin->getDescription()->getName() . " is disabled");
} }
$result = new PermissionAttachment($plugin, $this->parent ?? $this); $result = new PermissionAttachment($plugin, $this->getRootPermissible());
$this->attachments[spl_object_id($result)] = $result; $this->attachments[spl_object_id($result)] = $result;
if($name !== null and $value !== null){ if($name !== null and $value !== null){
$result->setPermission($name, $value); $result->setPermission($name, $value);
} }
$this->recalculatePermissions(); $this->getRootPermissible()->recalculatePermissions();
return $result; return $result;
} }
@ -111,7 +115,7 @@ class PermissibleBase implements Permissible{
$ex->attachmentRemoved($attachment); $ex->attachmentRemoved($attachment);
} }
$this->recalculatePermissions(); $this->getRootPermissible()->recalculatePermissions();
} }
@ -123,12 +127,12 @@ class PermissibleBase implements Permissible{
$this->clearPermissions(); $this->clearPermissions();
$permManager = PermissionManager::getInstance(); $permManager = PermissionManager::getInstance();
$defaults = $permManager->getDefaultPermissions($this->isOp()); $defaults = $permManager->getDefaultPermissions($this->isOp());
$permManager->subscribeToDefaultPerms($this->isOp(), $this->parent ?? $this); $permManager->subscribeToDefaultPerms($this->isOp(), $this->getRootPermissible());
foreach($defaults as $perm){ foreach($defaults as $perm){
$name = $perm->getName(); $name = $perm->getName();
$this->permissions[$name] = new PermissionAttachmentInfo($this->parent ?? $this, $name, null, true); $this->permissions[$name] = new PermissionAttachmentInfo($this->getRootPermissible(), $name, null, true);
$permManager->subscribeToPermission($name, $this->parent ?? $this); $permManager->subscribeToPermission($name, $this->getRootPermissible());
$this->calculateChildPermissions($perm->getChildren(), false, null); $this->calculateChildPermissions($perm->getChildren(), false, null);
} }
@ -141,10 +145,10 @@ class PermissibleBase implements Permissible{
public function clearPermissions() : void{ public function clearPermissions() : void{
$permManager = PermissionManager::getInstance(); $permManager = PermissionManager::getInstance();
$permManager->unsubscribeFromAllPermissions($this->parent ?? $this); $permManager->unsubscribeFromAllPermissions($this->getRootPermissible());
$permManager->unsubscribeFromDefaultPerms(false, $this->parent ?? $this); $permManager->unsubscribeFromDefaultPerms(false, $this->getRootPermissible());
$permManager->unsubscribeFromDefaultPerms(true, $this->parent ?? $this); $permManager->unsubscribeFromDefaultPerms(true, $this->getRootPermissible());
$this->permissions = []; $this->permissions = [];
} }
@ -157,8 +161,8 @@ class PermissibleBase implements Permissible{
foreach($children as $name => $v){ foreach($children as $name => $v){
$perm = $permManager->getPermission($name); $perm = $permManager->getPermission($name);
$value = ($v xor $invert); $value = ($v xor $invert);
$this->permissions[$name] = new PermissionAttachmentInfo($this->parent ?? $this, $name, $attachment, $value); $this->permissions[$name] = new PermissionAttachmentInfo($this->getRootPermissible(), $name, $attachment, $value);
$permManager->subscribeToPermission($name, $this->parent ?? $this); $permManager->subscribeToPermission($name, $this->getRootPermissible());
if($perm instanceof Permission){ if($perm instanceof Permission){
$this->calculateChildPermissions($perm->getChildren(), !$value, $attachment); $this->calculateChildPermissions($perm->getChildren(), !$value, $attachment);