Merge pull request #215 from OndrejKotek/fixes-3.7.7

Stabilization fixes for 3.7.7

Author: kstekovi

resources-subsystem-fixtures/src/main/java/org/jboss/hal/testsuite/fixtures/ManagementSslFixtures.java

@@ -7,13 +7,15 @@
 import static org.jboss.hal.dmr.ModelDescriptionConstants.KEY_STORE;
 import static org.jboss.hal.dmr.ModelDescriptionConstants.NAME;
 import static org.jboss.hal.dmr.ModelDescriptionConstants.PATH;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.RELATIVE_TO;
 
 public final class ManagementSslFixtures {
 
     public static final String
         KEY_STORE_NAME = Ids.build(KEY_STORE, NAME),
         KEY_STORE_PASSWORD = Ids.build(KEY_STORE, "password"),
         KEY_STORE_PATH = Ids.build(KEY_STORE, PATH),
+        KEY_STORE_RELATIVE_TO = Ids.build(KEY_STORE, RELATIVE_TO),
         KEY_DN_ORGANIZATION = "key-dn-organization",
         HAL = "HAL",
         CREDENTIAL_REFERENCE_CLEAR_TEXT_ATTR = CREDENTIAL_REFERENCE + "." + CLEAR_TEXT,

tests-configuration-elytron/src/test/java/org/jboss/hal/testsuite/test/configuration/elytron/ssl/KeyStoreTest.java

@@ -74,6 +74,7 @@ public class KeyStoreTest {
     private static final String EXPORTED_CERT_FILENAME = "exported-" + Random.name() + ".cer";
     private static final String EXPORTED_CERT_FILENAME2 = "exported2-" + Random.name() + ".cer";
     private static final String EXPORTED_CSR_FILENAME = "exported-csr-" + Random.name() + ".cer";
+    private static final String RELATIVE_TO_CONFIG_DIR = "jboss.server.config.dir";
 
     private static final String AGREE_TO_TERMS_OF_SERVICE = "agree-to-terms-of-service";
     private static final String STAGING = "staging";
@@ -88,7 +89,7 @@ public static void setUp() throws IOException {
         operations.add(keyStoreAddress(KEY_STORE_NAME), Values.of(ModelDescriptionConstants.TYPE, JKS)
                 .and(ElytronFixtures.CREDENTIAL_REFERENCE, credentialReference)
                 .and(ModelDescriptionConstants.PATH, Random.name())
-                .and(ModelDescriptionConstants.RELATIVE_TO, "jboss.server.config.dir")).assertSuccess();
+                .and(ModelDescriptionConstants.RELATIVE_TO, RELATIVE_TO_CONFIG_DIR)).assertSuccess();
         // add a certificate-authority-account
         operations.add(certificateAuthorityAccountAddress(CERTIFICATE_AUTHORITY_ACCOUNT_UPDATE),
                 Values.of(ElytronFixtures.CREDENTIAL_REFERENCE_ALIAS, Random.name())
@@ -98,7 +99,7 @@ public static void setUp() throws IOException {
         operations.add(keyStoreAddress(KEY_STORE_NAME2), Values.of(ModelDescriptionConstants.TYPE, JKS)
                 .and(ElytronFixtures.CREDENTIAL_REFERENCE, credentialReference)
                 .and(ModelDescriptionConstants.PATH, Random.name())
-                .and(ModelDescriptionConstants.RELATIVE_TO, "jboss.server.config.dir")).assertSuccess();
+                .and(ModelDescriptionConstants.RELATIVE_TO, RELATIVE_TO_CONFIG_DIR)).assertSuccess();
         operations.invoke(ModelDescriptionConstants.GENERATE_KEY_PAIR, keyStoreAddress(KEY_STORE_NAME2), Values.of(ModelDescriptionConstants.ALIAS, ALIAS_TO_RENAME)
                 .and(ModelDescriptionConstants.DISTINGUISHED_NAME, "cn=selfsigned")
                 .and(SIGNATURE_ALGORITHM, SHA_256_WITH_RSA)
@@ -117,7 +118,8 @@ public static void setUp() throws IOException {
                 .and(ModelDescriptionConstants.ALGORITHM, RSA)).assertSuccess();
         operations.invoke(ModelDescriptionConstants.STORE, keyStoreAddress(KEY_STORE_NAME2)).assertSuccess();
         operations.invoke(ModelDescriptionConstants.EXPORT_CERTIFICATE, keyStoreAddress(KEY_STORE_NAME2), Values.of(ModelDescriptionConstants.ALIAS, ALIAS_TO_RENAME)
-                .and(ModelDescriptionConstants.PATH, EXPORTED_CERT_FILENAME)).assertSuccess();
+                .and(ModelDescriptionConstants.PATH, EXPORTED_CERT_FILENAME)
+                .and(ModelDescriptionConstants.RELATIVE_TO, RELATIVE_TO_CONFIG_DIR)).assertSuccess();
     }
 
     @AfterClass
@@ -252,6 +254,7 @@ public void importCertificate() {
         AddResourceDialogFragment dialog = console.addResourceDialog();
         dialog.getForm().text(ModelDescriptionConstants.ALIAS, ALIAS_IMPORTED);
         dialog.getForm().text(ModelDescriptionConstants.PATH, EXPORTED_CERT_FILENAME);
+        dialog.getForm().text(ModelDescriptionConstants.RELATIVE_TO, RELATIVE_TO_CONFIG_DIR);
         dialog.getForm().flip(ModelDescriptionConstants.TRUST_CACERTS, true);
         dialog.getForm().flip(ModelDescriptionConstants.VALIDATE, false);
         dialog.getPrimaryButton().click();
@@ -311,6 +314,7 @@ public void exportAliasCertificate() {
 
         AddResourceDialogFragment dialog = console.addResourceDialog();
         dialog.getForm().text(ModelDescriptionConstants.PATH, EXPORTED_CERT_FILENAME2);
+        dialog.getForm().text(ModelDescriptionConstants.RELATIVE_TO, RELATIVE_TO_CONFIG_DIR);
         dialog.getPrimaryButton().click();
         console.verifySuccess();
     }
@@ -341,6 +345,7 @@ public void generateAliasCSR() {
 
         AddResourceDialogFragment dialog = console.addResourceDialog();
         dialog.getForm().text(ModelDescriptionConstants.PATH, EXPORTED_CSR_FILENAME);
+        dialog.getForm().text(ModelDescriptionConstants.RELATIVE_TO, RELATIVE_TO_CONFIG_DIR);
         dialog.getPrimaryButton().click();
         console.verifySuccess();
     }

tests-configuration-undertow/src/test/java/org/jboss/hal/testsuite/test/configuration/undertow/application/security/domain/SingleSignOnAddTest.java

@@ -86,7 +86,7 @@ public void create() throws Exception {
             page.getSingleSignOnForm(), formFragment -> {
                 formFragment.text(ApplicationSecurityDomainFixtures.SINGLE_SIGN_ON_KEY_ALIAS, keyAlias);
                 formFragment.text(ApplicationSecurityDomainFixtures.SINGLE_SIGN_ON_KEY_STORE, KEY_STORE_TO_BE_ADDED);
-                formFragment.text(ElytronFixtures.CREDENTIAL_REFERENCE_CLEAR_TEXT, clearTextValue);
+                formFragment.text(ElytronFixtures.CREDENTIAL_REFERENCE + ElytronFixtures.CREDENTIAL_REFERENCE_CLEAR_TEXT, clearTextValue);
             }, resourceVerifier -> {
                 resourceVerifier.verifyAttribute(ApplicationSecurityDomainFixtures.SINGLE_SIGN_ON_KEY_ALIAS, keyAlias);
                 resourceVerifier.verifyAttribute(ApplicationSecurityDomainFixtures.SINGLE_SIGN_ON_KEY_STORE,

tests-configuration-undertow/src/test/java/org/jboss/hal/testsuite/test/configuration/undertow/server/listener/HTTPSListenerSSLTest.java

@@ -67,6 +67,7 @@
 import static org.jboss.hal.testsuite.fixtures.ManagementSslFixtures.KEY_STORE_NAME;
 import static org.jboss.hal.testsuite.fixtures.ManagementSslFixtures.KEY_STORE_PASSWORD;
 import static org.jboss.hal.testsuite.fixtures.ManagementSslFixtures.KEY_STORE_PATH;
+import static org.jboss.hal.testsuite.fixtures.ManagementSslFixtures.KEY_STORE_RELATIVE_TO;
 import static org.jboss.hal.testsuite.fixtures.ManagementSslFixtures.NOT_REQUESTED;
 import static org.jboss.hal.testsuite.fixtures.ManagementSslFixtures.PASS;
 import static org.jboss.hal.testsuite.fixtures.ManagementSslFixtures.SSL_SESSION_CACHE_SIZE;
@@ -234,6 +235,7 @@ public void enableObtainFromLetsEncrypt() throws Exception {
             keyStoreNameValue = Ids.build(KEY_STORE, NAME, Random.name()),
             keyStorePasswordValue = Ids.build(KEY_STORE, PASS, Random.name()),
             keyStorePathValue = Ids.build(KEY_STORE, PATH, Random.name()),
+            keyStoreRelativeToValue = "jboss.server.config.dir",
             keyAliasValue = Ids.build(KEY_ALIAS, Random.name()),
             keyManagerValue = Ids.build(KEY_MANAGER, Random.name()),
             caaName = Ids.build(CERTIFICATE_AUTHORITY_ACCOUNT, Random.name()),
@@ -265,6 +267,7 @@ public void enableObtainFromLetsEncrypt() throws Exception {
                 .editTextFiringExtraChangeEvent(KEY_STORE_NAME, keyStoreNameValue)
                 .editTextFiringExtraChangeEvent(KEY_STORE_PASSWORD, keyStorePasswordValue)
                 .editTextFiringExtraChangeEvent(KEY_STORE_PATH, keyStorePathValue)
+                .editTextFiringExtraChangeEvent(KEY_STORE_RELATIVE_TO, keyStoreRelativeToValue)
                 .editTextFiringExtraChangeEvent(KEY_ALIAS, keyAliasValue)
                 .editTextFiringExtraChangeEvent(KEY_MANAGER, keyManagerValue)
                 .editTextFiringExtraChangeEvent(SERVER_SSL_CONTEXT, serverSslContextValue)