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

Apply DISALLOW_CONFIG_VPN restriction to VPN.

Browse Source 
Bug: 16008760
Change-Id: I299d5f32d9b09c3abcc32f3e889a0187880621df
This commit is contained in:
Julia Reynolds
2014-07-01 11:10:41 -04:00
parent 1e1f2e8926
commit f5116d01b2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -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();