MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

socket lock and XML-RPC server bind only to localhost (IDEA-51561); cleanup

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-10-27 14:11:11 +04:00
parent 5eda3f2c04
commit a30af5ba73
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/XmlRpcServerImpl.java
+2 -1
View File
@@ -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) {
platform/platform-impl/src/com/intellij/idea/SocketLock.java
+7 -10
View File
@@ -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();