You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ma...@apache.org on 2020/03/04 01:42:28 UTC
svn commit: r1874770 - in /jackrabbit/oak/trunk:
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessTest.java
oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
Author: mattryan
Date: Wed Mar 4 01:42:28 2020
New Revision: 1874770
URL: http://svn.apache.org/viewvc?rev=1874770&view=rev
Log:
OAK-8936 - Include domain override ignored flag when converting to BlobDownloadOptions in ValueImpl.
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessTest.java
jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessTest.java?rev=1874770&r1=1874769&r2=1874770&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessTest.java Wed Mar 4 01:42:28 2020
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.jcr.bi
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
@@ -29,6 +30,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
import javax.jcr.Binary;
import javax.jcr.Repository;
@@ -44,6 +47,7 @@ import org.apache.jackrabbit.api.Jackrab
import org.apache.jackrabbit.api.binary.BinaryDownload;
import org.apache.jackrabbit.api.binary.BinaryDownloadOptions;
import org.apache.jackrabbit.api.binary.BinaryUpload;
+import org.apache.jackrabbit.api.binary.BinaryUploadOptions;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.Oak;
@@ -103,6 +107,14 @@ public class BinaryAccessTest extends Ab
return toURI(DOWNLOAD_URL);
}
+ private static String DEFAULT_CDN_DOWNLOAD_URL = null;
+
+ private static String ALT_CDN_DOWNLOAD_URL = "http://cdn.com/dumm/url/for/test/download";
+
+ private static String CDN_DOWNLOAD_URL = DEFAULT_CDN_DOWNLOAD_URL;
+
+ private static URI cdnDownloadURI() { return CDN_DOWNLOAD_URL == null ? null : toURI(CDN_DOWNLOAD_URL); }
+
private static final String UPLOAD_TOKEN = "super-safe-encrypted-token";
private static final String UPLOAD_URL = "http://expected.com/dummy/url/for/test/upload";
@@ -111,6 +123,17 @@ public class BinaryAccessTest extends Ab
return toURI(UPLOAD_URL);
}
+ private static String DEFAULT_CDN_UPLOAD_URL = null;
+
+ private static String ALT_CDN_UPLOAD_URL = "http://cdn.com/dummy/url/for/test/upload";
+
+ private static String CDN_UPLOAD_URL = DEFAULT_CDN_UPLOAD_URL;
+
+ private static URI cdnUploadURI() { return CDN_UPLOAD_URL == null ? null : toURI(CDN_UPLOAD_URL); }
+
+ // These tests need to run sync - the lock will force that even if the user tries to run them in parallel
+ private static final Lock lock = new ReentrantLock();
+
private static URI toURI(String url) {
try {
return new URI(url);
@@ -161,7 +184,11 @@ public class BinaryAccessTest extends Ab
@Override
public @NotNull Collection<URI> getUploadURIs() {
Collection<URI> uris = new ArrayList<>();
- uris.add(expectedUploadURI());
+ URI uri = cdnUploadURI();
+ if (null == uri || options.isDomainOverrideIgnored()) {
+ uri = expectedUploadURI();
+ }
+ uris.add(uri);
return uris;
}
};
@@ -202,116 +229,266 @@ public class BinaryAccessTest extends Ab
@Override
public @Nullable URI getDownloadURI(@NotNull Blob blob,
@NotNull BlobDownloadOptions blobDownloadOptions) {
- return expectedDownloadURI();
+ URI uri = cdnDownloadURI();
+ if (null == uri || blobDownloadOptions.isDomainOverrideIgnored()) {
+ uri = expectedDownloadURI();
+ }
+ return uri;
}
}
- @Test
- public void testBinaryDownload() throws RepositoryException {
+ private BinaryDownload setupBinaryDownloadTest() throws RepositoryException {
Content content = Content.createRandom(SEGMENT_INLINE_SIZE * 2);
Binary binary = BinaryAccessTestUtils.storeBinaryAndRetrieve(getAdminSession(), FILE_PATH, content);
assertTrue(binary instanceof BinaryDownload);
- BinaryDownload binaryDownload = (BinaryDownload) binary;
- URI uri = binaryDownload.getURI(BinaryDownloadOptions.DEFAULT);
+ return (BinaryDownload) binary;
+ }
+
+ @Test
+ public void testBinaryDownload() throws RepositoryException {
+ try {
+ lock.lock();
- // we only need test that the we get a URI back (from our mock) to validate oak-jcr's inner workings
- assertNotNull(uri);
- assertEquals(expectedDownloadURI(), uri);
+ BinaryDownload binaryDownload = setupBinaryDownloadTest();
+ URI uri = binaryDownload.getURI(BinaryDownloadOptions.DEFAULT);
+
+ // we only need test that the we get a URI back (from our mock) to validate oak-jcr's inner workings
+ assertNotNull(uri);
+ assertEquals(expectedDownloadURI(), uri);
+ }
+ finally {
+ lock.unlock();
+ }
+ }
+
+ @Test
+ public void testBinaryDownloadWithCDN() throws RepositoryException {
+ try {
+ lock.lock();
+
+ BinaryDownload binaryDownload = setupBinaryDownloadTest();
+ String cdnUrlBefore = CDN_DOWNLOAD_URL;
+ URI uri = null;
+ try {
+ CDN_DOWNLOAD_URL = ALT_CDN_DOWNLOAD_URL;
+ uri = binaryDownload.getURI(BinaryDownloadOptions.DEFAULT);
+ } finally {
+ CDN_DOWNLOAD_URL = cdnUrlBefore;
+ }
+
+ // we only need test that the we get a URI back (from our mock) to validate oak-jcr's inner workings
+ assertNotNull(uri);
+ assertEquals(toURI(ALT_CDN_DOWNLOAD_URL), uri);
+ }
+ finally {
+ lock.unlock();
+ }
+ }
+
+ @Test
+ public void testBinaryDownloadWithCDNIgnored() throws RepositoryException {
+ try {
+ lock.lock();
+
+ BinaryDownload binaryDownload = setupBinaryDownloadTest();
+ String cdnUrlBefore = CDN_DOWNLOAD_URL;
+ URI uri = null;
+ try {
+ CDN_DOWNLOAD_URL = ALT_CDN_DOWNLOAD_URL;
+ uri = binaryDownload.getURI(BinaryDownloadOptions.builder().withDomainOverrideIgnored(true).build());
+ } finally {
+ CDN_DOWNLOAD_URL = cdnUrlBefore;
+ }
+
+ // we only need test that the we get a URI back (from our mock) to validate oak-jcr's inner workings
+ assertNotNull(uri);
+ assertEquals(expectedDownloadURI(), uri);
+ }
+ finally {
+ lock.unlock();
+ }
}
@Test
public void testBinaryUpload() throws RepositoryException, IOException {
- Content content = Content.createRandom(SEGMENT_INLINE_SIZE * 2);
+ try {
+ lock.lock();
+
+ Content content = Content.createRandom(SEGMENT_INLINE_SIZE * 2);
+
+ ValueFactory vf = getAdminSession().getValueFactory();
+ assertTrue(vf instanceof JackrabbitValueFactory);
+
+ JackrabbitValueFactory valueFactory = (JackrabbitValueFactory) vf;
- ValueFactory vf = getAdminSession().getValueFactory();
- assertTrue(vf instanceof JackrabbitValueFactory);
+ // 1. test initiate
+ BinaryUpload binaryUpload = valueFactory.initiateBinaryUpload(content.size(), 1);
- JackrabbitValueFactory valueFactory = (JackrabbitValueFactory) vf;
+ assertNotNull(binaryUpload);
+ assertEquals(UPLOAD_TOKEN, binaryUpload.getUploadToken());
+ assertEquals(expectedUploadURI(), binaryUpload.getUploadURIs().iterator().next());
- // 1. test initiate
- BinaryUpload binaryUpload = valueFactory.initiateBinaryUpload(content.size(), 1);
+ // 2. simulate an "upload"
+ blobContent = content;
- assertNotNull(binaryUpload);
- assertEquals(UPLOAD_TOKEN, binaryUpload.getUploadToken());
+ // 3. test complete
+ Binary binary = valueFactory.completeBinaryUpload(binaryUpload.getUploadToken());
- // 2. simulate an "upload"
- blobContent = content;
+ assertNotNull(binary);
+ assertEquals(content.size(), binary.getSize());
- // 3. test complete
- Binary binary = valueFactory.completeBinaryUpload(binaryUpload.getUploadToken());
+ // 4. test that we can use this binary in JCR
+ BinaryAccessTestUtils.storeBinary(getAdminSession(), FILE_PATH, binary);
- assertNotNull(binary);
- assertEquals(content.size(), binary.getSize());
+ binary = BinaryAccessTestUtils.getBinary(getAdminSession(), FILE_PATH);
+ content.assertEqualsWith(binary.getStream());
+ }
+ finally {
+ lock.unlock();
+ }
+ }
+
+ @Test
+ public void testBinaryUploadWithCDN() throws RepositoryException {
+ try {
+ lock.lock();
- // 4. test that we can use this binary in JCR
- BinaryAccessTestUtils.storeBinary(getAdminSession(), FILE_PATH, binary);
+ Content content = Content.createRandom(SEGMENT_INLINE_SIZE * 2);
+ String cdnUrlBefore = CDN_UPLOAD_URL;
+ BinaryUpload binaryUpload = null;
+ URI uploadUri = null;
+ try {
+ CDN_UPLOAD_URL = ALT_CDN_UPLOAD_URL;
+
+ ValueFactory vf = getAdminSession().getValueFactory();
+ assertTrue(vf instanceof JackrabbitValueFactory);
+
+ JackrabbitValueFactory valueFactory = (JackrabbitValueFactory) vf;
+
+ binaryUpload = valueFactory.initiateBinaryUpload(content.size(), 1);
+ uploadUri = binaryUpload.getUploadURIs().iterator().next();
+ } finally {
+ CDN_UPLOAD_URL = cdnUrlBefore;
+ }
- binary = BinaryAccessTestUtils.getBinary(getAdminSession(), FILE_PATH);
- content.assertEqualsWith(binary.getStream());
+ assertNotNull(binaryUpload);
+ assertNotNull(uploadUri);
+ assertEquals(toURI(ALT_CDN_UPLOAD_URL), uploadUri);
+ }
+ finally {
+ lock.unlock();
+ }
+ }
+
+ @Test
+ public void testBinaryUploadWithCDNOverride() throws RepositoryException {
+ try {
+ lock.lock();
+
+ Content content = Content.createRandom(SEGMENT_INLINE_SIZE * 2);
+ String cdnUrlBefore = CDN_UPLOAD_URL;
+ BinaryUpload binaryUpload = null;
+ URI uploadUri = null;
+ try {
+ CDN_UPLOAD_URL = ALT_CDN_UPLOAD_URL;
+
+ ValueFactory vf = getAdminSession().getValueFactory();
+ assertTrue(vf instanceof JackrabbitValueFactory);
+
+ JackrabbitValueFactory valueFactory = (JackrabbitValueFactory) vf;
+
+ binaryUpload = valueFactory.initiateBinaryUpload(content.size(), 1,
+ BinaryUploadOptions.builder().withDomainOverrideIgnore(true).build());
+ uploadUri = binaryUpload.getUploadURIs().iterator().next();
+ } finally {
+ CDN_UPLOAD_URL = cdnUrlBefore;
+ }
+
+ assertNotNull(binaryUpload);
+ assertNotNull(uploadUri);
+ assertEquals(expectedUploadURI(), uploadUri);
+ }
+ finally {
+ lock.unlock();
+ }
}
@Test
public void testEvent() throws Exception {
- BinaryAccessTestUtils.storeBinaryAndRetrieve(getAdminSession(), FILE_PATH, Content.createRandom(0));
+ try {
+ lock.lock();
- ObservationManager obsMgr = getAdminSession().getWorkspace().getObservationManager();
- EventResult result = new EventResult(new LogPrintWriter(LOG));
- obsMgr.addEventListener(result, Event.PROPERTY_CHANGED, FILE_PATH, true, null, null, false);
+ BinaryAccessTestUtils.storeBinaryAndRetrieve(getAdminSession(), FILE_PATH, Content.createRandom(0));
- Content content = Content.createRandom(SEGMENT_INLINE_SIZE * 2);
- BinaryAccessTestUtils.storeBinaryAndRetrieve(getAdminSession(), FILE_PATH, content);
+ ObservationManager obsMgr = getAdminSession().getWorkspace().getObservationManager();
+ EventResult result = new EventResult(new LogPrintWriter(LOG));
+ obsMgr.addEventListener(result, Event.PROPERTY_CHANGED, FILE_PATH, true, null, null, false);
- Event[] events = result.getEvents(TimeUnit.SECONDS.toMillis(5));
- assertEquals(1, events.length);
+ Content content = Content.createRandom(SEGMENT_INLINE_SIZE * 2);
+ BinaryAccessTestUtils.storeBinaryAndRetrieve(getAdminSession(), FILE_PATH, content);
- assertEquals(Event.PROPERTY_CHANGED, events[0].getType());
- Value afterValue = (Value) events[0].getInfo().get("afterValue");
- assertNotNull(afterValue);
- Binary binary = afterValue.getBinary();
- content.assertEqualsWith(binary.getStream());
+ Event[] events = result.getEvents(TimeUnit.SECONDS.toMillis(5));
+ assertEquals(1, events.length);
- assertTrue(binary instanceof BinaryDownload);
+ assertEquals(Event.PROPERTY_CHANGED, events[0].getType());
+ Value afterValue = (Value) events[0].getInfo().get("afterValue");
+ assertNotNull(afterValue);
+ Binary binary = afterValue.getBinary();
+ content.assertEqualsWith(binary.getStream());
+
+ assertTrue(binary instanceof BinaryDownload);
- BinaryDownload binaryDownload = (BinaryDownload) binary;
- URI uri = binaryDownload.getURI(BinaryDownloadOptions.DEFAULT);
+ BinaryDownload binaryDownload = (BinaryDownload) binary;
+ URI uri = binaryDownload.getURI(BinaryDownloadOptions.DEFAULT);
- assertNotNull(uri);
- assertEquals(expectedDownloadURI(), uri);
+ assertNotNull(uri);
+ assertEquals(expectedDownloadURI(), uri);
+ }
+ finally {
+ lock.unlock();
+ }
}
@Test
public void testAuthorizableProperty() throws Exception {
- assertTrue(getAdminSession() instanceof JackrabbitSession);
- JackrabbitSession session = (JackrabbitSession) getAdminSession();
- UserManager userMgr = session.getUserManager();
- ValueFactory vf = session.getValueFactory();
-
- Content content = Content.createRandom(SEGMENT_INLINE_SIZE * 2);
- Binary binary = BinaryAccessTestUtils.storeBinaryAndRetrieve(getAdminSession(), FILE_PATH, content);
-
- Authorizable auth = userMgr.getAuthorizable(session.getUserID());
- assertNotNull(auth);
+ try {
+ lock.lock();
- auth.setProperty("avatar", vf.createValue(binary));
- if (!userMgr.isAutoSave()) {
- session.save();
- }
+ assertTrue(getAdminSession() instanceof JackrabbitSession);
+ JackrabbitSession session = (JackrabbitSession) getAdminSession();
+ UserManager userMgr = session.getUserManager();
+ ValueFactory vf = session.getValueFactory();
+
+ Content content = Content.createRandom(SEGMENT_INLINE_SIZE * 2);
+ Binary binary = BinaryAccessTestUtils.storeBinaryAndRetrieve(getAdminSession(), FILE_PATH, content);
+
+ Authorizable auth = userMgr.getAuthorizable(session.getUserID());
+ assertNotNull(auth);
+
+ auth.setProperty("avatar", vf.createValue(binary));
+ if (!userMgr.isAutoSave()) {
+ session.save();
+ }
- Value[] values = auth.getProperty("avatar");
- assertNotNull(values);
- assertEquals(1, values.length);
- binary = values[0].getBinary();
+ Value[] values = auth.getProperty("avatar");
+ assertNotNull(values);
+ assertEquals(1, values.length);
+ binary = values[0].getBinary();
- content.assertEqualsWith(binary.getStream());
+ content.assertEqualsWith(binary.getStream());
- assertTrue(binary instanceof BinaryDownload);
+ assertTrue(binary instanceof BinaryDownload);
- BinaryDownload binaryDownload = (BinaryDownload) binary;
- URI uri = binaryDownload.getURI(BinaryDownloadOptions.DEFAULT);
+ BinaryDownload binaryDownload = (BinaryDownload) binary;
+ URI uri = binaryDownload.getURI(BinaryDownloadOptions.DEFAULT);
- assertNotNull(uri);
- assertEquals(expectedDownloadURI(), uri);
+ assertNotNull(uri);
+ assertEquals(expectedDownloadURI(), uri);
+ }
+ finally {
+ lock.unlock();
+ }
}
}
Modified: jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java?rev=1874770&r1=1874769&r2=1874770&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java (original)
+++ jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java Wed Mar 4 01:42:28 2020
@@ -400,7 +400,8 @@ class ValueImpl implements JackrabbitVal
downloadOptions.getMediaType(),
downloadOptions.getCharacterEncoding(),
downloadOptions.getFileName(),
- downloadOptions.getDispositionType())
+ downloadOptions.getDispositionType(),
+ downloadOptions.isDownloadDomainIgnored())
);
}
}