fix: optionaly protect health endpoint (#3625)

* wip Signed-off-by: at670475 <[email protected]> * fix * remove copy-pasted code from spring common 3.1 Signed-off-by: ac892247 <[email protected]> * conditionally protect health endpoint Signed-off-by: ac892247 <[email protected]> * validate authentication with integration test Signed-off-by: ac892247 <[email protected]> * update validation schema with new parameter Signed-off-by: ac892247 <[email protected]> * verify that application/health is accessible by default Signed-off-by: ac892247 <[email protected]> * Update schemas/gateway-schema.json Co-authored-by: Pablo Carle <[email protected]> Signed-off-by: achmelo <[email protected]> --------- Signed-off-by: at670475 <[email protected]> Signed-off-by: ac892247 <[email protected]> Signed-off-by: achmelo <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> Co-authored-by: Pablo Carle <[email protected]>
zowe · Jul 1, 2024 · 204e120 · 204e120
1 parent 61fea29
commit 204e120
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 696 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -65,6 +65,7 @@ jobs:
                 image: ghcr.io/balhar-jakub/gateway-service:${{ github.run_id }}-${{ github.run_number }}
                 env:
                     APIML_SECURITY_AUTH_JWT_CUSTOMAUTHHEADER: customJwtHeader
+                    APIML_GATEWAY_HEALTH_PROTECTED: true
                     APIML_SECURITY_AUTH_PASSTICKET_CUSTOMUSERHEADER: customUserHeader
                     APIML_SECURITY_AUTH_PASSTICKET_CUSTOMAUTHHEADER: customPassticketHeader
                     ZWE_CONFIGS_APIML_SERVICE_ADDITIONALREGISTRATION_0_DISCOVERYSERVICEURLS: https://discovery-service-2:10011/eureka
@@ -671,6 +672,7 @@ jobs:
                 image: ghcr.io/balhar-jakub/gateway-service:${{ github.run_id }}-${{ github.run_number }}
                 env:
                     APIML_SECURITY_AUTH_JWT_CUSTOMAUTHHEADER: customJwtHeader
+                    APIML_GATEWAY_HEALTH_PROTECTED: true
                     APIML_SECURITY_AUTH_PASSTICKET_CUSTOMUSERHEADER: customUserHeader
                     APIML_SECURITY_AUTH_PASSTICKET_CUSTOMAUTHHEADER: customPassticketHeader
             mock-services:

diff --git a/...n/java/org/zowe/apiml/product/compatibility/ApimlDiscoveryCompositeHealthContributor.java b/...n/java/org/zowe/apiml/product/compatibility/ApimlDiscoveryCompositeHealthContributor.java
diff --git a/apiml-common/src/main/java/org/zowe/apiml/product/compatibility/ApimlHealthCheckHandler.java b/apiml-common/src/main/java/org/zowe/apiml/product/compatibility/ApimlHealthCheckHandler.java
diff --git a/...va/org/zowe/apiml/product/compatibility/ApimlDiscoveryCompositeHealthContributorTest.java b/...va/org/zowe/apiml/product/compatibility/ApimlDiscoveryCompositeHealthContributorTest.java