TRUNK-6203: Global properties access should be privileged

openmrs · Jul 30, 2024 · 24fc2d6 · 24fc2d6
1 parent b565ccf
commit 24fc2d6
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...rc/main/java/org/openmrs/module/addresshierarchy/service/AddressHierarchyServiceImpl.java b/...rc/main/java/org/openmrs/module/addresshierarchy/service/AddressHierarchyServiceImpl.java
@@ -705,7 +705,15 @@ else if (level.getParent() == null){
 	synchronized public void initializeFullAddressCache() {
 
 		// generally, this global property should be set to true; it just allows cache load to be disabled to speed startup
-		if (Context.getAdministrationService().getGlobalProperty(AddressHierarchyConstants.GLOBAL_PROP_INITIALIZE_ADDRESS_HIERARCHY_CACHE_ON_STARTUP).equalsIgnoreCase("true")) {
+		String globalProperty = "";
+		try {
+			Context.addProxyPrivilege("GET GLOBAL PROPERTIES");
+			globalProperty = Context.getAdministrationService().getGlobalProperty(AddressHierarchyConstants.GLOBAL_PROP_INITIALIZE_ADDRESS_HIERARCHY_CACHE_ON_STARTUP);
+		} finally {
+			Context.removeProxyPrivilege("GET GLOBAL PROPERTIES");
+		}
+
+		if (globalProperty.equalsIgnoreCase("true")) {
 
 			// only initialize if necessary (and if we have entries)
 			if ((this.fullAddressCacheInitialized == false || MapUtils.isEmpty(this.fullAddressCache))