Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6b4163f authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Verify inputs to PAC resolving." into klp-dev

parents 23819e7e 7a6af1c0
Loading
Loading
Loading
Loading
+15 −1
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ import android.util.Log;

import com.android.net.IProxyService;

import java.net.MalformedURLException;
import java.net.URL;

public class PacService extends Service {
    private static final String TAG = "PacService";

@@ -68,7 +71,18 @@ public class PacService extends Service {

        @Override
        public String resolvePacFile(String host, String url) throws RemoteException {
            try {
                // Check for characters that could be used for an injection attack.
                new URL(url);
                for (char c : host.toCharArray()) {
                    if (!Character.isLetterOrDigit(c) && (c != '.') && (c != '-')) {
                        throw new RemoteException("Invalid host was passed");
                    }
                }
                return mPacNative.makeProxyRequest(url, host);
            } catch (MalformedURLException e) {
                throw new RemoteException("Invalid URL was passed");
            }
        }

        @Override