Changeset 36869

Timestamp:

2022-11-01T16:40:14+13:00 (18 months ago)

Author:

anupama

Message:

Finished up Kathy's bugfix to central method MessageRouter.processMessage() upon activating and deactivating: existing code always removed a specified module upon deactivation, without checking the moduletype matched the instance of the module in the moduleMap that we're removing. But we don't want to allow action=system, subaction=deactivate, moduletype=service (should be collection) and modulename=demo (collection-name). The demo collection should not be removed as it's not a service. It's a meaningless command. Further, the code is ready to cast the module to Collection which used to result in a type cast error. This commit tidies that part up.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -1290 +1290 @@
                     String module_type = elem.getAttribute(GSXML.SYSTEM_MODULE_TYPE_ATT);
 
+                    if (!moduleTypeMatchesModuleInstance(module_name, module_type)) {
+                        logger.error(module_name + "is not a module of type " + module_type + ", not (de)activating it");
+                        success = false;
+
+                        Element s = null;
+                        
+                        if (action.equals(GSXML.SYSTEM_TYPE_DEACTIVATE)) {
+                        s = GSXML.createTextElement(doc, GSXML.STATUS_ELEM, module_type + ": " + module_name + " could not be deactivated (module type and instance mismatch)", GSXML.SYSTEM_TYPE_DEACTIVATE, GSXML.ERROR);
+                        } else {
+                        s = GSXML.createTextElement(doc, GSXML.STATUS_ELEM, module_type + ": " + module_name + " could not be activated (module type and instance mismatch)", GSXML.SYSTEM_TYPE_ACTIVATE, GSXML.ERROR);
+                        }
+                        response.appendChild(s);
+                        return response;
+                    }
+                    
+
                     if (action.equals(GSXML.SYSTEM_TYPE_DEACTIVATE))
                     {
@@ -1347 +1363 @@
 
     }
+
+    protected boolean moduleTypeMatchesModuleInstance(String module_name, String module_type)
+    {
+    ModuleInterface m = this.module_map.get(module_name);
+    if(m == null) {
+        return true; // no module also means no conflict between module_type and module_name
+    }
+
+    boolean moduleTypeMatchesInstance = false;
+    if (module_type.equals(GSXML.COLLECTION_ELEM) && m instanceof Collection) {
+        moduleTypeMatchesInstance = true;
+    } else if(module_type.equals(GSXML.SERVICE_ELEM) && m instanceof ServiceRack) {
+        moduleTypeMatchesInstance = true;
+    } else if(module_type.equals(GSXML.CLUSTER_ELEM) && m instanceof ServiceCluster) {
+        moduleTypeMatchesInstance = true;
+    } else if(module_type.equals(GSXML.SITE_ELEM) && m instanceof Communicator) {
+        moduleTypeMatchesInstance = true;       
+    }
+
+    return moduleTypeMatchesInstance;
+    }
 
     //* Used to copy nodes from one message to another. E.g. copy a response node to the next request. Not sure if this is actually used anywhere yet... */