Merge branch 'hotfix-6.0.1' into stable

pixl8 · Mar 20, 2024 · 3a276bf · 3a276bf
2 parents 2511b39 + ecab6f6
commit 3a276bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v6.0.1
+
+* Fix issue where organisation short name setting containing spaces would crash server on certificate generation
+
 ## v6.0.0
 
 Extension overhaul:

diff --git a/services/saml/signing/SamlCertificateService.cfc b/services/saml/signing/SamlCertificateService.cfc
@@ -29,6 +29,8 @@ component {
 		var password     = CreateUUId();
 		var keyToolArgs  = '-genkeypair -validity #arguments.expiryDays# -alias #certAlias# -keyalg RSA -storetype JKS -keystore #filePath# -storepass #password# -keysize 2048 -keypass #certPassword# -dname CN=#arguments.cn#'.split( "\s+" );
 
+		// TODO, replace this with a java lib for generating the keypair
+		// should keytool fail, it crashes the server :o
 		DirectoryCreate( GetDirectoryFromPath( filePath ), true, true );
 		CreateObject( "java", "sun.security.tools.keytool.Main" ).main( keyToolArgs );
 
@@ -50,7 +52,9 @@ component {
 	}
 
 	private string function _getCnForCertificates() {
-		return samlProviderMetadataGenerator.getMetaDataSettings().organisation_short_name;
+		var shortName = samlProviderMetadataGenerator.getMetaDataSettings().organisation_short_name;
+
+		return ReReplace( shortName, "\s+", "-", "all" );
 	}
 
 }