Check user still has access to domain on page load

Fixes #836
enwikipedia-acc · Sep 4, 2023 · 585c81d · 585c81d
1 parent 9912642
commit 585c81d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 19 deletions.
diff --git a/includes/Pages/PageDomainSwitch.php b/includes/Pages/PageDomainSwitch.php
@@ -39,7 +39,7 @@ protected function main()
             return;
         }
 
-        $this->getDomainAccessManager()->switchDomain($currentUser, $newDomain);
+        $this->getDomainAccessManager()->switchDomain($currentUser, $newDomain, $this->getSecurityManager());
 
         // try to stay on the same page if possible.
         // This only checks basic ACLs and not domain privileges, so this may still result in a 403.

diff --git a/includes/Security/DomainAccessManager.php b/includes/Security/DomainAccessManager.php
@@ -17,16 +17,6 @@
 
 class DomainAccessManager
 {
-    /**
-     * @var SecurityManager
-     */
-    private $securityManager;
-
-    public function __construct(SecurityManager $securityManager)
-    {
-        $this->securityManager = $securityManager;
-    }
-
     /**
      * @param User $user
      *
@@ -41,7 +31,7 @@ public function getAllowedDomains(User $user): array
         return Domain::getDomainByUser($user->getDatabase(), $user, true);
     }
 
-    public function switchDomain(User $user, Domain $newDomain): void
+    public function switchDomain(User $user, Domain $newDomain, SecurityManager $securityManager): void
     {
         $mapToId = function(DataObject $object) {
             return $object->getId();
@@ -53,7 +43,7 @@ public function switchDomain(User $user, Domain $newDomain): void
             WebRequest::setActiveDomain($newDomain);
         }
         else {
-            throw new AccessDeniedException($this->securityManager, $this);
+            throw new AccessDeniedException($securityManager, $this);
         }
     }
 

diff --git a/includes/Security/SecurityManager.php b/includes/Security/SecurityManager.php
@@ -11,6 +11,8 @@
 use Waca\DataObjects\Domain;
 use Waca\DataObjects\User;
 use Waca\DataObjects\UserRole;
+use Waca\Exceptions\AccessDeniedException;
+use Waca\Exceptions\ApplicationLogicException;
 use Waca\IdentificationVerifier;
 
 final class SecurityManager
@@ -25,20 +27,25 @@ final class SecurityManager
      */
     private $roleConfiguration;
 
+    private DomainAccessManager $domainAccessManager;
+
     private $cache = [];
 
     /**
      * SecurityManager constructor.
      *
      * @param IdentificationVerifier $identificationVerifier
      * @param RoleConfiguration      $roleConfiguration
+     * @param DomainAccessManager    $domainAccessManager
      */
     public function __construct(
         IdentificationVerifier $identificationVerifier,
-        RoleConfiguration $roleConfiguration
+        RoleConfiguration $roleConfiguration,
+        DomainAccessManager $domainAccessManager
     ) {
         $this->identificationVerifier = $identificationVerifier;
         $this->roleConfiguration = $roleConfiguration;
+        $this->domainAccessManager = $domainAccessManager;
     }
 
     /**
@@ -181,6 +188,18 @@ public function getActiveRoles(User $user, &$activeRoles, &$inactiveRoles)
 
             if ($user->isActive()) {
                 $domain = Domain::getCurrent($user->getDatabase());
+
+                $userDomains = array_map(fn(Domain $d) => $d->getId(), $this->domainAccessManager->getAllowedDomains($user));
+
+                if (!in_array($domain->getId(), $userDomains)) {
+                    $this->domainAccessManager->switchToDefaultDomain($user);
+                    $domain = Domain::getCurrent($user->getDatabase());
+                }
+
+                if (!in_array($domain->getId(), $userDomains)) {
+                    throw new AccessDeniedException($this, $this->domainAccessManager);
+                }
+
                 $ur = UserRole::getForUser($user->getId(), $user->getDatabase(), $domain->getId());
 
                 // NOTE: public is still in this array.

diff --git a/includes/WebStart.php b/includes/WebStart.php
@@ -78,16 +78,17 @@ protected function setupHelpers(
                 $page->setTypeAheadHelper(new TypeAheadHelper());
 
                 $identificationVerifier = new IdentificationVerifier($page->getHttpHelper(), $siteConfiguration, $database);
-                $page->setSecurityManager(new SecurityManager($identificationVerifier, new RoleConfiguration()));
+
+                $domainAccessManager = new DomainAccessManager();
+                $page->setDomainAccessManager($domainAccessManager);
+                $page->setSecurityManager(new SecurityManager($identificationVerifier, new RoleConfiguration(), $domainAccessManager));
 
                 if ($siteConfiguration->getTitleBlacklistEnabled()) {
                     $page->setBlacklistHelper(new BlacklistHelper($page->getHttpHelper(), $database));
                 }
                 else {
                     $page->setBlacklistHelper(new FakeBlacklistHelper());
                 }
-
-                $page->setDomainAccessManager(new DomainAccessManager($page->getSecurityManager()));
             }
         }
     }

diff --git a/tests/includes/Security/SecurityManagerTest.php b/tests/includes/Security/SecurityManagerTest.php
@@ -10,8 +10,10 @@
 
 use PHPUnit_Framework_MockObject_MockObject;
 use PHPUnit\Framework\TestCase;
+use Waca\DataObjects\Domain;
 use Waca\DataObjects\User;
 use Waca\IdentificationVerifier;
+use Waca\Security\DomainAccessManager;
 use Waca\Security\RoleConfiguration;
 use Waca\Security\SecurityManager;
 
@@ -51,7 +53,10 @@ public function testPublicAccess()
         ));
         $roleConfiguration->method('roleNeedsIdentification')->willReturn(false);
 
-        $securityManager = new SecurityManager($this->identificationVerifier, $roleConfiguration);
+        $securityManager = new SecurityManager(
+            $this->identificationVerifier,
+            $roleConfiguration,
+            new DomainAccessManager());
         $this->identificationVerifier->method('isUserIdentified')->willReturn(true);
 
         // act
@@ -76,7 +81,10 @@ public function testPublicAccessDenied()
         ));
         $roleConfiguration->method('roleNeedsIdentification')->willReturn(false);
 
-        $securityManager = new SecurityManager($this->identificationVerifier, $roleConfiguration);
+        $securityManager = new SecurityManager(
+            $this->identificationVerifier,
+            $roleConfiguration,
+            new DomainAccessManager());
         $this->identificationVerifier->method('isUserIdentified')->willReturn(true);
 
         // act