Apply DISALLOW_CONFIG_VPN restriction to VPN. (f5116d01) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/Vpn.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -329,7 +329,7 @@ public class Vpn extends BaseNetworkStateTracker {
		try {
		// Restricted users are not allowed to create VPNs, they are tied to Owner
		UserInfo user = mgr.getUserInfo(mUserId);
		if (user.isRestricted()) {
		if (user.isRestricted() \|\| mgr.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
		throw new SecurityException("Restricted users cannot establish VPNs");
		}

		@@ -722,6 +722,11 @@ public class Vpn extends BaseNetworkStateTracker {
		if (!keyStore.isUnlocked()) {
		throw new IllegalStateException("KeyStore isn't unlocked");
		}
		UserManager mgr = UserManager.get(mContext);
		UserInfo user = mgr.getUserInfo(mUserId);
		if (user.isRestricted() \|\| mgr.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
		throw new SecurityException("Restricted users cannot establish VPNs");
		}

		final RouteInfo ipv4DefaultRoute = findIPv4DefaultRoute(egress);
		final String gateway = ipv4DefaultRoute.getGateway().getHostAddress();