fix: disable shib config generation when flag is set

GluuFederation · May 6, 2023 · 6751499 · 6751499
1 parent 1dcd1c3
commit 6751499
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/server/src/main/java/org/gluu/oxtrust/service/EntityIDMonitoringService.java b/server/src/main/java/org/gluu/oxtrust/service/EntityIDMonitoringService.java
@@ -22,6 +22,7 @@
 import javax.inject.Named;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.gluu.config.oxtrust.AppConfiguration;
 import org.gluu.model.GluuStatus;
 import org.gluu.oxtrust.model.GluuSAMLTrustRelationship;
 import org.gluu.oxtrust.model.GluuValidationStatus;
@@ -53,8 +54,9 @@ public class EntityIDMonitoringService {
 	@Inject
 	private Event<TimerEvent> timerEvent;
 
+	@Inject
+    private AppConfiguration appConfiguration;
 
-
 	@Inject
 	private ServiceUtil serviceUtil;
 
@@ -92,7 +94,12 @@ public void processMetadataValidationTimerEvent(
 		}
 
 		try {
-			process();
+			boolean isConfigGeneration = appConfiguration.isConfigGeneration();
+			if(isConfigGeneration) {
+				process();
+			}else {
+				log.debug("EntityID monitoring config generation disabled");
+			}
 		} catch (Throwable ex) {
 			log.error("Exception happened while monitoring EntityId", ex);
 		} finally {

diff --git a/server/src/main/java/org/gluu/oxtrust/service/MetadataValidationTimer.java b/server/src/main/java/org/gluu/oxtrust/service/MetadataValidationTimer.java
@@ -168,6 +168,8 @@ private void regenerateConfigurationFiles() {
             shibboleth3ConfService.generateConfigurationFiles(trustRelationships);
 
             log.info("IDP config generation files finished. TR count: '{}'", trustRelationships.size());
+        }else {
+            log.debug("Shibboleth config generation disabled");
         }
     }
 

diff --git a/server/src/main/java/org/gluu/oxtrust/service/TranscodingRulesUpdater.java b/server/src/main/java/org/gluu/oxtrust/service/TranscodingRulesUpdater.java
@@ -10,6 +10,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import org.gluu.config.oxtrust.AppConfiguration;
 import org.gluu.oxtrust.service.cdi.event.TranscodingRulesUpdateEvent;
 import org.gluu.service.cdi.async.Asynchronous;
 import org.gluu.service.cdi.event.Scheduled;
@@ -30,6 +31,9 @@ public class TranscodingRulesUpdater implements Serializable {
     @Inject
     private Logger log;
 
+    @Inject
+    private AppConfiguration appConfiguration;
+
     @Inject
     private Event<TimerEvent> timerEvent;
 
@@ -73,6 +77,12 @@ public void processTranscodingRulesUpdateEvent(@Observes @Scheduled TranscodingR
 
     private void processTranscodingRulesUpdate() {
 
+        if(appConfiguration.isConfigGeneration() == false) {
+
+            log.debug("Shibboleth configuration generation disabled");
+            return;
+        }
+
         log.debug("Start shibboleth transcoding rules update");
         if(!shibbolethConfService.generateGluuAttributeRulesFile()) {
             log.error("Shibboleth transcoding rules update failed. (Please restart service manually)");
-Original file line number
+Diff line change
@@ Expand Up / @@ -168,6 +168,8 @@ private void regenerateConfigurationFiles() { @@
                 shibboleth3ConfService.generateConfigurationFiles(trustRelationships);
                 log.info("IDP config generation files finished. TR count: '{}'", trustRelationships.size());
+            }else {
+                log.debug("Shibboleth config generation disabled");
             }
         }
@@ Expand Down @@