From 5925f6105f61ac9c2bc6165ca0d469fe3c932e40 Mon Sep 17 00:00:00 2001 From: Peter Skopek Date: Wed, 19 Apr 2017 22:25:09 +0200 Subject: [PATCH] [WFLY-8602] configuration changes because of URI attribute removal from credntial store resource --- .../CredentialStoreServerSetupTask.java | 5 ++-- .../elytron/modify-elytron-config.cli | 4 +-- testsuite/integration/pom.xml | 11 +++++++- .../common/elytron/SimpleCredentialStore.java | 25 ++++++++++--------- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/security/credentialreference/CredentialStoreServerSetupTask.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/security/credentialreference/CredentialStoreServerSetupTask.java index 839876b28bf1..57b012d5d8fa 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/security/credentialreference/CredentialStoreServerSetupTask.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/security/credentialreference/CredentialStoreServerSetupTask.java @@ -18,7 +18,6 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RELATIVE_TO; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.URI; import static org.jboss.as.controller.security.CredentialReference.ALIAS; import static org.jboss.as.controller.security.CredentialReference.CREDENTIAL_REFERENCE; @@ -58,7 +57,9 @@ public void tearDown(ManagementClient managementClient, String s) throws Excepti private void createCredentialStore(final ModelControllerClient client) throws IOException { final ModelNode addOperation = Operations.createAddOperation(CREDENTIAL_STORE_ADDRESS.toModelNode()); - addOperation.get(URI).set("cr-store://test/store001.jceks?create=true;keyStoreType=JCEKS;modifiable=true"); + addOperation.get("create").set("true"); + addOperation.get("modifiable").set("true"); + addOperation.get("location").set("store001.jceks"); addOperation.get(RELATIVE_TO).set("jboss.server.data.dir"); final ModelNode credentialReference = addOperation.get(CREDENTIAL_REFERENCE).setEmptyObject(); credentialReference.get("clear-text").set("joshua"); diff --git a/testsuite/integration/elytron/modify-elytron-config.cli b/testsuite/integration/elytron/modify-elytron-config.cli index b324a9cd9461..7a8eec726d60 100644 --- a/testsuite/integration/elytron/modify-elytron-config.cli +++ b/testsuite/integration/elytron/modify-elytron-config.cli @@ -47,8 +47,8 @@ embed-server --admin-only=true /subsystem=elytron/filesystem-realm=ApplicationFsRealm/identity=guest:add-attribute(name=groups, value=["guest"]) # Create some test credential store entries (aliases) - they will be checked by CredentialStoreTestCase -# The keystore file for the credential store is created by keytool maven plugin in pom.xml. -/subsystem=elytron/credential-store=cred-store-default:add(uri="cr-store://cred-store-default/cred-store.jceks?keyStoreType=JCEKS;modifiable=true", relative-to=jboss.server.config.dir, credential-reference={clear-text=password}) +# The keystore file for the credential store is created by keytool maven plugin in pom.xml. +/subsystem=elytron/credential-store=cred-store-default:add(location=cred-store.jceks, modifiable=true, relative-to=jboss.server.config.dir, credential-reference={clear-text=password}) /subsystem=elytron/credential-store=cred-store-default/alias=alias-password:add(secret-value=password) /subsystem=elytron/credential-store=cred-store-default/alias=alias-secret:add(secret-value=secret) /subsystem=elytron/credential-store=cred-store-default:remove() diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml index a32bde3af041..ef048ef6603e 100644 --- a/testsuite/integration/pom.xml +++ b/testsuite/integration/pom.xml @@ -211,7 +211,16 @@ legacy - + + + + ts.integ.group.elytron + ts.elytron + + elytron + + + elytron.profile diff --git a/testsuite/shared/src/main/java/org/wildfly/test/security/common/elytron/SimpleCredentialStore.java b/testsuite/shared/src/main/java/org/wildfly/test/security/common/elytron/SimpleCredentialStore.java index 92a7b2788756..c003535afed8 100644 --- a/testsuite/shared/src/main/java/org/wildfly/test/security/common/elytron/SimpleCredentialStore.java +++ b/testsuite/shared/src/main/java/org/wildfly/test/security/common/elytron/SimpleCredentialStore.java @@ -60,33 +60,34 @@ private SimpleCredentialStore(Builder builder) { @Override public void create(CLIWrapper cli) throws Exception { - // /subsystem=elytron/credential-store=test:add(uri="cr-store://foo/a?create=true;keyStoreType=JCEKS;modifiable=true", + // /subsystem=elytron/credential-store=test:add(location=a,create=true,modifiable=true,implementation-properties={"keyStoreType"=>"JCEKS"}, // credential-reference={clear-text=pass123}) final StringBuilder sb = new StringBuilder("/subsystem=elytron/credential-store="); - sb.append(name).append(":add(").append("uri=\"cr-store://").append(name).append("/") + sb.append(name).append(":add(").append("location=") .append(escapePath(keyStorePath.getPath())); - char separator = '?'; if (create != null) { - sb.append(separator).append("create=").append(create.toString()); - separator = ';'; + sb.append(",").append("create=").append(create.toString()); } if (modifiable != null) { - sb.append(separator).append("modifiable=").append(modifiable.toString()); - separator = ';'; + sb.append(",").append("modifiable=").append(modifiable.toString()); } + if (keyStoreType != null) { - sb.append(separator).append("keyStoreType=").append(keyStoreType); - separator = ';'; + sb.append(",") + .append("implementation-properties={") + .append("\"keyStoreType\"=>\"") + .append(keyStoreType) + .append("\"}"); } - sb.append("\", "); + if (credential != null) { - sb.append(credential.asString()); + sb.append(",").append(credential.asString()); } if (isNotBlank(keyStorePath.getRelativeTo())) { - sb.append("relative-to=\"").append(keyStorePath.getRelativeTo()).append("\""); + sb.append(",").append("relative-to=\"").append(keyStorePath.getRelativeTo()).append("\""); } sb.append(")"); cli.sendLine(sb.toString());