loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automated g4 rollback of changelist 171999924.

Browse Source 
*** Reason for rollback ***

CookieManager APIs are fundamentally broken (b/67951242)

*** Original change description ***

Cookie-based validation in CronetDataSource

Using cookie validation from streamer, streamer can enforce that only clients who have the cookie are able to stream the video.

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173396251
This commit is contained in:
falhassen 2017-10-25 07:42:44 -07:00 committed by Oliver Woodman
parent 3285851147
commit 69e43b6abc
2 changed files with 8 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
View File

@ -45,7 +45,6 @@ import com.google.android.exoplayer2.upstream.TransferListener;
import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.Predicate;
import java.io.IOException;
import java.net.CookieManager;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
@ -104,14 +103,12 @@ public final class CronetDataSourceTest {
@Mock private CronetEngine mockCronetEngine;
private CronetDataSource dataSourceUnderTest;
private boolean redirectCalled;
@Before
public void setUp() throws Exception {
System.setProperty("dexmaker.dexcache",
InstrumentationRegistry.getTargetContext().getCacheDir().getPath());
initMocks(this);
CookieManager cookieManager = new CookieManager();
dataSourceUnderTest = spy(
new CronetDataSource(
mockCronetEngine,
@ -122,8 +119,7 @@ public final class CronetDataSourceTest {
TEST_READ_TIMEOUT_MS,
true, // resetTimeoutOnRedirects
mockClock,
null,
cookieManager));
null));
when(mockContentTypePredicate.evaluate(anyString())).thenReturn(true);
when(mockCronetEngine.newUrlRequestBuilder(
anyString(), any(UrlRequest.Callback.class), any(Executor.class)))
@ -702,27 +698,6 @@ public final class CronetDataSourceTest {
assertEquals(1, openExceptions.get());
}
@Test
public void testRedirectParseAndAttachCookie() throws HttpDataSourceException {
mockSingleRedirectSuccess();
testResponseHeader.put("Set-Cookie", "testcookie=testcookie; Path=/video");
dataSourceUnderTest.open(testDataSpec);
verify(mockUrlRequestBuilder).addHeader(eq("Cookie"), any(String.class));
verify(mockUrlRequest, never()).followRedirect();
verify(mockUrlRequest, times(2)).start();
}
@Test
public void testRedirectNoSetCookieFollowsRedirect() throws HttpDataSourceException {
mockSingleRedirectSuccess();
mockFollowRedirectSuccess();
dataSourceUnderTest.open(testDataSpec);
verify(mockUrlRequestBuilder, never()).addHeader(eq("Cookie"), any(String.class));
verify(mockUrlRequest).followRedirect();
}
@Test
public void testExceptionFromTransferListener() throws HttpDataSourceException {
mockResponseStartSuccess();
@ -837,38 +812,6 @@ public final class CronetDataSourceTest {
}).when(mockUrlRequest).start();
}
private void mockSingleRedirectSuccess() {
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
if (!redirectCalled) {
redirectCalled = true;
dataSourceUnderTest.onRedirectReceived(
mockUrlRequest,
createUrlResponseInfoWithUrl("http://example.com/video", 300),
"http://example.com/video/redirect");
} else {
dataSourceUnderTest.onResponseStarted(
mockUrlRequest,
testUrlResponseInfo);
}
return null;
}
}).when(mockUrlRequest).start();
}
private void mockFollowRedirectSuccess() {
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
dataSourceUnderTest.onResponseStarted(
mockUrlRequest,
testUrlResponseInfo);
return null;
}
}).when(mockUrlRequest).followRedirect();
}
private void mockResponseStartFailure() {
doAnswer(new Answer<Object>() {
@Override

103
extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
View File

@ -29,13 +29,9 @@ import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.ConditionVariable;
import com.google.android.exoplayer2.util.Predicate;
import java.io.IOException;
import java.net.CookieManager;
import java.net.SocketTimeoutException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@ -105,7 +101,6 @@ public class CronetDataSource extends UrlRequest.Callback implements HttpDataSou
Pattern.compile("^bytes (\\d+)-(\\d+)/(\\d+)$");
// The size of read buffer passed to cronet UrlRequest.read().
private static final int READ_BUFFER_SIZE_BYTES = 32 * 1024;
private static final String SET_COOKIE = "Set-Cookie";
private final CronetEngine cronetEngine;
private final Executor executor;
@ -118,7 +113,6 @@ public class CronetDataSource extends UrlRequest.Callback implements HttpDataSou
private final RequestProperties requestProperties;
private final ConditionVariable operation;
private final Clock clock;
private final CookieManager cookieManager;
// Accessed by the calling thread only.
private boolean opened;
@ -158,7 +152,7 @@ public class CronetDataSource extends UrlRequest.Callback implements HttpDataSou
public CronetDataSource(CronetEngine cronetEngine, Executor executor,
Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener) {
this(cronetEngine, executor, contentTypePredicate, listener, DEFAULT_CONNECT_TIMEOUT_MILLIS,
DEFAULT_READ_TIMEOUT_MILLIS, false, null, /* cookieManager= */ null);
DEFAULT_READ_TIMEOUT_MILLIS, false, null);
}
/**
@ -182,42 +176,13 @@ public class CronetDataSource extends UrlRequest.Callback implements HttpDataSou
int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects,
RequestProperties defaultRequestProperties) {
this(cronetEngine, executor, contentTypePredicate, listener, connectTimeoutMs,
readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties,
/* cookieManager= */ null);
}
/**
* @param cronetEngine A CronetEngine.
* @param executor The {@link java.util.concurrent.Executor} that will handle responses.
* This may be a direct executor (i.e. executes tasks on the calling thread) in order
* to avoid a thread hop from Cronet's internal network thread to the response handling
* thread. However, to avoid slowing down overall network performance, care must be taken
* to make sure response handling is a fast operation when using a direct executor.
* @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
* predicate then an {@link InvalidContentTypeException} is thrown from
* {@link #open(DataSpec)}.
* @param listener An optional listener.
* @param connectTimeoutMs The connection timeout, in milliseconds.
* @param readTimeoutMs The read timeout, in milliseconds.
* @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
* @param defaultRequestProperties The default request properties to be used.
* @param cookieManager An optional {@link CookieManager} to be used to handle "Set-Cookie"
* requests. If this is null, then "Set-Cookie" requests will be ignored.
*/
public CronetDataSource(CronetEngine cronetEngine, Executor executor,
Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener,
int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects,
RequestProperties defaultRequestProperties, CookieManager cookieManager) {
this(cronetEngine, executor, contentTypePredicate, listener, connectTimeoutMs,
readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties,
cookieManager);
readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties);
}
/* package */ CronetDataSource(CronetEngine cronetEngine, Executor executor,
Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener,
int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects, Clock clock,
RequestProperties defaultRequestProperties, CookieManager cookieManager) {
RequestProperties defaultRequestProperties) {
this.cronetEngine = Assertions.checkNotNull(cronetEngine);
this.executor = Assertions.checkNotNull(executor);
this.contentTypePredicate = contentTypePredicate;
@ -227,7 +192,6 @@ public class CronetDataSource extends UrlRequest.Callback implements HttpDataSou
this.resetTimeoutOnRedirects = resetTimeoutOnRedirects;
this.clock = Assertions.checkNotNull(clock);
this.defaultRequestProperties = defaultRequestProperties;
this.cookieManager = cookieManager;
requestProperties = new RequestProperties();
operation = new ConditionVariable();
}
@ -267,12 +231,7 @@ public class CronetDataSource extends UrlRequest.Callback implements HttpDataSou
operation.close();
resetConnectTimeout();
currentDataSpec = dataSpec;
try {
currentUrlRequest = buildRequest(dataSpec);
} catch (IOException e) {
throw new OpenException(e, dataSpec, Status.IDLE);
}
currentUrlRequest.start();
try {
@ -443,24 +402,7 @@ public class CronetDataSource extends UrlRequest.Callback implements HttpDataSou
if (resetTimeoutOnRedirects) {
resetConnectTimeout();
}
Map<String, List<String>> headers = info.getAllHeaders();
if (cookieManager == null || isEmpty(headers.get(SET_COOKIE))) {
request.followRedirect();
} else {
currentUrlRequest.cancel();
UrlRequest.Builder requestBuilder =
cronetEngine.newUrlRequestBuilder(newLocationUrl, this, executor).allowDirectExecutor();
try {
parseCookies(info);
attachCookies(newLocationUrl, requestBuilder);
currentUrlRequest = requestBuilder.build();
currentUrlRequest.start();
} catch (IOException e) {
exception = e;
operation.open();
}
}
}
@Override
@ -468,12 +410,7 @@ public class CronetDataSource extends UrlRequest.Callback implements HttpDataSou
if (request != currentUrlRequest) {
return;
}
try {
parseCookies(info);
responseInfo = info;
} catch (IOException e) {
exception = e;
}
operation.open();
}
@ -513,7 +450,7 @@ public class CronetDataSource extends UrlRequest.Callback implements HttpDataSou
// Internal methods.
private UrlRequest buildRequest(DataSpec dataSpec) throws IOException {
private UrlRequest buildRequest(DataSpec dataSpec) throws OpenException {
UrlRequest.Builder requestBuilder = cronetEngine.newUrlRequestBuilder(
dataSpec.uri.toString(), this, executor).allowDirectExecutor();
// Set the headers.
@ -560,7 +497,6 @@ public class CronetDataSource extends UrlRequest.Callback implements HttpDataSou
executor);
}
}
attachCookies(dataSpec.uri.toString(), requestBuilder);
return requestBuilder.build();
}
@ -578,37 +514,6 @@ public class CronetDataSource extends UrlRequest.Callback implements HttpDataSou
currentConnectTimeoutMs = clock.elapsedRealtime() + connectTimeoutMs;
}
private void parseCookies(UrlResponseInfo info) throws IOException {
if (cookieManager == null) {
return;
}
try {
cookieManager.put(new URI(info.getUrl()), info.getAllHeaders());
} catch (URISyntaxException e) {
throw new IOException("Failed to parse cookies", e);
}
}
private void attachCookies(String url, UrlRequest.Builder requestBuilder) throws IOException {
if (cookieManager == null) {
return;
}
try {
for (Entry<String, List<String>> headers :
cookieManager.get(new URI(url), Collections.emptyMap()).entrySet()) {
StringBuilder cookies = new StringBuilder();
for (String cookie : headers.getValue()) {
cookies.append(cookie).append("; ");
}
if (cookies.length() > 0) {
requestBuilder.addHeader(headers.getKey(), cookies.substring(0, cookies.length() - 1));
}
}
} catch (URISyntaxException e) {
throw new IOException("Failed to attach cookies", e);
}
}
private static boolean getIsCompressed(UrlResponseInfo info) {
for (Map.Entry<String, String> entry : info.getAllHeadersAsList()) {
if (entry.getKey().equalsIgnoreCase("Content-Encoding")) {