[BUGFIX] Use correct ip address behind reverse proxies

Resolves: in2ode-de/in2frontendauthentication#17
in2code-de · Dec 19, 2024 · c2bc1f0 · c2bc1f0
1 parent 9beb397
commit c2bc1f0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Classes/Domain/Repository/FeGroupsRepository.php b/Classes/Domain/Repository/FeGroupsRepository.php
@@ -9,6 +9,7 @@
 use In2code\In2frontendauthentication\Utility\DatabaseUtility;
 use IPTools\IP;
 use IPTools\Range;
+use Psr\Http\Message\ServerRequestInterface;
 use Throwable;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -19,18 +20,21 @@ class FeGroupsRepository
 {
     const TABLE_NAME = 'fe_groups';
 
+    private ServerRequestInterface $request;
+
     /**
      * FeGroupsRepository constructor.
      * @throws ClassDoesNotExistException
      */
-    public function __construct()
+    public function __construct(ServerRequestInterface $request)
     {
         if (class_exists(Range::class) === false) {
             throw new ClassDoesNotExistException(
                 'IPTools/Range is not available. Did you install this extension via composer?',
                 1583143391
             );
         }
+        $this->request = $request;
     }
 
     /**
@@ -62,7 +66,10 @@ protected function isCurrentIpInList(string $ipList): bool
     {
         $ips = GeneralUtility::trimExplode(',', $ipList, true);
         foreach ($ips as $ip) {
-            if ($this->isCurrentIpAddressInRangeDefinition(GeneralUtility::getIndpEnv('REMOTE_ADDR'), $ip) === true) {
+            if ($this->isCurrentIpAddressInRangeDefinition(
+                    $this->request->getAttribute('normalizedParams')->getRemoteAddress(), $ip
+                ) === true)
+            {
                 return true;
             }
         }

diff --git a/Classes/EventListener/ModifyFeGroups.php b/Classes/EventListener/ModifyFeGroups.php
@@ -18,7 +18,7 @@ class ModifyFeGroups
 {
     public function __invoke(ModifyResolvedFrontendGroupsEvent $event): void
     {
-        $feGroupsRepository = GeneralUtility::makeInstance(FeGroupsRepository::class);
+        $feGroupsRepository = GeneralUtility::makeInstance(FeGroupsRepository::class, $event->getRequest());
         $feGroups = $feGroupsRepository->findByCurrentIpAddress();
         if (!empty($feGroups)) {
             $this->setCookie(true);