Author: reschke
Date: Wed Jul 10 12:45:12 2019
New Revision: 1862876
URL: http://svn.apache.org/viewvc?rev=1862876&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.6)
Added:
jackrabbit/oak/branches/1.6/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.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 10 12:45:12 2019
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.8:1844835
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785161,1785172,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790417,1790502-1790503,1790549,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800609,1800613,1800749,1800756
,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808053,1808125,1808128,1808142,1808240,1808246,1808731,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1810084,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814052,1814189,1814332,1814397,1814475,1815115,1815201,1815438-1815439,1815449,1815458,1815926,1816019,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1819930,1820555,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822642,1822850,1823172,1823655,1824896,1825471,1825654,1826216,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1828529,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830
197,1830239,1830748,1831157,1831190,1831374,1832379,1832535,1833308,1833347,1833702,1833833,1834291,1834312,1834428,1834648-1834649,1834681,1835060,1835521,1835780,1836082,1837057,1837296,1837475,1837547,1837998,1838637,1839570,1839746,1840019,1840024,1840031,1840226,1842677,1843175,1843222,1843231,1843911,1844110,1844549,1844642,1844728,1845135,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846162,1846396,1846617,1847096,1848181-1848182,1848191,1848217,1848822-1848823,1850343,1850837,1853429,1853866,1853870,1854044,1854461,1855032,1856538,1856818,1857000,1859609,1859612,1860120,1860548
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785161,1785172,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790417,1790502-1790503,1790549,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800609,1800613,1800749,1800756
,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808053,1808125,1808128,1808142,1808240,1808246,1808731,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1810084,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814052,1814189,1814332,1814397,1814475,1815115,1815201,1815438-1815439,1815449,1815458,1815926,1816019,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1819930,1820555,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822642,1822850,1823172,1823655,1824896,1825471,1825654,1826216,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1828529,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830
197,1830239,1830748,1831157,1831190,1831374,1832379,1832535,1833308,1833347,1833702,1833833,1834291,1834312,1834428,1834648-1834649,1834681,1835060,1835521,1835780,1836082,1837057,1837296,1837475,1837547,1837998,1838637,1839570,1839746,1840019,1840024,1840031,1840226,1842677,1843175,1843222,1843231,1843911,1844110,1844549,1844642,1844728,1845135,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846162,1846396,1846617,1847096,1848181-1848182,1848191,1848217,1848822-1848823,1850343,1850837,1853429,1853866,1853870,1854044,1854461,1855032,1855993,1856538,1856818,1857000,1859609,1859612,1860120,1860548
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java?rev=1862876&r1=1862875&r2=1862876&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java
Wed Jul 10 12:45:12 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.6/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.6/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java?p2=jackrabbit/oak/branches/1.6/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=1862876&rev=1862876&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
Wed Jul 10 12:45:12 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);
- }
}
