diff options
author | Jeff Davidson <jpd@google.com> | 2015-02-11 08:25:26 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-11 08:25:27 +0000 |
commit | 50996a12a8e859346d5eb3c4569c4e81c9b52a05 (patch) | |
tree | ee718a236ef383ecb3f68cb450b73997195d0800 | |
parent | c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4 (diff) | |
parent | b21298a686b04d55ff97223dd317497845713f4b (diff) | |
download | frameworks_base-50996a12a8e859346d5eb3c4569c4e81c9b52a05.zip frameworks_base-50996a12a8e859346d5eb3c4569c4e81c9b52a05.tar.gz frameworks_base-50996a12a8e859346d5eb3c4569c4e81c9b52a05.tar.bz2 |
Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
-rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 29 | ||||
-rw-r--r-- | services/core/java/com/android/server/net/LockdownVpnTracker.java | 8 |
2 files changed, 30 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index f08a652..8533f69 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -846,9 +846,29 @@ public class Vpn { /** * Start legacy VPN, controlling native daemons as needed. Creates a * secondary thread to perform connection work, returning quickly. + * + * Should only be called to respond to Binder requests as this enforces caller permission. Use + * {@link #startLegacyVpnPrivileged(VpnProfile, KeyStore, LinkProperties)} to skip the + * permission check only when the caller is trusted (or the call is initiated by the system). */ public void startLegacyVpn(VpnProfile profile, KeyStore keyStore, LinkProperties egress) { enforceControlPermission(); + long token = Binder.clearCallingIdentity(); + try { + startLegacyVpnPrivileged(profile, keyStore, egress); + } finally { + Binder.restoreCallingIdentity(token); + } + } + + /** + * Like {@link #startLegacyVpn(VpnProfile, KeyStore, LinkProperties)}, but does not check + * permissions under the assumption that the caller is the system. + * + * Callers are responsible for checking permissions if needed. + */ + public void startLegacyVpnPrivileged(VpnProfile profile, KeyStore keyStore, + LinkProperties egress) { if (!keyStore.isUnlocked()) { throw new IllegalStateException("KeyStore isn't unlocked"); } @@ -959,10 +979,10 @@ public class Vpn { } private synchronized void startLegacyVpn(VpnConfig config, String[] racoon, String[] mtpd) { - stopLegacyVpn(); + stopLegacyVpnPrivileged(); - // Prepare for the new request. This also checks the caller. - prepare(null, VpnConfig.LEGACY_VPN); + // Prepare for the new request. + prepareInternal(VpnConfig.LEGACY_VPN); updateState(DetailedState.CONNECTING, "startLegacyVpn"); // Start a new LegacyVpnRunner and we are done! @@ -970,7 +990,8 @@ public class Vpn { mLegacyVpnRunner.start(); } - public synchronized void stopLegacyVpn() { + /** Stop legacy VPN. Permissions must be checked by callers. */ + public synchronized void stopLegacyVpnPrivileged() { if (mLegacyVpnRunner != null) { mLegacyVpnRunner.exit(); mLegacyVpnRunner = null; diff --git a/services/core/java/com/android/server/net/LockdownVpnTracker.java b/services/core/java/com/android/server/net/LockdownVpnTracker.java index 3a1e4a4..752614f 100644 --- a/services/core/java/com/android/server/net/LockdownVpnTracker.java +++ b/services/core/java/com/android/server/net/LockdownVpnTracker.java @@ -140,7 +140,7 @@ public class LockdownVpnTracker { if (egressDisconnected || egressChanged) { clearSourceRulesLocked(); mAcceptedEgressIface = null; - mVpn.stopLegacyVpn(); + mVpn.stopLegacyVpnPrivileged(); } if (egressDisconnected) { hideNotification(); @@ -163,7 +163,9 @@ public class LockdownVpnTracker { mAcceptedEgressIface = egressProp.getInterfaceName(); try { - mVpn.startLegacyVpn(mProfile, KeyStore.getInstance(), egressProp); + // Use the privileged method because Lockdown VPN is initiated by the system, so + // no additional permission checks are necessary. + mVpn.startLegacyVpnPrivileged(mProfile, KeyStore.getInstance(), egressProp); } catch (IllegalStateException e) { mAcceptedEgressIface = null; Slog.e(TAG, "Failed to start VPN", e); @@ -250,7 +252,7 @@ public class LockdownVpnTracker { mAcceptedEgressIface = null; mErrorCount = 0; - mVpn.stopLegacyVpn(); + mVpn.stopLegacyVpnPrivileged(); try { mNetService.setFirewallEgressDestRule(mProfile.server, 500, false); mNetService.setFirewallEgressDestRule(mProfile.server, 4500, false); |