feat(config-api): testng framework wip

Signed-off-by: pujavs <[email protected]>
JanssenProject · Dec 18, 2024 · d9fc6b6 · d9fc6b6
2 parents 98712a2 + 498b82a
commit d9fc6b6
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 35 deletions.
diff --git a/docker-jans-config-api/Dockerfile b/docker-jans-config-api/Dockerfile
@@ -102,6 +102,7 @@ RUN cd /tmp/jans \
     && cp ${JANS_SETUP_DIR}/templates/jans-config-api/config.ldif /app/templates/jans-config-api/ \
     && cp ${JANS_SETUP_DIR}/templates/jans-config-api/dynamic-conf.json /app/templates/jans-config-api/ \
     && cp ${JANS_SETUP_DIR}/setup_app/utils/printVersion.py /opt/jans/bin/printVersion.py \
+    && chmod +x /opt/jans/bin/printVersion.py \
     && ln -s /opt/jans/bin/printVersion.py /opt/jans/bin/show_version.py \
     && cp ${JANS_CONFIG_API_RESOURCES}/config-api-rs-protect.json /app/templates/jans-config-api/ \
     && mkdir -p org/eclipse/jetty \
@@ -237,6 +238,8 @@ COPY templates /app/templates/
 RUN cp /app/templates/jans-config-api/jans-config-api.xml ${JETTY_BASE}/jans-config-api/webapps/
 COPY scripts /app/scripts
 RUN chmod +x /app/scripts/entrypoint.sh
+RUN chmod +x /app/scripts/external_healthcheck.py \
+    && ln -s /app/scripts/external_healthcheck.py /opt/jans/bin/jans_services_status.py
 
 # unquote apiApprovedIssuer
 RUN sed -i 's/"${apiApprovedIssuer}"/${apiApprovedIssuer}/g' /app/templates/jans-config-api/dynamic-conf.json

diff --git a/docker-jans-config-api/scripts/external_healthcheck.py b/docker-jans-config-api/scripts/external_healthcheck.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+import json
+
+import requests
+
+from jans.pycloudlib import get_manager
+
+
+def poll_healthchecks(manager):
+    import urllib3
+
+    hostname = manager.config.get("hostname")
+    statuses = {}
+
+    for comp, endpoint, status_code_only in [
+        ("jans-auth", "/jans-auth/sys/health-check", False),
+        ("jans-lock", "/jans-auth/sys/health-check", False),
+        ("jans-config-api", "/jans-config-api/api/v1/health/live", False),
+        ("jans-casa", "/jans-casa/health-check", False),
+        ("jans-fido2", "/jans-fido2/sys/health-check", False),
+        ("jans-scim", "/jans-scim/sys/health-check", False),
+        ("jans-link", "/jans-link/sys/health-check", False),
+        # healthcheck endpoint for KC is bind to internal port 9000,
+        # hence we poll the public endpoint instead
+        ("keycloak", "/kc", True),
+    ]:
+        # default component status
+        status = "Down"
+
+        scheme = "https"
+        verify = False
+
+        if scheme == "https" and verify is False:
+            urllib3.disable_warnings()
+
+        resp = requests.get(f"{scheme}://{hostname}{endpoint}", timeout=5, verify=verify)
+
+        if resp.ok:
+            if status_code_only:
+                status = "Running"
+            else:
+                try:
+                    if comp == "jans-lock":
+                        healthcheck_data = resp.json().get("jans-lock", {"status": status})
+                    else:
+                        healthcheck_data = resp.json()
+
+                    if healthcheck_data["status"].lower() in ("running", "up"):
+                        status = "Running"
+
+                # response from server is not JSON
+                except requests.exceptions.JSONDecodeError:
+                    if resp.text.lower() == "ok":
+                        status = "Running"
+
+        # finalized statuses
+        statuses[comp] = status
+
+    return json.dumps(statuses)
+
+
+if __name__ == "__main__":
+    manager = get_manager()
+    print(poll_healthchecks(manager))
diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml
@@ -9303,19 +9303,19 @@ components:
           type: string
         selected:
           type: boolean
-        adminCanAccess:
-          type: boolean
-        userCanAccess:
+        whitePagesCanView:
           type: boolean
         adminCanView:
           type: boolean
-        adminCanEdit:
+        userCanView:
           type: boolean
         userCanEdit:
           type: boolean
-        userCanView:
+        adminCanEdit:
           type: boolean
-        whitePagesCanView:
+        adminCanAccess:
+          type: boolean
+        userCanAccess:
           type: boolean
         baseDn:
           type: string
@@ -10177,6 +10177,8 @@ components:
           type: boolean
         lockMessageConfig:
           $ref: '#/components/schemas/LockMessageConfig'
+        fapi:
+          type: boolean
         allResponseTypesSupported:
           uniqueItems: true
           type: array
@@ -10186,8 +10188,6 @@ components:
             - code
             - token
             - id_token
-        fapi:
-          type: boolean
     AuthenticationFilter:
       required:
       - baseDn

diff --git a/...ins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/model/user/CustomUser.java b/...ins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/model/user/CustomUser.java
@@ -59,10 +59,8 @@ public void setUserPassword(String userPassword) {
     @Override
     public String toString() {
         return "CustomUser [inum=" + inum + ", mail=" + mail + ", displayName=" + displayName 
-                + ", givenName=" + givenName + ", userPassword=" + userPassword + "]";
+                + ", givenName=" + givenName + "]";
     }
 
-
-
-
+
 }
diff --git a/...er-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/model/user/UserPatchRequest.java b/...er-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/model/user/UserPatchRequest.java
@@ -34,6 +34,6 @@ public void setCustomAttributes(List<CustomObjectAttribute> customAttributes) {
 
     @Override
     public String toString() {
-        return "UserPatchRequest [jsonPatchString=" + jsonPatchString + ", customAttributes=" + customAttributes + "]";
+        return "UserPatchRequest [jsonPatchString=" + jsonPatchString + "]";
     }
 }