PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Setting UI use system proxy validity check

Browse Source 
Setting UI performs some validity check on proxy settings, such that user
can't click "Save" until inputs are valid. However, it uses a different
validity pattern than framework, such that user may still be able to click
"Save" but the changes are silently rejected by framework. Fixed by using
the system proxy validity check routine.

bug: 13248097
Change-Id: Ia1eef53588e6923a838cb5629e373697001a8ba6
This commit is contained in:
Yuhao Zheng
2014-02-28 17:09:43 -08:00
parent 0f9ab45376
commit 1f7a190fd7
1 changed files with 16 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/com/android/settings/ProxySelector.java
View File

@@ -45,8 +45,6 @@ import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class ProxySelector extends Fragment implements DialogCreatable { public class ProxySelector extends Fragment implements DialogCreatable {
private static final String TAG = "ProxySelector"; private static final String TAG = "ProxySelector";
@@ -58,22 +56,6 @@ public class ProxySelector extends Fragment implements DialogCreatable {
Button mClearButton; Button mClearButton;
Button mDefaultButton; Button mDefaultButton;
// Allows underscore char to supports proxies that do not
// follow the spec
private static final String HC = "a-zA-Z0-9\\_";
// Matches blank input, ips, and domain names
private static final String HOSTNAME_REGEXP =
"^$|^[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$";
private static final Pattern HOSTNAME_PATTERN;
private static final String EXCLUSION_REGEXP =
"$|^(\\*)?\\.?[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$";
private static final Pattern EXCLUSION_PATTERN;
static {
HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP);
EXCLUSION_PATTERN = Pattern.compile(EXCLUSION_REGEXP);
}
private static final int ERROR_DIALOG_ID = 0; private static final int ERROR_DIALOG_ID = 0;
private SettingsDialogFragment mDialogFragment; private SettingsDialogFragment mDialogFragment;
@@ -203,35 +185,24 @@ public class ProxySelector extends Fragment implements DialogCreatable {
* @return 0 on success, string resource ID on failure * @return 0 on success, string resource ID on failure
*/ */
public static int validate(String hostname, String port, String exclList) { public static int validate(String hostname, String port, String exclList) {
Matcher match = HOSTNAME_PATTERN.matcher(hostname); switch (Proxy.validate(hostname, port, exclList)) {
String exclListArray[] = exclList.split(","); case Proxy.PROXY_VALID:
return 0;
if (!match.matches()) return R.string.proxy_error_invalid_host; case Proxy.PROXY_HOSTNAME_EMPTY:
for (String excl : exclListArray) {
Matcher m = EXCLUSION_PATTERN.matcher(excl);
if (!m.matches()) return R.string.proxy_error_invalid_exclusion_list;
}
if (hostname.length() > 0 && port.length() == 0) {
return R.string.proxy_error_empty_port;
}
if (port.length() > 0) {
if (hostname.length() == 0) {
return R.string.proxy_error_empty_host_set_port; return R.string.proxy_error_empty_host_set_port;
} case Proxy.PROXY_HOSTNAME_INVALID:
int portVal = -1; return R.string.proxy_error_invalid_host;
try { case Proxy.PROXY_PORT_EMPTY:
portVal = Integer.parseInt(port); return R.string.proxy_error_empty_port;
} catch (NumberFormatException ex) { case Proxy.PROXY_PORT_INVALID:
return R.string.proxy_error_invalid_port; return R.string.proxy_error_invalid_port;
} case Proxy.PROXY_EXCLLIST_INVALID:
if (portVal <= 0 || portVal > 0xFFFF) { return R.string.proxy_error_invalid_exclusion_list;
return R.string.proxy_error_invalid_port; default:
} // should neven happen
Log.e(TAG, "Unknown proxy settings error");
return -1;
} }
return 0;
} }
/** /**
@@ -245,7 +216,7 @@ public class ProxySelector extends Fragment implements DialogCreatable {
int port = 0; int port = 0;
int result = validate(hostname, portStr, exclList); int result = validate(hostname, portStr, exclList);
if (result > 0) { if (result != 0) {
showDialog(ERROR_DIALOG_ID); showDialog(ERROR_DIALOG_ID);
return false; return false;
} }