Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 am: d37eb76465 am: ddce8664bd

Browse Source 
am: 4fd2cc7277

Change-Id: I2bd78344796e888c4fa26dcf2e07a0a24994cb42
This commit is contained in:
Paul Jensen
2016-09-19 11:55:24 +00:00
committed by android-build-merger
parent 839671d5a9 4fd2cc7277
commit 2855de1e7c
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/core/java/com/android/server/connectivity/PacManager.java
View File

@@ -27,6 +27,7 @@ import android.content.ServiceConnection;
import android.net.ProxyInfo; import android.net.ProxyInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
@@ -39,10 +40,10 @@ import com.android.internal.annotations.GuardedBy;
import com.android.net.IProxyCallback; import com.android.net.IProxyCallback;
import com.android.net.IProxyPortListener; import com.android.net.IProxyPortListener;
import com.android.net.IProxyService; import com.android.net.IProxyService;
import com.android.server.IoThread;
import libcore.io.Streams; import libcore.io.Streams;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
@@ -66,6 +67,7 @@ public class PacManager {
private static final int DELAY_1 = 0; private static final int DELAY_1 = 0;
private static final int DELAY_4 = 3; private static final int DELAY_4 = 3;
private static final int DELAY_LONG = 4; private static final int DELAY_LONG = 4;
private static final long MAX_PAC_SIZE = 20 * 1000 * 1000;
/** Keep these values up-to-date with ProxyService.java */ /** Keep these values up-to-date with ProxyService.java */
public static final String KEY_PROXY = "keyProxy"; public static final String KEY_PROXY = "keyProxy";
@@ -123,15 +125,21 @@ public class PacManager {
} }
}; };
private final HandlerThread mNetThread = new HandlerThread("android.pacmanager",
android.os.Process.THREAD_PRIORITY_DEFAULT);
private final Handler mNetThreadHandler;
class PacRefreshIntentReceiver extends BroadcastReceiver { class PacRefreshIntentReceiver extends BroadcastReceiver {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
IoThread.getHandler().post(mPacDownloader); mNetThreadHandler.post(mPacDownloader);
} }
} }
public PacManager(Context context, Handler handler, int proxyMessage) { public PacManager(Context context, Handler handler, int proxyMessage) {
mContext = context; mContext = context;
mLastPort = -1; mLastPort = -1;
mNetThread.start();
mNetThreadHandler = new Handler(mNetThread.getLooper());
mPacRefreshIntent = PendingIntent.getBroadcast( mPacRefreshIntent = PendingIntent.getBroadcast(
context, 0, new Intent(ACTION_PAC_REFRESH), 0); context, 0, new Intent(ACTION_PAC_REFRESH), 0);
@@ -199,7 +207,25 @@ public class PacManager {
private static String get(Uri pacUri) throws IOException { private static String get(Uri pacUri) throws IOException {
URL url = new URL(pacUri.toString()); URL url = new URL(pacUri.toString());
URLConnection urlConnection = url.openConnection(java.net.Proxy.NO_PROXY); URLConnection urlConnection = url.openConnection(java.net.Proxy.NO_PROXY);
return new String(Streams.readFully(urlConnection.getInputStream())); long contentLength = -1;
try {
contentLength = Long.parseLong(urlConnection.getHeaderField("Content-Length"));
} catch (NumberFormatException e) {
// Ignore
}
if (contentLength > MAX_PAC_SIZE) {
throw new IOException("PAC too big: " + contentLength + " bytes");
}
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
int count;
while ((count = urlConnection.getInputStream().read(buffer)) != -1) {
bytes.write(buffer, 0, count);
if (bytes.size() > MAX_PAC_SIZE) {
throw new IOException("PAC too big");
}
}
return bytes.toString();
} }
private int getNextDelay(int currentDelay) { private int getNextDelay(int currentDelay) {
@@ -297,7 +323,7 @@ public class PacManager {
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Unable to reach ProxyService - PAC will not be started", e); Log.e(TAG, "Unable to reach ProxyService - PAC will not be started", e);
} }
IoThread.getHandler().post(mPacDownloader); mNetThreadHandler.post(mPacDownloader);
} }
} }
} }