Prevent racing conditions when enabling role system

Actual application of the roles will only happen once, if role system is enabled after that, it wont be evaluated, and roles will not apply. [3.2.x] ERM 26934 Change-Id: I3d5b605c504d764868585fae44ea48f9f6d64075
wikimedia · Feb 15, 2022 · b254586 · b254586
1 parent ecc13f0
commit b254586
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Foundation.php b/src/Foundation.php
@@ -110,7 +110,7 @@ protected function initializeRoleSystem() {
 			return;
 		}
 		$roleManager = $this->services->getService( 'BSRoleManager' );
-		$roleManager->applyRoles();
+		$roleManager->enableRoleSystem();
 	}
 
 }
diff --git a/src/Permission/RoleManager.php b/src/Permission/RoleManager.php
@@ -244,6 +244,7 @@ public function isRoleSystemEnabled() {
 	 */
 	public function enableRoleSystem() {
 		$this->roleSystemEnabled = true;
+		$this->applyRoles();
 	}
 
 	/**