commit f5116d01b20f21ba32cd9eaa3412daf97f41c623
author Julia Reynolds <juliacr@google.com> Tue Jul 01 11:10:41 2014 -0400
committer Julia Reynolds <juliacr@google.com> Wed Jul 02 17:51:46 2014 +0000
tree b7ed4268a35365b0ebea7fc7ec983fd410149418
parent 1e1f2e89267f17723a2afc90a7e894e01fc64701

Apply DISALLOW_CONFIG_VPN restriction to VPN.

Bug: 16008760
Change-Id: I299d5f32d9b09c3abcc32f3e889a0187880621df

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

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index cb1dfe4..ad7c0aa 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -329,7 +329,7 @@
         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 @@
         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();