Add allowOriginLoop yaml configuration option

cloudfoundry · Jul 12, 2024 · 341bb3d · 341bb3d
1 parent bcf65db
commit 341bb3d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/zone/UserConfig.java b/model/src/main/java/org/cloudfoundry/identity/uaa/zone/UserConfig.java
@@ -31,7 +31,7 @@ public class UserConfig {
 
     private boolean checkOriginEnabled;
 
-    private boolean allowAllOrigins = true;
+    private boolean allowOriginLoop = true;
 
     public List<String> getDefaultGroups() {
         return defaultGroups;
@@ -81,11 +81,11 @@ public void setCheckOriginEnabled(boolean checkOriginEnabled) {
         this.checkOriginEnabled = checkOriginEnabled;
     }
 
-    public boolean isAllowAllOrigins() {
-        return this.allowAllOrigins;
+    public boolean isAllowOriginLoop() {
+        return this.allowOriginLoop;
     }
 
-    public void setAllowAllOrigins(final boolean allowAllOrigins) {
-        this.allowAllOrigins = allowAllOrigins;
+    public void setAllowOriginLoop(final boolean allowAllOrigins) {
+        this.allowOriginLoop = allowAllOrigins;
     }
 }
diff --git a/.../java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfigurator.java b/.../java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfigurator.java
@@ -147,7 +147,7 @@ private int isOriginLoopAllowed(String zoneId, int checkDone) {
         } else {
             idzConfig = identityZoneProvisioning.retrieve(zoneId).getConfig();
         }
-        return (idzConfig == null || Optional.of(idzConfig.getUserConfig()).map(UserConfig::isAllowAllOrigins).orElse(true)) ? 1 : 0;
+        return (idzConfig == null || Optional.of(idzConfig.getUserConfig()).map(UserConfig::isAllowOriginLoop).orElse(true)) ? 1 : 0;
     }
 
     @Override

diff --git a/.../org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfiguratorTests.java b/.../org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfiguratorTests.java
@@ -227,7 +227,7 @@ void retrieve_by_issuer_not_found_error() throws Exception {
 
         String issuer = "https://accounts.google.com";
         IdentityZone extraZone = IdentityZone.getUaa();
-        extraZone.getConfig().getUserConfig().setAllowAllOrigins(false);
+        extraZone.getConfig().getUserConfig().setAllowOriginLoop(false);
         when(identityZoneManager.getCurrentIdentityZoneId()).thenReturn(IdentityZone.getUaaZoneId());
         when(identityZoneManager.getCurrentIdentityZone()).thenReturn(extraZone);
         assertThrowsWithMessageThat(
@@ -243,7 +243,7 @@ void retrieve_by_issuer_null_error() throws Exception {
 
         String issuer = "https://accounts.google.com";
         IdentityZone extraZone = IdentityZone.getUaa();
-        extraZone.getConfig().getUserConfig().setAllowAllOrigins(false);
+        extraZone.getConfig().getUserConfig().setAllowOriginLoop(false);
         when(identityZoneManager.getCurrentIdentityZoneId()).thenReturn(IdentityZone.getUaaZoneId());
         when(identityZoneManager.getCurrentIdentityZone()).thenReturn(extraZone);
         assertThrowsWithMessageThat(

diff --git a/uaa/src/main/webapp/WEB-INF/spring-servlet.xml b/uaa/src/main/webapp/WEB-INF/spring-servlet.xml
@@ -458,6 +458,7 @@
         <property name="allowedGroups" value="${login.allowedGroups:#{null}}"/>
         <property name="checkOriginEnabled" value="${login.checkOriginEnabled:false}"/>
         <property name="maxUsers" value="${login.maxUsers:-1}"/>
+        <property name="allowOriginLoop" value="${login.allowOriginLoop:true}"/>
     </bean>
 
     <bean id="identityZoneConfigurationBootstrap"