From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Grant Menke Date: Thu, 25 Apr 2024 10:43:43 -0700 Subject: [PATCH] DO NOT MERGE Unbind CS if connection is not created within 15 seconds. This CL adds a check to ensure that connection creation occurs within 15 seconds after binding to that ConnectionService. If the connection/conference is not created in that timespan, this CL adds logic to manually unbind the ConnectionService at that point in time. This prevents malicious apps from keeping a declared permission in forever even in the background. Bug: 293458004 Test: manually using the provided apk + atest CallsManagerTest Flag: EXEMPT Security High/Critical Severity CVE (cherry picked from commit 7aa55ffca65d6166145fd9660e0f7340c07053bf) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:286781dfcb78d8b5c1a77f2390f5251f01943add) Merged-In: I30caed1481dff5af2223a8ff589846597cee8229 Change-Id: I30caed1481dff5af2223a8ff589846597cee8229 --- .project | 11 + src/com/android/server/telecom/Call.java | 25 ++ .../telecom/ConnectionServiceWrapper.java | 48 ++- src/com/android/server/telecom/LogUtils.java | 1 + .../server/telecom/tests/BasicCallTests.java | 2 + .../telecom/tests/CallsManagerTest.java | 61 ++++ .../tests/ComponentContextFixture.java | 14 + .../tests/TestScheduledExecutorService.java | 283 ++++++++++++++++++ 8 files changed, 443 insertions(+), 2 deletions(-) create mode 100644 tests/src/com/android/server/telecom/tests/TestScheduledExecutorService.java diff --git a/.project b/.project index 7cc346140..d801f0843 100644 --- a/.project +++ b/.project @@ -30,4 +30,15 @@ com.android.ide.eclipse.adt.AndroidNature org.eclipse.jdt.core.javanature + + + 1726332124436 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java index ecc635997..699c9ffee 100644 --- a/src/com/android/server/telecom/Call.java +++ b/src/com/android/server/telecom/Call.java @@ -313,6 +313,17 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, /** The state of the call. */ private int mState; + /** + * Determines whether the {@link ConnectionService} has responded to the initial request to + * create the connection. + * + * {@code false} indicates the {@link Call} has been added to Telecom, but the + * {@link Connection} has not yet been returned by the associated {@link ConnectionService}. + * {@code true} indicates the {@link Call} has an associated {@link Connection} reported by the + * {@link ConnectionService}. + */ + private boolean mIsCreateConnectionComplete = false; + /** The handle with which to establish this call. */ private Uri mHandle; @@ -816,6 +827,19 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, return mConnectionService; } + /** + * @return {@code true} if the connection has been created by the underlying + * {@link ConnectionService}, {@code false} otherwise. + */ + public boolean isCreateConnectionComplete() { + return mIsCreateConnectionComplete; + } + + @VisibleForTesting + public void setIsCreateConnectionComplete(boolean isCreateConnectionComplete) { + mIsCreateConnectionComplete = isCreateConnectionComplete; + } + @VisibleForTesting public int getState() { return mState; @@ -1739,6 +1763,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, CallIdMapper idMapper, ParcelableConnection connection) { Log.v(this, "handleCreateConnectionSuccessful %s", connection); + mIsCreateConnectionComplete = true; setTargetPhoneAccount(connection.getPhoneAccount()); setHandle(connection.getHandle(), connection.getHandlePresentation()); setCallerDisplayName( diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java index bd5e37f89..a69d725fd 100644 --- a/src/com/android/server/telecom/ConnectionServiceWrapper.java +++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java @@ -37,6 +37,7 @@ import android.telecom.ConnectionService; import android.telecom.DisconnectCause; import android.telecom.GatewayInfo; import android.telecom.Log; +import android.telecom.Logging.Runnable; import android.telecom.Logging.Session; import android.telecom.ParcelableConference; import android.telecom.ParcelableConnection; @@ -60,6 +61,11 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; /** * Wrapper for {@link IConnectionService}s, handles binding to {@link IConnectionService} and keeps @@ -71,6 +77,11 @@ import java.util.concurrent.ConcurrentHashMap; public class ConnectionServiceWrapper extends ServiceBinder implements ConnectionServiceFocusManager.ConnectionServiceFocus { + private static final long SERVICE_BINDING_TIMEOUT = 15000L; + private ScheduledExecutorService mScheduledExecutor = + Executors.newSingleThreadScheduledExecutor(); + // Pre-allocate space for 2 calls; realistically thats all we should ever need (tm) + private final Map> mScheduledFutureMap = new ConcurrentHashMap<>(2); private final class Adapter extends IConnectionServiceAdapter.Stub { @Override @@ -82,6 +93,12 @@ public class ConnectionServiceWrapper extends ServiceBinder implements try { synchronized (mLock) { logIncoming("handleCreateConnectionComplete %s", callId); + Call call = mCallIdMapper.getCall(callId); + if (mScheduledFutureMap.containsKey(call)) { + ScheduledFuture existingTimeout = mScheduledFutureMap.get(call); + existingTimeout.cancel(false /* cancelIfRunning */); + mScheduledFutureMap.remove(call); + } // Check status hints image for cross user access if (connection.getStatusHints() != null) { Icon icon = connection.getStatusHints().getIcon(); @@ -1126,7 +1143,8 @@ public class ConnectionServiceWrapper extends ServiceBinder implements * @param context The context. * @param userHandle The {@link UserHandle} to use when binding. */ - ConnectionServiceWrapper( + @VisibleForTesting + public ConnectionServiceWrapper( ComponentName componentName, ConnectionServiceRepository connectionServiceRepository, PhoneAccountRegistrar phoneAccountRegistrar, @@ -1229,6 +1247,26 @@ public class ConnectionServiceWrapper extends ServiceBinder implements .setRttPipeToInCall(call.getCsToInCallRttPipeForCs()) .build(); + Runnable r = new Runnable("CSW.cC", mLock) { + @Override + public void loggedRun() { + if (!call.isCreateConnectionComplete()) { + Log.e(this, new Exception(), + "Connection %s creation timeout", + getComponentName()); + Log.addEvent(call, LogUtils.Events.CREATE_CONNECTION_TIMEOUT, + Log.piiHandle(call.getHandle()) + " via:" + + getComponentName().getPackageName()); + response.handleCreateConnectionFailure( + new DisconnectCause(DisconnectCause.ERROR)); + } + } + }; + // Post cleanup to the executor service and cache the future, so we can cancel it if + // needed. + ScheduledFuture future = mScheduledExecutor.schedule(r.getRunnableToCancel(), + SERVICE_BINDING_TIMEOUT, TimeUnit.MILLISECONDS); + mScheduledFutureMap.put(call, future); try { mServiceInterface.createConnection( call.getConnectionManagerPhoneAccount(), @@ -1514,7 +1552,8 @@ public class ConnectionServiceWrapper extends ServiceBinder implements } } - void addCall(Call call) { + @VisibleForTesting + public void addCall(Call call) { if (mCallIdMapper.getCallId(call) == null) { mCallIdMapper.addCall(call); } @@ -1909,4 +1948,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements sb.append("]"); return sb.toString(); } + + @VisibleForTesting + public void setScheduledExecutorService(ScheduledExecutorService service) { + mScheduledExecutor = service; + } } diff --git a/src/com/android/server/telecom/LogUtils.java b/src/com/android/server/telecom/LogUtils.java index 760d24e10..37afdb8f6 100644 --- a/src/com/android/server/telecom/LogUtils.java +++ b/src/com/android/server/telecom/LogUtils.java @@ -87,6 +87,7 @@ public class LogUtils { public static final String STOP_CALL_WAITING_TONE = "STOP_CALL_WAITING_TONE"; public static final String START_CONNECTION = "START_CONNECTION"; public static final String CREATE_CONNECTION_FAILED = "CREATE_CONNECTION_FAILED"; + public static final String CREATE_CONNECTION_TIMEOUT = "CREATE_CONNECTION_TIMEOUT"; public static final String BIND_CS = "BIND_CS"; public static final String CS_BOUND = "CS_BOUND"; public static final String CONFERENCE_WITH = "CONF_WITH"; diff --git a/tests/src/com/android/server/telecom/tests/BasicCallTests.java b/tests/src/com/android/server/telecom/tests/BasicCallTests.java index 7889d0487..46aa758b8 100644 --- a/tests/src/com/android/server/telecom/tests/BasicCallTests.java +++ b/tests/src/com/android/server/telecom/tests/BasicCallTests.java @@ -939,6 +939,7 @@ public class BasicCallTests extends TelecomSystemTest { call.setTargetPhoneAccount(mPhoneAccountA1.getAccountHandle()); assert(call.isVideoCallingSupportedByPhoneAccount()); assertEquals(VideoProfile.STATE_BIDIRECTIONAL, call.getVideoState()); + call.setIsCreateConnectionComplete(true); } /** @@ -962,6 +963,7 @@ public class BasicCallTests extends TelecomSystemTest { call.setTargetPhoneAccount(mPhoneAccountA2.getAccountHandle()); assert(!call.isVideoCallingSupportedByPhoneAccount()); assertEquals(VideoProfile.STATE_AUDIO_ONLY, call.getVideoState()); + call.setIsCreateConnectionComplete(true); } /** diff --git a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java index 7adc99aa3..6e9515008 100644 --- a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java +++ b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java @@ -36,10 +36,12 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static java.lang.Thread.sleep; import android.content.ComponentName; import android.net.Uri; import android.os.Bundle; +import android.os.IBinder; import android.os.Process; import android.os.SystemClock; import android.os.UserHandle; @@ -55,6 +57,7 @@ import android.telephony.TelephonyManager; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.SmallTest; +import com.android.internal.telecom.IConnectionService; import com.android.internal.telephony.CallerInfo; import com.android.server.telecom.AsyncRingtonePlayer; import com.android.server.telecom.Call; @@ -68,6 +71,7 @@ import com.android.server.telecom.ClockProxy; import com.android.server.telecom.ConnectionServiceFocusManager; import com.android.server.telecom.ConnectionServiceFocusManager.ConnectionServiceFocusManagerFactory; import com.android.server.telecom.ConnectionServiceWrapper; +import com.android.server.telecom.CreateConnectionResponse; import com.android.server.telecom.DefaultDialerCache; import com.android.server.telecom.EmergencyCallHelper; import com.android.server.telecom.HeadsetMediaButton; @@ -90,6 +94,7 @@ import com.android.server.telecom.WiredHeadsetManager; import com.android.server.telecom.bluetooth.BluetoothRouteManager; import com.android.server.telecom.bluetooth.BluetoothStateReceiver; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -183,6 +188,7 @@ public class CallsManagerTest extends TelecomTestCase { @Mock private CallAudioModeStateMachine.Factory mCallAudioModeStateMachineFactory; @Mock private BluetoothStateReceiver mBluetoothStateReceiver; @Mock private RoleManagerAdapter mRoleManagerAdapter; + @Mock private IConnectionService mIConnectionService; private CallsManager mCallsManager; @@ -240,6 +246,20 @@ public class CallsManagerTest extends TelecomTestCase { eq(SIM_1_HANDLE), any())).thenReturn(SIM_1_ACCOUNT); when(mPhoneAccountRegistrar.getPhoneAccount( eq(SIM_2_HANDLE), any())).thenReturn(SIM_2_ACCOUNT); + when(mIConnectionService.asBinder()).thenReturn(mock(IBinder.class)); + + mComponentContextFixture.addConnectionService(new ComponentName(mContext.getPackageName(), + mContext.getPackageName().getClass().getName()), mIConnectionService); + } + + @Override + @After + public void tearDown() throws Exception { + mComponentContextFixture.removeConnectionService( + new ComponentName(mContext.getPackageName(), + mContext.getPackageName().getClass().getName()), + mock(IConnectionService.class)); + super.tearDown(); } @MediumTest @@ -1111,6 +1131,32 @@ public class CallsManagerTest extends TelecomTestCase { assertTrue(argumentCaptor.getValue().contains("Unavailable phoneAccountHandle")); } + @Test + public void testConnectionServiceCreateConnectionTimeout() throws Exception { + ConnectionServiceWrapper service = new ConnectionServiceWrapper(new ComponentName( + mContext.getPackageName(), mContext.getPackageName().getClass().getName()), null, + mPhoneAccountRegistrar, mCallsManager, mContext, mLock, null); + TestScheduledExecutorService scheduledExecutorService = new TestScheduledExecutorService(); + service.setScheduledExecutorService(scheduledExecutorService); + Call call = addSpyCall(); + service.addCall(call); + when(call.isCreateConnectionComplete()).thenReturn(false); + CreateConnectionResponse response = mock(CreateConnectionResponse.class); + + service.createConnection(call, response); + waitUntilConditionIsTrueOrTimeout(new Condition() { + @Override + public Object expected() { + return true; + } + + @Override + public Object actual() { + return scheduledExecutorService.isRunnableScheduledAtTime(15000L); + } + }, 5000L, "Expected job failed to schedule"); + } + private Call addSpyCall() { return addSpyCall(SIM_2_HANDLE, CallState.ACTIVE); } @@ -1189,4 +1235,19 @@ public class CallsManagerTest extends TelecomTestCase { when(mPhoneAccountRegistrar.getSimPhoneAccountsOfCurrentUser()).thenReturn( new ArrayList<>(Arrays.asList(SIM_1_HANDLE, SIM_2_HANDLE))); } + + private void waitUntilConditionIsTrueOrTimeout(Condition condition, long timeout, + String description) throws InterruptedException { + final long start = System.currentTimeMillis(); + while (!condition.expected().equals(condition.actual()) + && System.currentTimeMillis() - start < timeout) { + sleep(50); + } + assertEquals(description, condition.expected(), condition.actual()); + } + + protected interface Condition { + Object expected(); + Object actual(); + } } diff --git a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java b/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java index e6e8ba122..675913aa0 100644 --- a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java +++ b/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java @@ -549,6 +549,14 @@ public class ComponentContextFixture implements TestFixture { mServiceInfoByComponentName.put(componentName, serviceInfo); } + public void removeConnectionService( + ComponentName componentName, + IConnectionService service) + throws Exception { + removeService(ConnectionService.SERVICE_INTERFACE, componentName, service); + mServiceInfoByComponentName.remove(componentName); + } + public void addInCallService( ComponentName componentName, IInCallService service) @@ -599,6 +607,12 @@ public class ComponentContextFixture implements TestFixture { mComponentNameByService.put(service, name); } + private void removeService(String action, ComponentName name, IInterface service) { + mComponentNamesByAction.remove(action, name); + mServiceByComponentName.remove(name); + mComponentNameByService.remove(service); + } + private List doQueryIntentServices(Intent intent, int flags) { List result = new ArrayList<>(); for (ComponentName componentName : mComponentNamesByAction.get(intent.getAction())) { diff --git a/tests/src/com/android/server/telecom/tests/TestScheduledExecutorService.java b/tests/src/com/android/server/telecom/tests/TestScheduledExecutorService.java new file mode 100644 index 000000000..8ddf42b9b --- /dev/null +++ b/tests/src/com/android/server/telecom/tests/TestScheduledExecutorService.java @@ -0,0 +1,283 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.telecom.tests; + +import android.util.Log; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.Callable; +import java.util.concurrent.Delayed; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +/** + * A test implementation of a scheduled executor service. + */ +public class TestScheduledExecutorService implements ScheduledExecutorService { + private static final String TAG = "TestScheduledExecutorService"; + + private class CompletedFuture implements Future, ScheduledFuture { + + private final Callable mTask; + private final long mDelayMs; + private Runnable mRunnable; + + CompletedFuture(Callable task) { + mTask = task; + mDelayMs = 0; + } + + @SuppressWarnings("unused") + CompletedFuture(Callable task, long delayMs) { + mTask = task; + mDelayMs = delayMs; + } + + CompletedFuture(Runnable task, long delayMs) { + mRunnable = task; + mTask = (Callable) Executors.callable(task); + mDelayMs = delayMs; + } + + @Override + public boolean cancel(boolean mayInterruptIfRunning) { + cancelRunnable(mRunnable); + return true; + } + + @Override + public boolean isCancelled() { + return false; + } + + @Override + public boolean isDone() { + return true; + } + + @Override + public T get() throws InterruptedException, ExecutionException { + try { + return mTask.call(); + } catch (Exception e) { + throw new ExecutionException(e); + } + } + + @Override + public T get(long timeout, TimeUnit unit) + throws InterruptedException, ExecutionException, TimeoutException { + try { + return mTask.call(); + } catch (Exception e) { + throw new ExecutionException(e); + } + } + + @Override + public long getDelay(TimeUnit unit) { + if (unit == TimeUnit.MILLISECONDS) { + return mDelayMs; + } else { + // not implemented + return 0; + } + } + + @Override + public int compareTo(Delayed o) { + if (o == null) return 1; + if (o.getDelay(TimeUnit.MILLISECONDS) > mDelayMs) return -1; + if (o.getDelay(TimeUnit.MILLISECONDS) < mDelayMs) return 1; + return 0; + } + } + + private long mClock = 0; + private Map mScheduledRunnables = new HashMap<>(); + private Map mRepeatDuration = new HashMap<>(); + + @Override + public void shutdown() { + } + + @Override + public List shutdownNow() { + return null; + } + + @Override + public boolean isShutdown() { + return false; + } + + @Override + public boolean isTerminated() { + return false; + } + + @Override + public boolean awaitTermination(long timeout, TimeUnit unit) { + return false; + } + + @Override + public Future submit(Callable task) { + return new TestScheduledExecutorService.CompletedFuture<>(task); + } + + @Override + public Future submit(Runnable task, T result) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public Future submit(Runnable task) { + task.run(); + return new TestScheduledExecutorService.CompletedFuture<>(() -> null); + } + + @Override + public List> invokeAll(Collection> tasks) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public List> invokeAll(Collection> tasks, long timeout, + TimeUnit unit) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public T invokeAny(Collection> tasks) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public T invokeAny(Collection> tasks, long timeout, TimeUnit unit) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public ScheduledFuture schedule(Runnable command, long delay, TimeUnit unit) { + // Schedule the runnable for execution at the specified time. + long scheduledTime = getNextExecutionTime(delay, unit); + mScheduledRunnables.put(scheduledTime, command); + + Log.i(TAG, "schedule: runnable=" + System.identityHashCode(command) + ", time=" + + scheduledTime); + + return new TestScheduledExecutorService.CompletedFuture(command, delay); + } + + @Override + public ScheduledFuture schedule(Callable callable, long delay, TimeUnit unit) { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public ScheduledFuture scheduleAtFixedRate(Runnable command, long initialDelay, long period, + TimeUnit unit) { + return scheduleWithFixedDelay(command, initialDelay, period, unit); + } + + @Override + public ScheduledFuture scheduleWithFixedDelay(Runnable command, long initialDelay, + long delay, TimeUnit unit) { + // Schedule the runnable for execution at the specified time. + long nextScheduledTime = getNextExecutionTime(delay, unit); + mScheduledRunnables.put(nextScheduledTime, command); + mRepeatDuration.put(command, unit.toMillis(delay)); + + return new TestScheduledExecutorService.CompletedFuture(command, delay); + } + + private long getNextExecutionTime(long delay, TimeUnit unit) { + long delayMillis = unit.toMillis(delay); + return mClock + delayMillis; + } + + @Override + public void execute(Runnable command) { + command.run(); + } + + /** + * Used in unit tests, used to add a delta to the "clock" so that we can fire off scheduled + * items and reschedule the repeats. + * @param duration The duration (millis) to add to the clock. + */ + public void advanceTime(long duration) { + Map nextRepeats = new HashMap<>(); + List toRun = new ArrayList<>(); + mClock += duration; + Iterator> iterator = mScheduledRunnables.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry entry = iterator.next(); + if (mClock >= entry.getKey()) { + toRun.add(entry.getValue()); + + Runnable r = entry.getValue(); + Log.i(TAG, "advanceTime: runningRunnable=" + System.identityHashCode(r)); + // If this is a repeating scheduled item, schedule the repeat. + if (mRepeatDuration.containsKey(r)) { + // schedule next execution + nextRepeats.put(mClock + mRepeatDuration.get(r), entry.getValue()); + } + iterator.remove(); + } + } + + // Update things at the end to avoid concurrent access. + mScheduledRunnables.putAll(nextRepeats); + toRun.forEach(r -> r.run()); + } + + /** + * Used from a {@link CompletedFuture} as defined above to cancel a scheduled task. + * @param r The runnable to cancel. + */ + private void cancelRunnable(Runnable r) { + Optional> found = mScheduledRunnables.entrySet().stream() + .filter(e -> e.getValue() == r) + .findFirst(); + if (found.isPresent()) { + mScheduledRunnables.remove(found.get().getKey()); + } + mRepeatDuration.remove(r); + Log.i(TAG, "cancelRunnable: runnable=" + System.identityHashCode(r)); + } + + public int getNumberOfScheduledRunnables() { + return mScheduledRunnables.size(); + } + + public boolean isRunnableScheduledAtTime(long time) { + return mScheduledRunnables.containsKey(time); + } +} \ No newline at end of file