Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/Config.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ component {
var settings = arguments.config.settings ?: {};

settings.saml2 = {};
settings.saml2.keySize = Val( settings.env.SAML2_KEY_SIZE ?: 2048 );

_configureExtensionSettings( settings );
_configureFeatures( settings );
Expand Down
5 changes: 3 additions & 2 deletions services/saml/signing/SamlCertificateService.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
component {

property name="samlProviderMetadataGenerator" inject="delayedInjector:samlProviderMetadataGenerator";
property name="configuredKeySize" inject="coldbox:setting:saml2.keySize";

// CONSTRUCTOR
public any function init() {
Expand All @@ -22,12 +23,12 @@ component {
};
}

public struct function generateKeyPair( expiryDays=7300, cn=_getCnForCertificates() ) {
public struct function generateKeyPair( expiryDays=7300, cn=_getCnForCertificates(), keySize=configuredKeySize ) {
var filePath = ExpandPath( "/uploads/saml2/tmpkeystore#CreateUUId()#" );
var certAlias = "generated";
var certPassword = CreateUUId();
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+" );
var keyToolArgs = '-genkeypair -validity #arguments.expiryDays# -alias #certAlias# -keyalg RSA -storetype JKS -keystore #filePath# -storepass #password# -keysize #arguments.keySize# -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
Expand Down