libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

[KEYCLOAK-13036] Fix KeycloakElytronCSVaultTest failures on IBM JDK

Browse source 
- credential store is generated on the fly for the test, avoiding incompatibilities between implementations of keystores
This commit is contained in:
Stefan Guilhen 2020-03-12 15:08:06 -03:00 committed by Hynek Mlnařík
parent aece5d1b4c
commit 8c627fdb20
4 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/credential-store.p12
View file

Binary file not shown.

1
testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml
View file

@ -243,7 +243,6 @@
<include>master_ldap__bindCredential</include>
<include>test_ldap__bindCredential</include>
<include>admin-client-test_ldap__bindCredential</include>
<include>credential-store.p12</include>
</includes>
</resource>
</resources>

47
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/EnableVault.java
View file

@ -29,29 +29,56 @@ import java.lang.annotation.Target;
@Target({ElementType.TYPE})
public @interface EnableVault {
;
enum PROVIDER_ID {
PLAINTEXT("files-plaintext", "/subsystem=keycloak-server/spi=vault/provider=files-plaintext/:add(enabled=true, " +
"properties={dir => \"${jboss.home.dir}/standalone/configuration/vault\"})"),
PLAINTEXT("files-plaintext",
new String[] {
"/subsystem=keycloak-server/spi=vault/provider=files-plaintext/:add(enabled=true, " +
"properties={dir => \"${jboss.home.dir}/standalone/configuration/vault\"})"},
new String[] {}),
ELYTRON_CS_KEYSTORE("elytron-cs-keystore",
new String[] {
// create and populate an elytron credential store on the fly.
"/subsystem=elytron/credential-store=test-cred-store:add(location=standalone/configuration/vault/cred-store.jceks, create=true," +
"relative-to=jboss.home.dir, credential-reference={clear-text => \"secretpwd1!\"})",
"/subsystem=elytron/credential-store=test-cred-store:add-alias(alias=master_smtp__key, secret-value=secure_master_smtp_secret)",
"/subsystem=elytron/credential-store=test-cred-store:add-alias(alias=test_smtp__key, secret-value=secure_test_smtp_secret)",
// create the elytron-cs-keystore provider (using the masked form of the credential store password.
"/subsystem=keycloak-server/spi=vault/provider=elytron-cs-keystore/:add(enabled=true, " +
"properties={location => \"${jboss.home.dir}/standalone/configuration/vault/cred-store.jceks\", " +
"secret => \"MASK-2RukbhkyMOXq1WzXkcUcuK;abcd9876;321\", keyStoreType => \"JCEKS\"})"},
new String[] {
// remove the aliases from the credential store.
"/subsystem=elytron/credential-store=test-cred-store:remove-alias(alias=test_smtp__key)",
"/subsystem=elytron/credential-store=test-cred-store:remove-alias(alias=master_smtp__key)",
// remove the elytron credential store.
"/subsystem=elytron/credential-store=test-cred-store:remove"
});
ELYTRON_CS_KEYSTORE("elytron-cs-keystore", "/subsystem=keycloak-server/spi=vault/provider=elytron-cs-keystore/:add(enabled=true, " +
"properties={location => \"${jboss.home.dir}/standalone/configuration/vault/credential-store.p12\", " +
"secret => \"MASK-3u2HNQaMogJJ8VP7J6gRIl;12345678;321\", keyStoreType => \"PKCS12\"})");
final String name;
final String cliInstallationCommand;
final String[] cliInstallationCommands;
final String[] cliRemovalCommands;
PROVIDER_ID(final String name, final String cliInstallationCommand) {
PROVIDER_ID(final String name, final String[] cliInstallationCommands, final String[] cliRemovalCommands) {
this.name = name;
this.cliInstallationCommand = cliInstallationCommand;
this.cliInstallationCommands = cliInstallationCommands;
this.cliRemovalCommands = cliRemovalCommands;
}
public String getName() {
return this.name;
}
public String getCliInstallationCommand() {
return this.cliInstallationCommand;
public String[] getCliInstallationCommands() {
return this.cliInstallationCommands;
}
public String[] getCliRemovalCommands() {
return this.cliRemovalCommands;
}
};

7
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/VaultUtils.java
View file

@ -40,7 +40,9 @@ public class VaultUtils {
OnlineManagementClient client = AuthServerTestEnricher.getManagementClient();
// configure the selected provider and set it as the default vault provider.
client.execute("/subsystem=keycloak-server/spi=vault/:add(default-provider=" + provider.getName() + ")");
client.execute(provider.getCliInstallationCommand());
for (String command : provider.getCliInstallationCommands()) {
client.execute(command);
}
client.close();
}
}
@ -50,6 +52,9 @@ public class VaultUtils {
System.setProperty("keycloak.vault." + provider.getName() + ".provider.enabled", "false");
} else {
OnlineManagementClient client = AuthServerTestEnricher.getManagementClient();
for (String command : provider.getCliRemovalCommands()) {
client.execute(command);
}
client.execute("/subsystem=keycloak-server/spi=vault/:remove");
client.close();
}