Store the selected zone in the state for later use

tvdijen · tvdijen · commit 18bf91623026 · 2023-04-25T14:43:11.000+02:00
diff --git a/docs/simplesamlphp-changelog.md b/docs/simplesamlphp-changelog.md
@@ -5,6 +5,13 @@
 This document lists the changes between versions of SimpleSAMLphp.
 See the upgrade notes for specific information about upgrading.
 
+## Version 2.0.4
+
+Released TBD
+
+* The source that was selected by the SourceSelector is now available in the state.
+* The zone that was selected by the SourceIPSelector is now available in the state.
+
 ## Version 2.0.3
 
 Released 2023-03-29
diff --git a/modules/core/src/Auth/Source/SourceIPSelector.php b/modules/core/src/Auth/Source/SourceIPSelector.php
@@ -101,13 +101,15 @@ protected function selectAuthSource(/** @scrutinizer ignore-unused */ array &$st
                         $ip
                     ));
                     $source = $zone['source'];
+                    $state['sourceIPSelector:zone'] = $name;
                     break;
                 }
             }
         }
 
         if ($source === $this->defaultSource) {
             Logger::info("core:SourceIPSelector:  no match on client IP; selecting default zone");
+            $state['sourceIPSelector:zone'] = 'default';
         }
 
         return $source;

Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,15 @@ protected function selectAuthSource(/** @scrutinizer ignore-unused */ array &$st`
`101`	`101`	`$ip`
`102`	`102`	`));`
`103`	`103`	`$source = $zone['source'];`
	`104`	`+ $state['sourceIPSelector:zone'] = $name;`
`104`	`105`	`break;`
`105`	`106`	`}`
`106`	`107`	`}`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`if ($source === $this->defaultSource) {`
`110`	`111`	`Logger::info("core:SourceIPSelector: no match on client IP; selecting default zone");`
	`112`	`+ $state['sourceIPSelector:zone'] = 'default';`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`return $source;`