Changeset 25260

Timestamp:

2012-03-23T14:21:37+13:00 (12 years ago)

Author:

sjm84

Message:

Making sure the remoteAddress is passed into any services called by the General action. This is used in the Authentication service.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/GeneralAction.java (modified) (7 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/GeneralAction.java

@@ -26 +26 @@
     public Node process(Node message_node)
     {
-
         Element message = this.converter.nodeToElement(message_node);
 
@@ -48 +47 @@
             String optionName = (String) params.get("configChangeName");
             String optionValue = (String) params.get("configChangeValue");
-            
+
             changeConfig(optionName, optionValue);
         }
@@ -84 +83 @@
         {
             //do the request
-
             Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
             Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
@@ -104 +102 @@
                 mr_query_request.appendChild(param_list);
             }
+
+            Element userInformation = (Element) GSXML.getChildByTagName(request, GSXML.USER_INFORMATION_ELEM);
+            if (userInformation != null)
+            {
+                mr_query_request.appendChild(this.doc.importNode(userInformation, true));
+            }
+            mr_query_request.setAttribute("remoteAddress", request.getAttribute("remoteAddress"));
 
             Element mr_query_response = (Element) this.mr.process(mr_query_message);
@@ -144 +149 @@
         return result;
     }
-    
-    protected void changeConfig (String optionName, String optionValue)
+
+    protected void changeConfig(String optionName, String optionValue)
     {
-        if(this.config_params.get(optionName) != null)
+        if (this.config_params.get(optionName) != null)
         {
             this.config_params.put(optionName, optionValue);
-            
-            File interfaceConfigFile = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), (String)this.config_params.get("interface_name"))));
-            
+
+            File interfaceConfigFile = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), (String) this.config_params.get("interface_name"))));
+
             Document interfaceXML = null;
             try
@@ -163 +168 @@
 
                 NodeList optionList = optionListElem.getElementsByTagName("option");
-                
-                for(int i = 0; i < optionList.getLength(); i++)
+
+                for (int i = 0; i < optionList.getLength(); i++)
                 {
-                    Element currentOption = (Element)optionList.item(i);
-                    if(currentOption.getAttribute(GSXML.NAME_ATT) != null && currentOption.getAttribute(GSXML.NAME_ATT).equals(optionName))
+                    Element currentOption = (Element) optionList.item(i);
+                    if (currentOption.getAttribute(GSXML.NAME_ATT) != null && currentOption.getAttribute(GSXML.NAME_ATT).equals(optionName))
                     {
                         currentOption.setAttribute(GSXML.VALUE_ATT, optionValue);
                     }
                 }
-                
+
                 DOMSource source = new DOMSource(interfaceXML);
                 Result xmlresult = new StreamResult(interfaceConfigFile);
@@ -179 +184 @@
                 transformer.transform(source, xmlresult);
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 ex.printStackTrace();