feat: healt-check should check script manager initialization status (#…

…8220) feat: healt-check should check script manager initialization status #8219 Signed-off-by: Yuriy Movchan <Yuriy.Movchan@gmail.com>
JanssenProject · Apr 3, 2024 · 02d4cd1 · 02d4cd1
1 parent 853d9f1
commit 02d4cd1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/...ript-catalog/person_authentication/otp-external-authenticator/OtpExternalAuthenticator.py b/...ript-catalog/person_authentication/otp-external-authenticator/OtpExternalAuthenticator.py
@@ -460,7 +460,7 @@ def processOtpAuthentication(self, requestParameters, user, identity, otp_auth_m
                     validation_result = self.validateHotpKey(otp_secret_key, moving_factor, otpCode)
                     if (validation_result != None) and validation_result["result"]:
                         print "OTP. Process HOTP authentication during authentication. otpCode is valid"
-                        
+
                         # Update current moving factor in user entry
                         enrolledAuthenticator.addCustom("movingFactor", moving_factor)
 

diff --git a/...server/server/src/main/java/io/jans/as/server/ws/rs/controller/HealthCheckController.java b/...server/server/src/main/java/io/jans/as/server/ws/rs/controller/HealthCheckController.java
@@ -13,6 +13,7 @@
 import io.jans.as.server.service.external.ExternalDynamicScopeService;
 import io.jans.as.server.service.external.ExternalHealthCheckService;
 import io.jans.orm.PersistenceEntryManager;
+import io.jans.service.custom.script.CustomScriptManager;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.servlet.http.HttpServletRequest;
@@ -50,6 +51,9 @@ public class HealthCheckController {
     @Inject
     private ExternalHealthCheckService externalHealthCheckService;
 
+    @Inject
+    private CustomScriptManager сustomScriptManager;
+
     @GET
     @POST
     @Path("/health-check")
@@ -74,7 +78,7 @@ public String healthCheckController(@Context HttpServletRequest httpRequest, @Co
     }
 
     public String getAppStatus() {
-        if (externalAuthenticationService.isLoaded() && externalDynamicScopeService.isLoaded()) {
+        if (externalAuthenticationService.isLoaded() && externalDynamicScopeService.isLoaded() && сustomScriptManager.isInitialized()) {
         	return "running";
         } else {
         	return "starting";

diff --git a/jans-core/script/src/main/java/io/jans/service/custom/script/CustomScriptManager.java b/jans-core/script/src/main/java/io/jans/service/custom/script/CustomScriptManager.java
@@ -19,16 +19,9 @@
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.context.BeforeDestroyed;
-import jakarta.enterprise.event.Event;
-import jakarta.enterprise.event.Observes;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-import jakarta.servlet.ServletContext;
-
-import io.jans.service.custom.inject.ReloadScript;
 import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+
 import io.jans.model.ScriptLocationType;
 import io.jans.model.SimpleCustomProperty;
 import io.jans.model.SimpleExtendedCustomProperty;
@@ -39,10 +32,17 @@
 import io.jans.service.cdi.async.Asynchronous;
 import io.jans.service.cdi.event.Scheduled;
 import io.jans.service.cdi.event.UpdateScriptEvent;
+import io.jans.service.custom.inject.ReloadScript;
 import io.jans.service.timer.event.TimerEvent;
 import io.jans.service.timer.schedule.TimerSchedule;
 import io.jans.util.StringHelper;
-import org.slf4j.Logger;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.BeforeDestroyed;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletContext;
 
 /**
  * Provides actual versions of scripts
@@ -84,6 +84,8 @@ public class CustomScriptManager {
 	private long lastFinishedTime;
 
 	private Map<CustomScriptType, List<CustomScriptConfiguration>> customScriptConfigurationsByScriptType;
+
+    private boolean initialized = false;
 
 	@Asynchronous
 	public void initTimer(List<CustomScriptType> supportedCustomScriptTypes) {
@@ -97,6 +99,8 @@ public void initTimer(List<CustomScriptType> supportedCustomScriptTypes) {
 
 		timerEvent.fire(new TimerEvent(new TimerSchedule(delay, DEFAULT_INTERVAL), new UpdateScriptEvent(),
 				Scheduled.Literal.INSTANCE));
+
+		initialized = true;
 	}
 
 	protected void configure() {
@@ -261,7 +265,7 @@ private ReloadResult reloadCustomScriptConfigurations(
 					// Add to script revision file modification time. This should allow to
 					// reload script automatically after changing location_type
 					long fileModifiactionTime = getFileModificationTime(loadedCustomScript.getLocationPath());
-					loadedCustomScript.setRevision(newCustomScript.getRevision() + fileModifiactionTime);
+					loadedCustomScript.setRevision(loadedCustomScript.getRevision() + fileModifiactionTime);
 
 					if (fileModifiactionTime != 0) {
 						String scriptFromFile = loadFromFile(loadedCustomScript.getLocationPath());
@@ -411,4 +415,8 @@ public void clearScriptError(CustomScript customScript) {
         externalTypeCreator.clearScriptError(customScript);
     }
 
+	public boolean isInitialized() {
+		return initialized;
+	}
+
 }