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 re...@apache.org on 2019/06/26 10:23:59 UTC
svn commit: r1862119 - in /jackrabbit/oak/branches/1.8: ./
oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java
oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
Author: reschke
Date: Wed Jun 26 10:23:59 2019
New Revision: 1862119
URL: http://svn.apache.org/viewvc?rev=1862119&view=rev
Log:
OAK-8135: HTTP service may not select correct media type if multiple are specified in Accept header field (merged r1855993 into 1.8)
Added:
jackrabbit/oak/branches/1.8/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
- copied, changed from r1855993, jackrabbit/oak/trunk/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 26 10:23:59 2019
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.10:1854524
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160
,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845
865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855776,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857247,1857253,1857294,1857314,1857463,1857480,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1859881,1860120,1860131,1860137,1860202,1860328,1860548,1860564-1860565,1861626
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160
,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845
865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855776,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857247,1857253,1857294,1857314,1857463,1857480,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1859881,1860120,1860131,1860137,1860202,1860328,1860548,1860564-1860565,1861626
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java?rev=1862119&r1=1862118&r2=1862119&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java (original)
+++ jackrabbit/oak/branches/1.8/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java Wed Jun 26 10:23:59 2019
@@ -28,6 +28,10 @@ public class MediaRange {
private final double q;
+ private static final int QRESOLUTION = 1000;
+ private static double CORRECTIONFORSUBTYPEMATCH = 1f / (10 * QRESOLUTION);
+ private static double CORRECTIONFORTYPEANDSUBTYPEMATCH = 2f / (10 * QRESOLUTION);
+
public static MediaRange parse(String range, MediaTypeRegistry registry) {
MediaType type = MediaType.parse(range);
if (type == null) {
@@ -56,6 +60,20 @@ public class MediaRange {
this.q = q;
}
+ /**
+ * Matches the media range against the specified media type.
+ * <p>
+ * The "derived" quality value if computed from the specified q value (0 to
+ * 1) by subtracting 1/10000 in case the subtype in the range is "*", or
+ * 2/10000 if case both type and subtype are. This takes care of the
+ * precedence specified in RFC 7231, Section 5.3.2.
+ *
+ * @param type
+ * type to match
+ * @param registry
+ * media type registry
+ * @return {@code 0.0} for "no match", the derived quality value if match
+ */
public double match(MediaType type, MediaTypeRegistry registry) {
if (type.equals(this.type)) { // shortcut
return q;
@@ -70,14 +88,16 @@ public class MediaRange {
}
}
- if ("*/*".equals(this.type.toString())) {
- return q;
- } else if ("*".equals(this.type.getSubtype())
- && type.getType().equals(this.type.getType())) {
- return q;
+ if (q > 0.0 && "*/*".equals(this.type.toString())) {
+ return q - CORRECTIONFORTYPEANDSUBTYPEMATCH;
+ } else if (q > 0.0 && "*".equals(this.type.getSubtype()) && type.getType().equals(this.type.getType())) {
+ return q - CORRECTIONFORSUBTYPEMATCH;
} else {
return 0.0;
}
}
+ public String toString() {
+ return String.format("type=%s, q=%f", type, q);
+ }
}
Copied: jackrabbit/oak/branches/1.8/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java (from r1855993, jackrabbit/oak/trunk/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java?p2=jackrabbit/oak/branches/1.8/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java&p1=jackrabbit/oak/trunk/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java&r1=1855993&r2=1862119&rev=1862119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java Wed Jun 26 10:23:59 2019
@@ -16,48 +16,35 @@
*/
package org.apache.jackrabbit.oak.http;
-import static org.junit.Assert.assertEquals;
+import static junit.framework.Assert.assertEquals;
-import org.apache.tika.mime.MediaType;
import org.junit.Test;
-import com.fasterxml.jackson.core.JsonFactory;
-
public class AcceptHeaderTest {
- private Representation json = new JsonRepresentation(MediaType.parse("application/json"), new JsonFactory());
- private Representation html = new HtmlRepresentation();
-
- @Test
- public void testSpecificTypePlusGenericRange() {
- // both have the same q value (default of 1.0), but application/json is more specific
- // see RFC 7231, Section 5.3.2
- AcceptHeader ah = new AcceptHeader("application/json, */*");
- Representation selected;
-
- selected = ah.resolve(json);
- assertEquals(json, selected);
-
- selected = ah.resolve(html);
- assertEquals(html, selected);
-
- selected = ah.resolve(html);
- assertEquals(html, selected);
-
- selected = ah.resolve(json, html);
- assertEquals(json, selected);
-
- // OAK-8135
- selected = ah.resolve(html, json);
- assertEquals(json, selected);
-
- // retry with q values
- ah = new AcceptHeader("application/json; q=0.4, */*; q=0.5");
- selected = ah.resolve(html, json);
- assertEquals(html, selected);
+// @Test
+// public void testRfcExample1() {
+// AcceptHeader accept = new AcceptHeader(
+// "text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c");
+//
+// assertEquals("text/plain", accept.resolve("text/plain"));
+// assertEquals("text/html", accept.resolve("text/html"));
+// assertEquals("text/x-dvi", accept.resolve("text/x-dvi"));
+// assertEquals("text/x-c", accept.resolve("text/x-c"));
+//
+// assertEquals(
+// "application/octet-stream",
+// accept.resolve("application/octet-stream"));
+// assertEquals(
+// "application/octet-stream",
+// accept.resolve("application/pdf"));
+//
+// assertEquals("text/html", accept.resolve("text/plain", "text/html"));
+// assertEquals("text/x-c", accept.resolve("text/x-dvi", "text/x-c"));
+// assertEquals("text/x-dvi", accept.resolve("text/x-dvi", "text/plain"));
+//
+// assertEquals("text/html", accept.resolve("text/html", "text/x-c"));
+// assertEquals("text/x-c", accept.resolve("text/x-c", "text/html"));
+// }
- ah = new AcceptHeader("application/json, */*; q=0.5");
- selected = ah.resolve(html, json);
- assertEquals(json, selected);
- }
}