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 ca...@apache.org on 2018/11/23 12:06:01 UTC
svn commit: r1847249 - in /jackrabbit/oak/branches/1.6: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FilteredSortedSetDocValuesFacetCounts.java
oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Author: catholicon
Date: Fri Nov 23 12:06:00 2018
New Revision: 1847249
URL: http://svn.apache.org/viewvc?rev=1847249&view=rev
Log:
OAK-7808: Incorrect facet counts when some results are inaccessible due to ACLs (backport r1843175 from trunk)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FilteredSortedSetDocValuesFacetCounts.java
jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 23 12:06:00 2018
@@ -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,1790502-1790503,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,1800613,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,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814189,1814332,1814397,1814475,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822850,1823172,1823655,1824896,1825471,1825654,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1829527,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830239,1830748,1831190,1831374,1832258,1832379,1832535,1833308,1834112,1834648-1834649,1834681,1835060,1836082,1837475,1837998,1838637,1839746,1840024,1840
226,1842677,1843222,1843231,1844549,1844642,1844728,1846057
+/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,1790502-1790503,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,1800613,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,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814189,1814332,1814397,1814475,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822850,1823172,1823655,1824896,1825471,1825654,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1829527,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830239,1830748,1831190,1831374,1832258,1832379,1832535,1833308,1834112,1834648-1834649,1834681,1835060,1836082,1837475,1837998,1838637,1839746,1840024,1840
226,1842677,1843175,1843222,1843231,1844549,1844642,1844728,1846057
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FilteredSortedSetDocValuesFacetCounts.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FilteredSortedSetDocValuesFacetCounts.java?rev=1847249&r1=1847248&r2=1847249&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FilteredSortedSetDocValuesFacetCounts.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FilteredSortedSetDocValuesFacetCounts.java Fri Nov 23 12:06:00 2018
@@ -19,9 +19,9 @@
package org.apache.jackrabbit.oak.plugins.index.lucene.util;
import java.io.IOException;
-import java.util.HashMap;
import java.util.Map;
+import com.google.common.collect.Maps;
import org.apache.jackrabbit.oak.plugins.index.lucene.FieldNames;
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.lucene.document.Document;
@@ -34,9 +34,11 @@ import org.apache.lucene.facet.sortedset
import org.apache.lucene.facet.sortedset.SortedSetDocValuesReaderState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.SortedSetDocValues;
+import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.util.BytesRef;
+
+import javax.annotation.Nonnull;
/**
* ACL filtered version of {@link SortedSetDocValuesFacetCounts}
@@ -65,9 +67,10 @@ class FilteredSortedSetDocValuesFacetCou
}
LabelAndValue[] labelAndValues = topChildren.labelValues;
+ InaccessibleFacetCountManager inaccessibleFacetCountManager = new InaccessibleFacetCountManager();
for (ScoreDoc scoreDoc : docs.scoreDocs) {
- labelAndValues = filterFacet(scoreDoc.doc, dim, labelAndValues);
+ labelAndValues = filterFacet(scoreDoc.doc, dim, labelAndValues, inaccessibleFacetCountManager);
}
int childCount = labelAndValues.length;
@@ -79,45 +82,82 @@ class FilteredSortedSetDocValuesFacetCou
return new FacetResult(dim, path, value, labelAndValues, childCount);
}
- private LabelAndValue[] filterFacet(int docId, String dimension, LabelAndValue[] labelAndValues) throws IOException {
- boolean filterd = false;
- Map<String, Long> newValues = new HashMap<String, Long>();
-
+ private LabelAndValue[] filterFacet(int docId, String dimension, LabelAndValue[] labelAndValues,
+ InaccessibleFacetCountManager inaccessibleFacetCountManager) throws IOException {
Document document = reader.document(docId);
- SortedSetDocValues docValues = state.getDocValues();
- docValues.setDocument(docId);
// filter using doc values (avoiding requiring stored values)
if (!filter.isAccessible(document.getField(FieldNames.PATH).stringValue() + "/" + dimension)) {
- filterd = true;
- for (LabelAndValue lv : labelAndValues) {
- long existingCount = lv.value.longValue();
-
- BytesRef key = new BytesRef(FacetsConfig.pathToString(dimension, new String[]{lv.label}));
- long l = docValues.lookupTerm(key);
- if (l >= 0) {
- if (existingCount > 0) {
- newValues.put(lv.label, existingCount - 1);
- } else {
- if (newValues.containsKey(lv.label)) {
- newValues.remove(lv.label);
- }
- }
+
+ SortedSetDocValues docValues = state.getDocValues();
+ docValues.setDocument(docId);
+ TermsEnum termsEnum = docValues.termsEnum();
+
+ long ord = docValues.nextOrd();
+
+ while (ord != SortedSetDocValues.NO_MORE_ORDS) {
+ termsEnum.seekExact(ord);
+ String facetDVTerm = termsEnum.term().utf8ToString();
+ String [] facetDVDimPaths = FacetsConfig.stringToPath(facetDVTerm);
+
+ for (int i = 1; i < facetDVDimPaths.length; i++) {
+ inaccessibleFacetCountManager.markInaccessbile(facetDVDimPaths[i]);
}
+
+ ord = docValues.nextOrd();
}
}
- LabelAndValue[] filteredLVs;
- if (filterd) {
- filteredLVs = new LabelAndValue[newValues.size()];
- int i = 0;
- for (Map.Entry<String, Long> entry : newValues.entrySet()) {
- filteredLVs[i] = new LabelAndValue(entry.getKey(), entry.getValue());
- i++;
+
+ return inaccessibleFacetCountManager.updateLabelAndValue(labelAndValues);
+ }
+
+ static class InaccessibleFacetCountManager {
+ Map<String, Long> inaccessbileCounts = Maps.newHashMap();
+
+ void markInaccessbile(@Nonnull String label) {
+ Long count = inaccessbileCounts.get(label);
+ if (count == null) {
+ count = 1L;
+ } else {
+ count--;
}
- } else {
- filteredLVs = labelAndValues;
+ inaccessbileCounts.put(label, count);
}
- return filteredLVs;
+ LabelAndValue[] updateLabelAndValue(LabelAndValue[] currentLabels) {
+ int numZeros = 0;
+
+ LabelAndValue[] newValues;
+
+ for (int i = 0; i < currentLabels.length; i++) {
+ LabelAndValue lv = currentLabels[i];
+ Long inaccessibleCount = inaccessbileCounts.get(lv.label);
+
+ if (inaccessibleCount != null) {
+ long newValue = lv.value.longValue() - inaccessibleCount;
+
+ if (newValue <= 0) {
+ newValue = 0;
+ numZeros++;
+ }
+
+ currentLabels[i] = new LabelAndValue(lv.label, newValue);
+ }
+ }
+
+ if (numZeros > 0) {
+ newValues = new LabelAndValue[currentLabels.length - numZeros];
+ int i = 0;
+ for (LabelAndValue lv : currentLabels) {
+ if (lv.value.longValue() > 0) {
+ newValues[i++] = lv;
+ }
+ }
+ } else {
+ newValues = currentLabels;
+ }
+
+ return newValues;
+ }
}
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1847249&r1=1847248&r2=1847249&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java Fri Nov 23 12:06:00 2018
@@ -26,8 +26,12 @@ import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
import javax.jcr.query.QueryResult;
import javax.jcr.query.RowIterator;
+import javax.jcr.security.Privilege;
import java.util.List;
+import java.util.Map;
+import com.google.common.collect.Maps;
+import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
import org.apache.jackrabbit.core.query.AbstractQueryTest;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants;
import org.apache.jackrabbit.oak.query.facet.FacetResult;
@@ -632,6 +636,112 @@ public class FacetTest extends AbstractQ
assertFalse(rows.hasNext());
}
+ public void testNoFacetsIfNoAccess() throws Exception {
+ deny(testRootNode.addNode("test1")).setProperty("jcr:title", "test1");
+ deny(testRootNode.addNode("test2")).addNode("child").setProperty("jcr:title", "test2");
+ deny(testRootNode.addNode("test3").addNode("child")).setProperty("jcr:title", "test3");
+ superuser.save();
+
+ Session anonUser = getHelper().getReadOnlySession();
+ QueryManager queryManager = anonUser.getWorkspace().getQueryManager();
+ Query q = queryManager.createQuery("//*[@jcr:title]/(rep:facet(jcr:title))", Query.XPATH);
+ QueryResult result = q.execute();
+ FacetResult facetResult = new FacetResult(result);
+
+ assertNotNull("facetResult is null", facetResult);
+ assertTrue(facetResult.getDimensions().isEmpty());
+ }
+
+ public void testOnlyAllowedFacetLabelsShowUp() throws Exception {
+ deny(testRootNode.addNode("test1")).setProperty("jcr:title", "test1");
+ deny(testRootNode.addNode("test2")).addNode("child").setProperty("jcr:title", "test2");
+ testRootNode.addNode("test3").addNode("child").setProperty("jcr:title", "test3");
+ superuser.save();
+
+ Session anonUser = getHelper().getReadOnlySession();
+ QueryManager queryManager = anonUser.getWorkspace().getQueryManager();
+ Query q = queryManager.createQuery("//*[@jcr:title]/(rep:facet(jcr:title))", Query.XPATH);
+ QueryResult result = q.execute();
+ FacetResult facetResult = new FacetResult(result);
+
+ assertNotNull("facetResult is null", facetResult);
+ assertEquals("Unexpected number of dimension", 1, facetResult.getFacets("jcr:title").size());
+ FacetResult.Facet facet = facetResult.getFacets("jcr:title").get(0);
+ assertEquals("Unexpected facet label", "test3", facet.getLabel());
+ assertEquals("Unexpected facet count", 1, facet.getCount());
+ }
+
+ public void testInaccessibleFacetCounts() throws Exception {
+ deny(testRootNode.addNode("test1")).setProperty("jcr:title", "test");
+ deny(testRootNode.addNode("test2")).addNode("child").setProperty("jcr:title", "test");
+ testRootNode.addNode("test3").addNode("child").setProperty("jcr:title", "test");
+ testRootNode.addNode("test4").addNode("child").setProperty("jcr:title", "another-test");
+ superuser.save();
+
+ Session anonUser = getHelper().getReadOnlySession();
+ QueryManager queryManager = anonUser.getWorkspace().getQueryManager();
+ Query q = queryManager.createQuery("//*[@jcr:title]/(rep:facet(jcr:title))", Query.XPATH);
+ QueryResult result = q.execute();
+ FacetResult facetResult = new FacetResult(result);
+
+ assertNotNull("facetResult is null", facetResult);
+ assertEquals("Unexpected number of labels", 2, facetResult.getFacets("jcr:title").size());
+ Map<String, Integer> facets = Maps.newHashMap();
+ for (FacetResult.Facet f : facetResult.getFacets("jcr:title")) {
+ facets.put(f.getLabel(), f.getCount());
+ }
+ assertEquals("Unexpected facet count for jcr:title", 1, (int)facets.get("test"));
+ assertEquals("Unexpected facet count for jcr:title", 1, (int)facets.get("another-test"));
+ }
+
+ public void testAllowedSubNodeFacet() throws Exception {
+ allow(
+ deny(testRootNode.addNode("parent")).addNode("child")
+ ).setProperty("jcr:title", "test");
+ superuser.save();
+
+ Session anonUser = getHelper().getReadOnlySession();
+ QueryManager queryManager = anonUser.getWorkspace().getQueryManager();
+ Query q = queryManager.createQuery("//*[@jcr:title]/(rep:facet(jcr:title))", Query.XPATH);
+ QueryResult result = q.execute();
+ FacetResult facetResult = new FacetResult(result);
+
+ assertNotNull("facetResult is null", facetResult);
+ assertEquals("Unexpected number of labels", 1, facetResult.getFacets("jcr:title").size());
+ FacetResult.Facet facet = facetResult.getFacets("jcr:title").get(0);
+ assertEquals("Unexpected facet label", "test", facet.getLabel());
+ assertEquals("Unexpected facet count", 1, facet.getCount());
+ }
+
+ public void testAcRelativeFacetsAccessControl() throws Exception {
+ deny(testRootNode.addNode("test1")).addNode("jc").setProperty("text", "test_1");
+ deny(testRootNode.addNode("test2").addNode("jc")).setProperty("text", "test_2");
+ testRootNode.addNode("test3").addNode("jc").setProperty("text", "test_3");
+ superuser.save();
+
+ Session anonUser = getHelper().getReadOnlySession();
+ QueryManager queryManager = anonUser.getWorkspace().getQueryManager();
+ Query q = queryManager.createQuery("//*[jcr:contains(jc/@text, 'test')]/(rep:facet(jc/text))", Query.XPATH);
+ QueryResult result = q.execute();
+ FacetResult facetResult = new FacetResult(result);
+
+ assertNotNull("facetResult is null", facetResult);
+ assertEquals("Unexpected number of dimension", 1, facetResult.getFacets("jc/text").size());
+ FacetResult.Facet facet = facetResult.getFacets("jc/text").get(0);
+ assertEquals("Unexpected facet label", "test_3", facet.getLabel());
+ assertEquals("Unexpected facet count", 1, facet.getCount());
+ }
+
+ public Node deny(Node node) throws RepositoryException {
+ AccessControlUtils.deny(node, "anonymous", Privilege.JCR_ALL);
+ return node;
+ }
+
+ public Node allow(Node node) throws RepositoryException {
+ AccessControlUtils.allow(node, "anonymous", Privilege.JCR_READ);
+ return node;
+ }
+
private void markIndexForReindex() throws RepositoryException {
superuser.getNode("/oak:index/luceneGlobal").setProperty(REINDEX_PROPERTY_NAME, true);
}