Changeset 5876 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

Timestamp:

2013-04-17T20:14:32+02:00 (11 years ago)

Author:

akks

Message:

Remote control: allow adding tags without confirmation for current session (add_tags), see #8612
added parsing of request headers and detecting request sender by IP and "referer" HTTP header

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io.remotecontrol;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.io.Reader;
 import java.io.Writer;
 import java.net.Socket;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler;
@@ -136 +138 @@
                     request.getOutputStream());
             out = new OutputStreamWriter(raw);
-            Reader in = new InputStreamReader(new BufferedInputStream(
-                    request.getInputStream()), "ASCII");
-
-            StringBuffer requestLine = new StringBuffer();
-            while (requestLine.length() < 1024 * 1024) {
-                int c = in.read();
-                if (c == -1 || c == '\r' || c == '\n')
-                    break;
-                requestLine.append((char) c);
-            }
-
-            System.out.println("RemoteControl received: " + requestLine);
-            String get = requestLine.toString();
+            BufferedReader in = new BufferedReader(new InputStreamReader(request.getInputStream(), "ASCII"));
+            
+            String get = in.readLine();
+            System.out.println("RemoteControl received: " + get);
+
             StringTokenizer st = new StringTokenizer(get);
             if (!st.hasMoreTokens()) {
@@ -165 +159 @@
                 return;
             }
-
-            String command = null;
+            
             int questionPos = url.indexOf('?');
-            if(questionPos < 0)
-            {
-                command = url;
-            }
-            else
-            {
-                command = url.substring(0, questionPos);
-            }
-
+            
+            String command = questionPos < 0 ? url : url.substring(0, questionPos);
+            
+            Map <String,String> headers = new HashMap<String, String>();
+            int k=0, MAX_HEADERS=20;
+            while (k<MAX_HEADERS) {
+                get=in.readLine();
+                if (get==null) break;
+                k++;
+                String h[] = get.split(": ", 2);
+                if (h.length==2) {
+                    headers.put(h[0], h[1]);
+                } else break;
+            }
+            
+            // Who sent the request: trying our best to detect
+            // not from localhost => sender = IP
+            // from localhost: sender = referer header, if exists
+            String sender = null;
+            
+            if (!request.getInetAddress().isLoopbackAddress()) {
+                sender = request.getInetAddress().getHostAddress();
+            } else {
+                String ref = headers.get("Referer");
+                Pattern r = Pattern.compile("(https?://)?([^/]*)");
+                if (ref!=null) {
+                    Matcher m = r.matcher(ref);
+                    if (m.find()) {
+                        sender = m.group(2);
+                    }
+                }
+                if (sender == null) {
+                    sender = "localhost";
+                } 
+            }
+            
             // find a handler for this command
             Class<? extends RequestHandler> handlerClass = handlers.get(command);
@@ -202 +222 @@
                     handler.setCommand(command);
                     handler.setUrl(url);
+                    handler.setSender(sender);
                     handler.handle();
                     sendHeader(out, "200 OK", handler.getContentType(), false);