From a30af5ba730dc6b587db5cb794d7012f6e1e52b5 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 22 Oct 2010 11:49:43 +0400
Subject: [PATCH] socket lock and XML-RPC server bind only to localhost
 (IDEA-51561); cleanup

---
 .../src/com/intellij/ide/XmlRpcServerImpl.java  |  3 ++-
 .../src/com/intellij/idea/SocketLock.java       | 17 +++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/XmlRpcServerImpl.java b/platform/platform-impl/src/com/intellij/ide/XmlRpcServerImpl.java
index cd2abe9c19bc..61390b7f6b39 100644
--- a/platform/platform-impl/src/com/intellij/ide/XmlRpcServerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/XmlRpcServerImpl.java
@@ -25,6 +25,7 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.ServerSocket;
 
 /**
@@ -50,7 +51,7 @@ public class XmlRpcServerImpl implements XmlRpcServer, ApplicationComponent {
     final int currentPriority = thread.getPriority();
     try {
       thread.setPriority(Thread.NORM_PRIORITY - 2);
-      myWebServer = new IdeaAwareWebServer(getPortNumber(), null, new IdeaAwareXmlRpcServer());
+      myWebServer = new IdeaAwareWebServer(getPortNumber(), InetAddress.getLocalHost(), new IdeaAwareXmlRpcServer());
       myWebServer.start();
     }
     catch (Exception e) {
diff --git a/platform/platform-impl/src/com/intellij/idea/SocketLock.java b/platform/platform-impl/src/com/intellij/idea/SocketLock.java
index bd32dd33f8c1..1861ef8f551e 100644
--- a/platform/platform-impl/src/com/intellij/idea/SocketLock.java
+++ b/platform/platform-impl/src/com/intellij/idea/SocketLock.java
@@ -26,6 +26,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
@@ -44,9 +45,8 @@ public class SocketLock {
   private static final int[] FORBIDDEN_PORTS = new int[]{6953, 6969, 6970};
 
   private ServerSocket mySocket;
-  private final List myLockedPaths = new ArrayList();
+  private final List<String> myLockedPaths = new ArrayList<String>();
   private boolean myIsDialogShown = false;
-  @NonNls private static final String LOCALHOST = "localhost";
   @NonNls private static final String LOCK_THREAD_NAME = "Lock thread";
 
   public SocketLock() {
@@ -111,8 +111,8 @@ public class SocketLock {
     myLockedPaths.remove(path);
   }
 
-  private List readLockedList(int i) {
-    List result = new ArrayList();
+  private static List<String> readLockedList(int i) {
+    List<String> result = new ArrayList<String>();
 
     try {
       try {
@@ -123,7 +123,7 @@ public class SocketLock {
       catch (IOException e) {
       }
 
-      Socket socket = new Socket(LOCALHOST, i);
+      Socket socket = new Socket(InetAddress.getLocalHost(), i);
       socket.setSoTimeout(300);
 
       DataInputStream in = new DataInputStream(socket.getInputStream());
@@ -153,7 +153,7 @@ public class SocketLock {
       try {
         if (isPortForbidden(i)) continue;
 
-        mySocket = new ServerSocket(i);
+        mySocket = new ServerSocket(i, 50, InetAddress.getLocalHost());
         break;
       }
       catch (IOException e) {
@@ -165,15 +165,12 @@ public class SocketLock {
     final Thread thread = new Thread(new MyRunnable(), LOCK_THREAD_NAME);
     thread.setPriority(Thread.MIN_PRIORITY);
     thread.start();
-
-    return;
   }
 
   private synchronized void writeLockedPaths(Socket socket) {
     try {
       DataOutputStream out = new DataOutputStream(socket.getOutputStream());
-      for (Iterator iterator = myLockedPaths.iterator(); iterator.hasNext();) {
-        String path = (String)iterator.next();
+      for (String path: myLockedPaths) {
         out.writeUTF(path);
       }
       out.close();