Merge branch 'hotfix-6.0.2' into stable

pixl8 · Apr 4, 2024 · f0f5003 · f0f5003
2 parents 3a276bf + 92012f3
commit f0f5003
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v6.0.2
+
+* Fix issue where Service provider single logout binding was taking too much space in DB and failing db migration
+* Give data migration a name to ensure it happens sooner rather than later during db migration routines
+
 ## v6.0.1
 
 * Fix issue where organisation short name setting containing spaces would crash server on certificate generation

diff --git a/handlers/admin/datamanager/Saml2DataManagerBase.cfc b/handlers/admin/datamanager/Saml2DataManagerBase.cfc
@@ -87,7 +87,7 @@ component extends="preside.system.base.EnhancedDataManagerBase" {
 
 		if ( isFeatureEnabled( "samlSsoProviderSlo" ) ) {
 			data.single_logout_location = meta.serviceProviderSsoRequirements.logoutService.location ?: "";
-			data.single_logout_binding  = ListLast( meta.serviceProviderSsoRequirements.logoutService.binding ?: "" );
+			data.single_logout_binding  = ListLast( meta.serviceProviderSsoRequirements.logoutService.binding ?: "", ":" );
 		}
 
 		if ( !_validateMeta( argumentCollection=arguments, objectName="saml2_sp", data=data ) ) {

diff --git a/handlers/dbmigrations/Saml6Overhaul.cfc → handlers/dbmigrations/aaaSaml6Overhaul.cfc b/handlers/dbmigrations/Saml6Overhaul.cfc → handlers/dbmigrations/aaaSaml6Overhaul.cfc
@@ -6,7 +6,11 @@ component {
 	property name="saml2LegacyMigrationService" inject="saml2LegacyMigrationService";
 
 	private boolean function runAsync() {
-		saml2LegacyMigrationService.migrate();
+		var alreadyRun = getPresideObject( "db_migration_history" ).dataExists( filter={ migration_key="Saml6Overhaul-async" } );
+
+		if ( !alreadyRun ) {
+			saml2LegacyMigrationService.migrate();
+		}
 
 		return true;
 	}

diff --git a/services/saml/util/Saml2LegacyMigrationService.cfc b/services/saml/util/Saml2LegacyMigrationService.cfc
@@ -123,7 +123,7 @@ component {
 
 		if ( $isFeatureEnabled( "samlSsoProviderSlo" ) ) {
 			newSp.single_logout_location = meta.serviceProviderSsoRequirements.logoutService.location ?: "";
-			newSp.single_logout_binding  = ListLast( meta.serviceProviderSsoRequirements.logoutService.binding ?: "" );
+			newSp.single_logout_binding  = ListLast( meta.serviceProviderSsoRequirements.logoutService.binding ?: "", ":" );
 		}
 
 		return newSp;