chore: cherry pick from v2 (#3633)

---------

Signed-off-by: Pablo Hernán Carle <[email protected]>
Signed-off-by: ac892247 <[email protected]>
Co-authored-by: Pablo Hernán Carle <[email protected]>
Co-authored-by: achmelo <[email protected]>

api-catalog-package/src/main/resources/bin/start.sh

@@ -162,6 +162,7 @@ fi
 
 keystore_type="${ZWE_configs_certificate_keystore_type:-${ZWE_zowe_certificate_keystore_type:-PKCS12}}"
 keystore_pass="${ZWE_configs_certificate_keystore_password:-${ZWE_zowe_certificate_keystore_password}}"
+key_alias="${ZWE_configs_certificate_keystore_alias:-${ZWE_zowe_certificate_keystore_alias}}"
 key_pass="${ZWE_configs_certificate_key_password:-${ZWE_zowe_certificate_key_password:-${keystore_pass}}}"
 truststore_type="${ZWE_configs_certificate_truststore_type:-${ZWE_zowe_certificate_truststore_type:-PKCS12}}"
 truststore_pass="${ZWE_configs_certificate_truststore_password:-${ZWE_zowe_certificate_truststore_password}}"
@@ -180,13 +181,23 @@ keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyring
 truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjcehybrid://_)
 fi
 
+if [ "${ATTLS_ENABLED}" = "true" ]; then
+  keystore_type=
+  keystore_pass=
+  key_pass=
+  key_alias=
+  keystore_location=
+fi
+
 # NOTE: these are moved from below
 #    -Dapiml.service.ipAddress=${ZOWE_IP_ADDRESS:-127.0.0.1} \
 #    -Dapiml.service.preferIpAddress=false \
 
 CATALOG_CODE=AC
+_BPXK_AUTOCVT=OFF
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} java \
     -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \
+    -XX:+ExitOnOutOfMemoryError \
     ${QUICK_START} \
     ${ADD_OPENS} \
     -Dibm.serversocket.recover=true \
@@ -221,12 +232,12 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} java \
     -Dserver.ssl.enabled=${ZWE_configs_server_ssl_enabled:-true}  \
     -Dserver.ssl.protocol=${ZWE_configs_server_ssl_protocol:-"TLSv1.2"}  \
     -Dserver.ssl.keyStore="${keystore_location}" \
-    -Dserver.ssl.keyStoreType="${ZWE_configs_certificate_keystore_type:-${ZWE_zowe_certificate_keystore_type:-PKCS12}}" \
+    -Dserver.ssl.keyStoreType="${keystore_type}" \
     -Dserver.ssl.keyStorePassword="${keystore_pass}" \
-    -Dserver.ssl.keyAlias="${ZWE_configs_certificate_keystore_alias:-${ZWE_zowe_certificate_keystore_alias}}" \
+    -Dserver.ssl.keyAlias="${key_alias}" \
     -Dserver.ssl.keyPassword="${key_pass}" \
     -Dserver.ssl.trustStore="${truststore_location}" \
-    -Dserver.ssl.trustStoreType="${ZWE_configs_certificate_truststore_type:-${ZWE_zowe_certificate_truststore_type:-PKCS12}}" \
+    -Dserver.ssl.trustStoreType="${truststore_type}" \
     -Dserver.ssl.trustStorePassword="${truststore_pass}" \
     -Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
     -Dloader.path=${COMMON_LIB} \

api-catalog-ui/frontend/cypress/e2e/detail-page/swagger-try-out-and-code-snippets.cy.js

@@ -27,9 +27,9 @@ describe('>>> Swagger Try Out and Code Snippets Test', () => {
         {
             tile: 'API Gateway',
             id: 'gateway',
-            selectOp: '#operations-Security-RefreshTokenUsingPOST',
+            selectOp: '#operations-Diagnostic-VersionInfoUsingGET',
             auth: true,
-        }
+        },
     ].forEach((test) => {
         it('Should contain try-out button', () => {
             cy.log(`Visiting ${test.tile}, ${test.id}`);
@@ -43,9 +43,11 @@ describe('>>> Swagger Try Out and Code Snippets Test', () => {
             if (test.auth) {
                 cy.log(`Visiting ${test.tile}, ${test.id}`);
                 cy.contains(test.tile).click();
-                cy.get('.authorization__btn').should('exist');
+                cy.get('#operations-Security-loginUsingPOST .authorization__btn').should('exist');
 
-                cy.get('.authorization__btn').eq(0).click();
+                cy.get('#operations-Security-loginUsingPOST .authorization__btn').should('exist');
+
+                cy.get('#operations-Security-loginUsingPOST .authorization__btn').eq(0).click();
 
                 cy.get('input[name=username]').type('non-valid');
                 cy.get('input[name=password]').type('non-valid');
@@ -54,7 +56,7 @@ describe('>>> Swagger Try Out and Code Snippets Test', () => {
 
                 cy.get('.close-modal').click();
 
-                cy.get('.opblock-summary').eq(0).click();
+                cy.get('#operations-Security-loginUsingPOST .opblock-summary').eq(0).click();
 
                 cy.get('.try-out').click();
 
@@ -67,18 +69,25 @@ describe('>>> Swagger Try Out and Code Snippets Test', () => {
         it('Should execute request and display basic code snippets', () => {
             cy.log(`Visiting ${test.tile}, ${test.id}`);
             cy.contains(test.tile).click();
+
+            cy.viewport(1400, 980);
+
             cy.get('.opblock-control-arrow').eq(1).click();
-            cy.get('.try-out').should('exist');
-            cy.get('.try-out').click();
-
-            cy.get('button.execute').click();
-            cy.get(
-                `${test.selectOp} > div.no-margin > div > div.responses-wrapper > div.responses-inner > div > div > div:nth-child(1) > div:nth-child(1)`
-            ).should('exist');
-            cy.get('div.curl-command > div:nth-child(1) > div:nth-child(1) > h4').should('contain', 'cURL (CMD)');
-            cy.get(
-                `${test.selectOp} > div.no-margin > div > div.responses-wrapper > div.responses-inner > div > div > div:nth-child(1) > div.curl-command > div:nth-child(3) > pre`
-            ).should('exist');
+            cy.get(`${test.selectOp} .opblock-control-arrow`).eq(0).click();
+            cy.get('.try-out__btn').should('exist');
+            cy.get('.try-out__btn').eq(0).click();
+
+            cy.get('.execute').should('exist');
+            cy.get('.execute').click();
+
+            // Snippet open/collaptse element exists
+            cy.get('.request-snippets > div:nth-child(1) > button:nth-child(2)').should('exist');
+
+            // cURL snippet tab exists
+            cy.get('div.btn:nth-child(1) > h4:nth-child(1)').should('contain', 'cURL (CMD)');
+
+            // cURL snippet box exists
+            cy.get('.curl').should('exist');
             cy.get('div.curl-command > div:nth-child(1) > div:nth-child(2)').click();
             cy.get('div.curl-command > div:nth-child(3) > pre').should('exist');
         });

caching-service-package/src/main/resources/bin/start.sh

@@ -144,6 +144,7 @@ fi
 
 keystore_type="${ZWE_configs_certificate_keystore_type:-${ZWE_zowe_certificate_keystore_type:-PKCS12}}"
 keystore_pass="${ZWE_configs_certificate_keystore_password:-${ZWE_zowe_certificate_keystore_password}}"
+key_alias="${ZWE_configs_certificate_keystore_alias:-${ZWE_zowe_certificate_keystore_alias}}"
 key_pass="${ZWE_configs_certificate_key_password:-${ZWE_zowe_certificate_key_password:-${keystore_pass}}}"
 truststore_type="${ZWE_configs_certificate_truststore_type:-${ZWE_zowe_certificate_truststore_type:-PKCS12}}"
 truststore_pass="${ZWE_configs_certificate_truststore_password:-${ZWE_zowe_certificate_truststore_password}}"
@@ -165,9 +166,19 @@ fi
 #   -Dapiml.service.ipAddress=${ZOWE_IP_ADDRESS:-127.0.0.1} \
 #   -Dapiml.service.preferIpAddress=${APIML_PREFER_IP_ADDRESS:-false} \
 
+if [ "${ATTLS_ENABLED}" = "true" ]; then
+  keystore_type=
+  keystore_pass=
+  key_pass=
+  key_alias=
+  keystore_location=
+fi
+
 CACHING_CODE=CS
+_BPXK_AUTOCVT=OFF
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} java \
   -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \
+  -XX:+ExitOnOutOfMemoryError \
   ${QUICK_START} \
   ${ADD_OPENS} \
   -Dibm.serversocket.recover=true \
@@ -197,12 +208,12 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} java \
   -Dserver.ssl.enabled=${ZWE_configs_server_ssl_enabled:-true}  \
   -Dserver.ssl.protocol=${ZWE_configs_server_ssl_protocol:-"TLSv1.2"}  \
   -Dserver.ssl.keyStore="${keystore_location}" \
-  -Dserver.ssl.keyStoreType="${ZWE_configs_certificate_keystore_type:-${ZWE_zowe_certificate_keystore_type:-PKCS12}}" \
+  -Dserver.ssl.keyStoreType="${keystore_type}" \
   -Dserver.ssl.keyStorePassword="${keystore_pass}" \
-  -Dserver.ssl.keyAlias="${ZWE_configs_certificate_keystore_alias:-${ZWE_zowe_certificate_keystore_alias}}" \
+  -Dserver.ssl.keyAlias="${key_alias}" \
   -Dserver.ssl.keyPassword="${key_pass}" \
   -Dserver.ssl.trustStore="${truststore_location}" \
-  -Dserver.ssl.trustStoreType="${ZWE_configs_certificate_truststore_type:-${ZWE_zowe_certificate_truststore_type:-PKCS12}}" \
+  -Dserver.ssl.trustStoreType="${truststore_type}" \
   -Dserver.ssl.trustStorePassword="${truststore_pass}" \
   -Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
   -Djavax.net.debug=${ZWE_configs_sslDebug:-""} \

cloud-gateway-package/src/main/resources/bin/start.sh

@@ -127,8 +127,10 @@ elif [ "${keystore_type}" = "JCEHYBRIDRACFKS" ]; then
 fi
 
 CLOUD_GATEWAY_CODE=CG
+_BPXK_AUTOCVT=OFF
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CLOUD_GATEWAY_CODE} java \
     -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \
+    -XX:+ExitOnOutOfMemoryError \
     ${QUICK_START} \
     ${ADD_OPENS} \
     -Dibm.serversocket.recover=true \

discovery-package/src/main/resources/bin/start.sh

@@ -152,6 +152,7 @@ ADD_OPENS="--add-opens=java.base/java.lang=ALL-UNNAMED
 
 keystore_type="${ZWE_configs_certificate_keystore_type:-${ZWE_zowe_certificate_keystore_type:-PKCS12}}"
 keystore_pass="${ZWE_configs_certificate_keystore_password:-${ZWE_zowe_certificate_keystore_password}}"
+key_alias="${ZWE_configs_certificate_keystore_alias:-${ZWE_zowe_certificate_keystore_alias}}"
 key_pass="${ZWE_configs_certificate_key_password:-${ZWE_zowe_certificate_key_password:-${keystore_pass}}}"
 truststore_type="${ZWE_configs_certificate_truststore_type:-${ZWE_zowe_certificate_truststore_type:-PKCS12}}"
 truststore_pass="${ZWE_configs_certificate_truststore_password:-${ZWE_zowe_certificate_truststore_password}}"
@@ -173,9 +174,19 @@ fi
 # -Dapiml.service.ipAddress=${ZOWE_IP_ADDRESS:-127.0.0.1} \
 # -Dapiml.service.preferIpAddress=${APIML_PREFER_IP_ADDRESS:-false} \
 
+if [ "${ATTLS_ENABLED}" = "true" ]; then
+  keystore_type=
+  keystore_pass=
+  key_pass=
+  key_alias=
+  keystore_location=
+fi
+
 DISCOVERY_CODE=AD
+_BPXK_AUTOCVT=OFF
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${DISCOVERY_CODE} java \
     -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \
+    -XX:+ExitOnOutOfMemoryError \
     ${QUICK_START} \
     ${ADD_OPENS} \
     -Dibm.serversocket.recover=true \
@@ -199,12 +210,12 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${DISCOVERY_CODE} java \
     -Dserver.ssl.enabled=${ZWE_configs_server_ssl_enabled:-true}  \
     -Dserver.ssl.protocol=${ZWE_configs_server_ssl_protocol:-"TLSv1.2"}  \
     -Dserver.ssl.keyStore="${keystore_location}" \
-    -Dserver.ssl.keyStoreType="${ZWE_configs_certificate_keystore_type:-${ZWE_zowe_certificate_keystore_type:-PKCS12}}" \
+    -Dserver.ssl.keyStoreType="${keystore_type}" \
     -Dserver.ssl.keyStorePassword="${keystore_pass}" \
-    -Dserver.ssl.keyAlias="${ZWE_configs_certificate_keystore_alias:-${ZWE_zowe_certificate_keystore_alias}}" \
+    -Dserver.ssl.keyAlias="${key_alias}" \
     -Dserver.ssl.keyPassword="${key_pass}" \
     -Dserver.ssl.trustStore="${truststore_location}" \
-    -Dserver.ssl.trustStoreType="${ZWE_configs_certificate_truststore_type:-${ZWE_zowe_certificate_truststore_type:-PKCS12}}" \
+    -Dserver.ssl.trustStoreType="${truststore_type}" \
     -Dserver.ssl.trustStorePassword="${truststore_pass}" \
     -Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
     -Dloader.path=${DISCOVERY_LOADER_PATH} \

gateway-package/src/main/resources/bin/start.sh

@@ -214,6 +214,7 @@ ADD_OPENS="--add-opens=java.base/java.lang=ALL-UNNAMED
 
 keystore_type="${ZWE_configs_certificate_keystore_type:-${ZWE_zowe_certificate_keystore_type:-PKCS12}}"
 keystore_pass="${ZWE_configs_certificate_keystore_password:-${ZWE_zowe_certificate_keystore_password}}"
+key_alias="${ZWE_configs_certificate_keystore_alias:-${ZWE_zowe_certificate_keystore_alias}}"
 key_pass="${ZWE_configs_certificate_key_password:-${ZWE_zowe_certificate_key_password:-${keystore_pass}}}"
 truststore_type="${ZWE_configs_certificate_truststore_type:-${ZWE_zowe_certificate_truststore_type:-PKCS12}}"
 truststore_pass="${ZWE_configs_certificate_truststore_password:-${ZWE_zowe_certificate_truststore_password}}"
@@ -236,9 +237,19 @@ fi
 #    -Dapiml.service.ipAddress=${ZOWE_IP_ADDRESS:-127.0.0.1} \
 #    -Dapiml.security.auth.jwtKeyAlias=${PKCS11_TOKEN_LABEL:-jwtsecret} \
 
+if [ "${ATTLS_ENABLED}" = "true" ]; then
+  keystore_type=
+  keystore_pass=
+  key_pass=
+  key_alias=
+  keystore_location=
+fi
+
 GATEWAY_CODE=AG
+_BPXK_AUTOCVT=OFF
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} java \
     -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \
+    -XX:+ExitOnOutOfMemoryError \
     ${QUICK_START} \
     ${ADD_OPENS} \
     -Dibm.serversocket.recover=true \
@@ -278,12 +289,12 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} java \
     -Dserver.ssl.enabled=${ZWE_configs_server_ssl_enabled:-true} \
     -Dserver.ssl.protocol=${ZWE_configs_server_ssl_protocol:-"TLSv1.2"}  \
     -Dserver.ssl.keyStore="${keystore_location}" \
-    -Dserver.ssl.keyStoreType="${ZWE_configs_certificate_keystore_type:-${ZWE_zowe_certificate_keystore_type:-PKCS12}}" \
+    -Dserver.ssl.keyStoreType="${keystore_type}" \
     -Dserver.ssl.keyStorePassword="${keystore_pass}" \
-    -Dserver.ssl.keyAlias="${ZWE_configs_certificate_keystore_alias:-${ZWE_zowe_certificate_keystore_alias}}" \
+    -Dserver.ssl.keyAlias="${key_alias}" \
     -Dserver.ssl.keyPassword="${key_pass}" \
     -Dserver.ssl.trustStore="${truststore_location}" \
-    -Dserver.ssl.trustStoreType="${ZWE_configs_certificate_truststore_type:-${ZWE_zowe_certificate_truststore_type:-PKCS12}}" \
+    -Dserver.ssl.trustStoreType="${truststore_type}" \
     -Dserver.ssl.trustStorePassword="${truststore_pass}" \
     -Dserver.internal.enabled=${ZWE_configs_server_internal_enabled:-false} \
     -Dserver.internal.ssl.enabled=${ZWE_configs_server_internal_ssl_enabled:-true} \

integration-tests/src/test/java/org/zowe/apiml/integration/authentication/pat/AccessTokenServiceTest.java

@@ -65,7 +65,7 @@ void setup() throws Exception {
         void givenValidToken_invalidateTheToken() {
             given().contentType(ContentType.JSON).body(bodyContent).when()
                 .delete(REVOKE_ENDPOINT)
-                .then().statusCode(200);
+                .then().statusCode(204);
             given().contentType(ContentType.JSON).body(bodyContent).when()
                 .post(VALIDATE_ENDPOINT)
                 .then().statusCode(401);
@@ -75,7 +75,7 @@ void givenValidToken_invalidateTheToken() {
         void givenTokenInvalidated_returnUnauthorized() {
             given().contentType(ContentType.JSON).body(bodyContent).when()
                 .delete(REVOKE_ENDPOINT)
-                .then().statusCode(200);
+                .then().statusCode(204);
             given().contentType(ContentType.JSON).body(bodyContent).when()
                 .delete(REVOKE_ENDPOINT)
                 .then().statusCode(401);
@@ -87,7 +87,7 @@ void givenMatchingScopes_validateTheToken() throws Exception {
             RestAssured.useRelaxedHTTPSValidation();
             given().contentType(ContentType.JSON).body(bodyContent).when()
                 .post(VALIDATE_ENDPOINT)
-                .then().statusCode(200);
+                .then().statusCode(204);
         }
 
         @Test
@@ -122,7 +122,7 @@ void givenAuthorizedRequest_thenRevokeTokenForUser() {
 //            validate before revocation rule
             given().contentType(ContentType.JSON).body(bodyContent).when()
                 .post(VALIDATE_ENDPOINT)
-                .then().statusCode(200);
+                .then().statusCode(204);
 //            revoke all tokens for USERNAME
             Map<String, String> requestBody = new HashMap<>();
             requestBody.put("userId", SecurityUtils.USERNAME);
@@ -144,7 +144,7 @@ void givenAuthenticatedCall_thenRevokeUserToken() {
 //            validate before revocation rule
             given().contentType(ContentType.JSON).body(bodyContent).when()
                 .post(VALIDATE_ENDPOINT)
-                .then().statusCode(200);
+                .then().statusCode(204);
 //            revoke all tokens for USERNAME
             given().contentType(ContentType.JSON).config(SslContext.clientCertValid)
                 .when().delete(REVOKE_OWN_TOKENS_ENDPOINT)
@@ -167,7 +167,7 @@ void givenAuthorizedRequest_thenRevokeTokensForScope() {
 //            validate before revocation rule
             given().contentType(ContentType.JSON).body(bodyContent).when()
                 .post(VALIDATE_ENDPOINT)
-                .then().statusCode(200);
+                .then().statusCode(204);
 //            revoke all tokens for USERNAME
             Map<String, String> requestBody = new HashMap<>();
             requestBody.put("serviceId", "api-catalog");
@@ -212,7 +212,7 @@ void givenNotAuthorizedCall_thenDontAllowToRevokeTokensForUser() {
 //            validate before revocation rule
             given().contentType(ContentType.JSON).body(bodyContent).when()
                 .post(VALIDATE_ENDPOINT)
-                .then().statusCode(200);
+                .then().statusCode(204);
 //            revoke all tokens for USERNAME
             Map<String, String> requestBody = new HashMap<>();
             requestBody.put("userId", SecurityUtils.USERNAME);
@@ -222,7 +222,7 @@ void givenNotAuthorizedCall_thenDontAllowToRevokeTokensForUser() {
 //            validate after revocation rule
             given().contentType(ContentType.JSON).body(bodyContent).when()
                 .post(VALIDATE_ENDPOINT)
-                .then().statusCode(200);
+                .then().statusCode(204);
         }
     }