svn commit: r1858847 - in /jackrabbit/oak/branches/1.8: ./ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke Date: Tue May 7 11:57:41 2019 New Revision: 1858847 URL: http://svn.apache.org/viewvc?rev=1858847=rev Log: OAK-8273: RDBDocumentStore: createOrUpdate with less than 3 ops suboptimal (ported to 1.8) Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 7 11:57:41 2019 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962 -/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,1822527,1822642,1822723,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,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,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847 088,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1850874,1851533-1851535,1851619,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854455,1854461-1854462,1854466,1854515,1854539,1854701,1854773,1854827,1854848,1854859,1854930,1855032,1855776,1856818,1857010,1857247,1857253,1857294,1857314,1857638,1857936,1858032,1858571,1858578,1858810 +/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,1822527,1822642,1822723,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,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
svn commit: r1858846 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProviderOr.java
Author: angela
Date: Tue May 7 11:50:08 2019
New Revision: 1858846
URL: http://svn.apache.org/viewvc?rev=1858846=rev
Log:
OAK-8269 : Improve readability of CompositePermissionProvider and
CompositeTreePermission (redundant code in
CompositePermissionProviderOr.getPrivileges)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProviderOr.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProviderOr.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProviderOr.java?rev=1858846=1858845=1858846=diff
==
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProviderOr.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProviderOr.java
Tue May 7 11:50:08 2019
@@ -73,8 +73,6 @@ final class CompositePermissionProviderO
Tree immutableTree = PermissionUtil.getReadOnlyTreeOrNull(tree,
getImmutableRoot());
PrivilegeBits result = PrivilegeBits.getInstance();
-PrivilegeBits denied = PrivilegeBits.getInstance();
-
PrivilegeBitsProvider bitsProvider = getBitsProvider();
for (AggregatedPermissionProvider aggregatedPermissionProvider :
getPermissionProviders()) {
PrivilegeBits supported =
aggregatedPermissionProvider.supportedPrivileges(immutableTree,
null).modifiable();
@@ -86,10 +84,6 @@ final class CompositePermissionProviderO
}
}
}
-// subtract all denied privileges from the result
-if (!denied.isEmpty()) {
-result.diff(denied);
-}
return getBitsProvider().getPrivilegeNames(result);
}
svn commit: r1858838 - in /jackrabbit/oak/trunk/oak-store-document/src: main/java/org/apache/jackrabbit/oak/plugins/document/ test/java/org/apache/jackrabbit/oak/plugins/document/
Author: mreutegg
Date: Tue May 7 10:24:15 2019
New Revision: 1858838
URL: http://svn.apache.org/viewvc?rev=1858838=rev
Log:
OAK-8300: Revision GC may remove previous document without removing reference
Added:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BackgroundSplitFailureTest.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1858838=1858837=1858838=diff
==
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Tue May 7 10:24:15 2019
@@ -2367,6 +2367,7 @@ public final class DocumentNodeStore
}
private void backgroundSplit() {
+Set invalidatedPaths = new HashSet<>();
RevisionVector head = getHeadRevision();
for (Iterator it = splitCandidates.keySet().iterator();
it.hasNext();) {
String id = it.next();
@@ -2376,6 +2377,30 @@ public final class DocumentNodeStore
}
cleanCollisions(doc, collisionGarbageBatchSize);
for (UpdateOp op : doc.split(this, head, binarySize)) {
+Path path = doc.getPath();
+// add an invalidation journal entry, unless the path
+// already has a pending _lastRev update or an invalidation
+// entry was already added in this backgroundSplit() call
+if (unsavedLastRevisions.get(path) == null
+&& invalidatedPaths.add(path)) {
+// create journal entry for cache invalidation
+JournalEntry entry =
JOURNAL.newDocument(getDocumentStore());
+entry.modified(path);
+Revision r = newRevision().asBranchRevision();
+UpdateOp journalOp = entry.asUpdateOp(r);
+if (store.create(JOURNAL, singletonList(journalOp))) {
+changes.invalidate(singletonList(r));
+LOG.debug("Journal entry {} created for split of
document {}",
+journalOp.getId(), path);
+} else {
+String msg = "Unable to create journal entry " +
+journalOp.getId() + " for document
invalidation. " +
+"Will be retried with next background split " +
+"operation.";
+throw new DocumentStoreException(msg);
+}
+}
+// apply the split operations
NodeDocument before = null;
if (!op.isNew() ||
!store.create(Collection.NODES,
Collections.singletonList(op))) {
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java?rev=1858838=1858837=1858838=diff
==
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
Tue May 7 10:24:15 2019
@@ -527,14 +527,32 @@ public final class JournalEntry extends
}
/**
- * @return if this entry has some changes to be pushed
+ * Returns {@code true} if this entry contains any changes to be written
+ * to the journal. The following information is considered a change:
+ *
+ * Documents that have been recorded as modified with either
+ * {@link #modified(Path)} or {@link #modified(Iterable)}.
+ * Branch commit journal references added with
+ * {@link #branchCommit(Iterable)}.
+ * Documents that must be invalidated and have
svn commit: r1858836 - in /jackrabbit/oak/branches/1.8: ./ oak-jcr/ oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/ oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/secu
Author: stillalex Date: Tue May 7 09:53:00 2019 New Revision: 1858836 URL: http://svn.apache.org/viewvc?rev=1858836=rev Log: OAK-7778 PasswordUtil#isPlainTextPassword doesn't validate PBKDF2 scheme Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-jcr/ (props changed) jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportTest.java jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtil.java jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtilTest.java Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 7 09:53:00 2019 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962 -/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,1822527,1822642,1822723,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,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,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847088,1847 096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1850874,1851533-1851535,1851619,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854455,1854461-1854462,1854466,1854515,1854539,1854701,1854773,1854827,1854848,1854859,1854930,1855032,1855776,1856818,1857010,1857247,1857253,1857294,1857314,1857638,1857936,1858032,1858571,1858578,1858810 +/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,1822527,1822642,1822723,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,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
svn commit: r1858830 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/security/internal/ test/java/org/apache/jackrabbit/oak/security/internal/
Author: angela
Date: Tue May 7 07:25:52 2019
New Revision: 1858830
URL: http://svn.apache.org/viewvc?rev=1858830=rev
Log:
OAK-8187 : Respect service ranking with AuthorizableNodeName,
AuthorizableActionProvider and RestrictionProvider
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilderTest.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/PreconditionsTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistrationTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java?rev=1858830=1858829=1858830=diff
==
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
Tue May 7 07:25:52 2019
@@ -83,7 +83,6 @@ import org.slf4j.LoggerFactory;
import com.google.common.io.Closer;
import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Lists.newCopyOnWriteArrayList;
import static
org.apache.jackrabbit.oak.spi.security.RegistrationConstants.OAK_SECURITY_NAME;
import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly;
import static
org.apache.jackrabbit.oak.spi.security.ConfigurationParameters.EMPTY;
@@ -153,9 +152,9 @@ public class SecurityProviderRegistratio
private final CompositePrincipalConfiguration principalConfiguration = new
CompositePrincipalConfiguration();
private final CompositeTokenConfiguration tokenConfiguration = new
CompositeTokenConfiguration();
-private final List authorizableNodeNames =
newCopyOnWriteArrayList();
-private final List authorizableActionProviders
= newCopyOnWriteArrayList();
-private final List restrictionProviders =
newCopyOnWriteArrayList();
+private final SortedMap
authorizableNodeNames = Collections.synchronizedSortedMap(new TreeMap<>());
+private final SortedMap
authorizableActionProviders = Collections.synchronizedSortedMap(new
TreeMap<>());
+private final SortedMap
restrictionProviders = Collections.synchronizedSortedMap(new TreeMap<>());
private final SortedMap
userAuthenticationFactories = Collections.synchronizedSortedMap(new
TreeMap<>());
private RootProvider rootProvider;
@@ -335,19 +334,19 @@ public class SecurityProviderRegistratio
cardinality = ReferenceCardinality.MULTIPLE,
policy = ReferencePolicy.DYNAMIC
)
-public void bindAuthorizableNodeName(AuthorizableNodeName
authorizableNodeName, Map properties) {
+public void bindAuthorizableNodeName(@NotNull ServiceReference
serviceReference, @NotNull AuthorizableNodeName authorizableNodeName) {
synchronized (this) {
-authorizableNodeNames.add(authorizableNodeName);
-addCandidate(properties);
+authorizableNodeNames.put(serviceReference, authorizableNodeName);
+addCandidate(serviceReference);
}
maybeRegister();
}
-public void unbindAuthorizableNodeName(AuthorizableNodeName
authorizableNodeName, Map properties) {
+public void unbindAuthorizableNodeName(@NotNull ServiceReference
serviceReference, @NotNull AuthorizableNodeName authorizableNodeName) {
synchronized (this) {
-authorizableNodeNames.remove(authorizableNodeName);
-removeCandidate(properties);
+authorizableNodeNames.remove(serviceReference);
+removeCandidate(serviceReference);
}
maybeUnregister();
@@ -359,19 +358,19 @@ public class SecurityProviderRegistratio
cardinality = ReferenceCardinality.MULTIPLE,
policy = ReferencePolicy.DYNAMIC
)
-public void bindAuthorizableActionProvider(AuthorizableActionProvider
authorizableActionProvider, Map properties) {
+public void bindAuthorizableActionProvider(@NotNull ServiceReference
serviceReference, @NotNull AuthorizableActionProvider
authorizableActionProvider) {
synchronized (this) {
-authorizableActionProviders.add(authorizableActionProvider);
-addCandidate(properties);
+authorizableActionProviders.put(serviceReference,
authorizableActionProvider);
+addCandidate(serviceReference);
}
maybeRegister();
}
-public
