Skip to content

Commit eaf8353

Browse files
adamretteradamretter
committed
Merge pull request #168 from evolvedbinary/6.x.x/hotfix/ldap
[6.x.x] Address issues in the LDAP Security Realm
2 parents 47458e9 + 786a4f7 commit eaf8353

55 files changed

Lines changed: 4684 additions & 1172 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎elemental-parent/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@
314314
<form>XML_STYLE</form>
315315
<g>SLASHSTAR_STYLE</g>
316316
<java>SLASHSTAR_STYLE</java>
317+
<ldif>SCRIPT_STYLE</ldif>
317318
<plist>XML_STYLE</plist>
318319
<types>SCRIPT_STYLE</types>
319320
<xconf>XML_STYLE</xconf>

‎exist-core/pom.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,7 @@
854854
<include>src/test/java/org/exist/collections/triggers/XQueryTriggerSetUidTest.java</include>
855855
<include>src/test/java/org/exist/collections/triggers/XQueryTriggerTest.java</include>
856856
<include>src/main/java/org/exist/config/Configuration.java</include>
857+
<include>src/main/java/org/exist/config/ConfigurationDocumentTrigger.java</include>
857858
<include>src/main/java/org/exist/config/ConfigurationImpl.java</include>
858859
<include>src/main/java/org/exist/config/Configurator.java</include>
859860
<include>src/test/java/org/exist/config/TwoDatabasesTest.java</include>
@@ -974,10 +975,14 @@
974975
<include>src/main/java/org/exist/repo/ExistRepository.java</include>
975976
<include>src/main/java/org/exist/scheduler/UserXQueryJob.java</include>
976977
<include>src/main/java/org/exist/scheduler/impl/QuartzSchedulerImpl.java</include>
978+
<include>src/main/java/org/exist/security/AbstractRealm.java</include>
979+
<include>src/main/java/org/exist/security/AXSchemaType.java</include>
977980
<include>src/main/java/org/exist/security/EffectiveSubject.java</include>
981+
<include>src/main/java/org/exist/security/EXistSchemaType.java</include>
978982
<include>src/test/java/org/exist/security/FnDocSecurityTest.java</include>
979983
<include>src/main/java/org/exist/security/Permission.java</include>
980984
<include>src/main/java/org/exist/security/PermissionRequired.java</include>
985+
<include>src/main/java/org/exist/security/Principal.java</include>
981986
<include>src/test/java/org/exist/security/RestApiSecurityTest.java</include>
982987
<include>src/main/java/org/exist/security/SecurityManager.java</include>
983988
<include>src/main/java/org/exist/security/SimpleACLPermissionInternal.java</include>
@@ -986,7 +991,11 @@
986991
<include>src/test/java/org/exist/security/UnixStylePermissionTest.java</include>
987992
<include>src/test/java/org/exist/security/XqueryApiTest.java</include>
988993
<include>src/main/java/org/exist/security/internal/AccountImpl.java</include>
994+
<include>src/main/java/org/exist/security/internal/RealmImpl.java</include>
995+
<include>src/main/java/org/exist/security/internal/SecurityManagerImpl.java</include>
989996
<include>src/main/java/org/exist/security/internal/aider/UnixStylePermissionAider.java</include>
997+
<include>src/main/java/org/exist/security/management/AccountsManagement.java</include>
998+
<include>src/main/java/org/exist/security/management/GroupsManagement.java</include>
990999
<include>src/main/java/org/exist/source/Source.java</include>
9911000
<include>src/main/java/org/exist/source/SourceFactory.java</include>
9921001
<include>src/main/java/org/exist/source/URLSource.java</include>
@@ -1550,6 +1559,7 @@
15501559
<exclude>src/test/java/org/exist/collections/triggers/XQueryTriggerSetUidTest.java</exclude>
15511560
<exclude>src/test/java/org/exist/collections/triggers/XQueryTriggerTest.java</exclude>
15521561
<exclude>src/main/java/org/exist/config/Configuration.java</exclude>
1562+
<exclude>src/main/java/org/exist/config/ConfigurationDocumentTrigger.java</exclude>
15531563
<exclude>src/main/java/org/exist/config/ConfigurationImpl.java</exclude>
15541564
<exclude>src/main/java/org/exist/config/Configurator.java</exclude>
15551565
<exclude>src/test/java/org/exist/config/TwoDatabasesTest.java</exclude>
@@ -1684,11 +1694,15 @@
16841694
<exclude>src/main/java/org/exist/resolver/XercesXmlResolverAdapter.java</exclude>
16851695
<exclude>src/main/java/org/exist/scheduler/UserXQueryJob.java</exclude>
16861696
<exclude>src/main/java/org/exist/scheduler/impl/QuartzSchedulerImpl.java</exclude>
1697+
<exclude>src/main/java/org/exist/security/AbstractRealm.java</exclude>
1698+
<exclude>src/main/java/org/exist/security/AXSchemaType.java</exclude>
16871699
<exclude>src/main/java/org/exist/security/EffectiveSubject.java</exclude>
1700+
<exclude>src/main/java/org/exist/security/EXistSchemaType.java</exclude>
16881701
<exclude>src/test/java/org/exist/security/FnDocSecurityTest.java</exclude>
16891702
<exclude>src/main/java/org/exist/security/Permission.java</exclude>
16901703
<exclude>src/main/java/org/exist/security/PermissionRequired.java</exclude>
16911704
<exclude>src/main/java/org/exist/security/PermissionRequiredCheck.java</exclude>
1705+
<exclude>src/main/java/org/exist/security/Principal.java</exclude>
16921706
<exclude>src/test/java/org/exist/security/RestApiSecurityTest.java</exclude>
16931707
<exclude>src/main/java/org/exist/security/SecurityManager.java</exclude>
16941708
<exclude>src/main/java/org/exist/security/SimpleACLPermissionInternal.java</exclude>
@@ -1697,7 +1711,11 @@
16971711
<exclude>src/test/java/org/exist/security/UnixStylePermissionTest.java</exclude>
16981712
<exclude>src/test/java/org/exist/security/XqueryApiTest.java</exclude>
16991713
<exclude>src/main/java/org/exist/security/internal/AccountImpl.java</exclude>
1714+
<exclude>src/main/java/org/exist/security/internal/RealmImpl.java</exclude>
1715+
<exclude>src/main/java/org/exist/security/internal/SecurityManagerImpl.java</exclude>
17001716
<exclude>src/main/java/org/exist/security/internal/aider/UnixStylePermissionAider.java</exclude>
1717+
<exclude>src/main/java/org/exist/security/management/AccountsManagement.java</exclude>
1718+
<exclude>src/main/java/org/exist/security/management/GroupsManagement.java</exclude>
17011719
<exclude>src/main/java/org/exist/source/Source.java</exclude>
17021720
<exclude>src/main/java/org/exist/source/SourceFactory.java</exclude>
17031721
<exclude>src/main/java/org/exist/source/URLSource.java</exclude>

‎exist-core/src/main/java/org/exist/config/ConfigurationDocumentTrigger.java‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
/*
2+
* Elemental
3+
* Copyright (C) 2024, Evolved Binary Ltd
4+
*
5+
* admin@evolvedbinary.com
6+
* https://www.evolvedbinary.com | https://www.elemental.xyz
7+
*
8+
* This library is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU Lesser General Public
10+
* License as published by the Free Software Foundation; version 2.1.
11+
*
12+
* This library is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public
18+
* License along with this library; if not, write to the Free Software
19+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+
*
21+
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
22+
* The original license header is included below.
23+
*
24+
* =====================================================================
25+
*
226
* eXist-db Open Source Native XML Database
327
* Copyright (C) 2001 The eXist-db Authors
428
*
@@ -334,9 +358,10 @@ private void processPrincipal(final PrincipalType principalType) throws SAXExcep
334358

335359
//check if there is a name collision, i.e. another principal with the same name
336360
final String principalName = findName();
337-
// first check if the account or group exists before trying to retrieve it
338-
// otherwise the LDAP realm will create a new user, leading to an endless loop
361+
362+
// NOTE(AR) first check if the account or group exists before trying to retrieve it otherwise a realm (e.g. LDAP) may create a new user, which could lead to an endless loop and eventually a StackOverflowError
339363
final boolean principalExists = principalName != null && principalType.hasPrincipal(sm, principalName);
364+
340365
Principal existingPrincipleByName = null;
341366
if (principalExists) {
342367
existingPrincipleByName = principalType.getPrincipal(sm, principalName);

‎exist-core/src/main/java/org/exist/config/Configurator.java‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
import java.util.function.Predicate;
6767
import java.util.stream.Collectors;
6868
import java.util.stream.Stream;
69+
import javax.annotation.Nullable;
6970
import javax.xml.XMLConstants;
7071
import javax.xml.parsers.ParserConfigurationException;
7172
import javax.xml.parsers.SAXParser;
@@ -156,9 +157,15 @@ protected static <T extends Annotation> T getAnnotation(Field field, Class<T> an
156157
*
157158
* @return The Getter method for the property or null
158159
*/
159-
public static Method searchForGetMethod(final Class<?> clazz, final String property) {
160+
public static @Nullable Method searchForGetMethod(final Class<?> clazz, final String property) {
160161
try {
161-
final String methodName = ("get" + property).toLowerCase();
162+
String methodName = property;
163+
if (!methodName.startsWith("get-") && !methodName.startsWith("get_")) {
164+
methodName = "get" + methodName;
165+
}
166+
methodName = methodName.replace("-", "");
167+
methodName = methodName.replace("_", "");
168+
162169
for (final Method method : clazz.getMethods()) {
163170
if (method.getName().equalsIgnoreCase(methodName)) {
164171
return method;
@@ -178,9 +185,15 @@ public static Method searchForGetMethod(final Class<?> clazz, final String prope
178185
*
179186
* @return The Setter method for the field or null
180187
*/
181-
public static Method searchForSetMethod(final Class<?> clazz, final Field field) {
188+
public static @Nullable Method searchForSetMethod(final Class<?> clazz, final Field field) {
182189
try {
183-
final String methodName = ("set" + field.getName()).toLowerCase();
190+
String methodName = field.getName();
191+
if (!methodName.startsWith("set-") && !methodName.startsWith("set_")) {
192+
methodName = "set" + methodName;
193+
}
194+
methodName = methodName.replace("-", "");
195+
methodName = methodName.replace("_", "");
196+
184197
for (final Method method : clazz.getMethods()) {
185198
if (method.getName().equalsIgnoreCase(methodName)) {
186199
return method;
@@ -200,9 +213,14 @@ public static Method searchForSetMethod(final Class<?> clazz, final Field field)
200213
*
201214
* @return The Adder method for the property or null
202215
*/
203-
public static Method searchForAddMethod(final Class<?> clazz, final String property) {
216+
public static @Nullable Method searchForAddMethod(final Class<?> clazz, final String property) {
204217
try {
205-
final String methodName = ("add" + property).toLowerCase();
218+
String methodName = property;
219+
if (!methodName.startsWith("add-") && !methodName.startsWith("add_")) {
220+
methodName = "add" + methodName;
221+
}
222+
methodName = methodName.replace("-", "");
223+
methodName = methodName.replace("_", "");
206224
for (final Method method : clazz.getMethods()) {
207225
if (method.getName().equalsIgnoreCase(methodName)
208226
&& method.getParameterTypes().length == 1
@@ -216,9 +234,15 @@ public static Method searchForAddMethod(final Class<?> clazz, final String prope
216234
return null;
217235
}
218236

219-
public static Method searchForInsertMethod(final Class<?> clazz, final String property) {
237+
public static @Nullable Method searchForInsertMethod(final Class<?> clazz, final String property) {
220238
try {
221-
final String methodName = ("insert" + property).toLowerCase();
239+
String methodName = property;
240+
if (!methodName.startsWith("insert-") && !methodName.startsWith("insert_")) {
241+
methodName = "insert" + methodName;
242+
}
243+
methodName = methodName.replace("-", "");
244+
methodName = methodName.replace("_", "");
245+
222246
for (final Method method : clazz.getMethods()) {
223247
if (method.getName().equalsIgnoreCase(methodName)
224248
&& method.getParameterTypes().length == 2

‎exist-core/src/main/java/org/exist/security/AXSchemaType.java‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
/*
2+
* Elemental
3+
* Copyright (C) 2024, Evolved Binary Ltd
4+
*
5+
* admin@evolvedbinary.com
6+
* https://www.evolvedbinary.com | https://www.elemental.xyz
7+
*
8+
* This library is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU Lesser General Public
10+
* License as published by the Free Software Foundation; version 2.1.
11+
*
12+
* This library is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public
18+
* License along with this library; if not, write to the Free Software
19+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+
*
21+
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
22+
* The original license header is included below.
23+
*
24+
* =====================================================================
25+
*
226
* eXist-db Open Source Native XML Database
327
* Copyright (C) 2001 The eXist-db Authors
428
*
@@ -21,6 +45,8 @@
2145
*/
2246
package org.exist.security;
2347

48+
import javax.annotation.Nullable;
49+
2450
/**
2551
*
2652
* @author <a href="mailto:adam.retter@googlemail.com">Adam Retter</a>
@@ -54,7 +80,7 @@ public String getAlias() {
5480
return alias;
5581
}
5682

57-
public static AXSchemaType valueOfNamespace(final String namespace) {
83+
public static @Nullable AXSchemaType valueOfNamespace(final String namespace) {
5884
for(final AXSchemaType axSchemaType : AXSchemaType.values()) {
5985
if(axSchemaType.getNamespace().equals(namespace)) {
6086
return axSchemaType;
@@ -63,7 +89,7 @@ public static AXSchemaType valueOfNamespace(final String namespace) {
6389
return null;
6490
}
6591

66-
public static AXSchemaType valueOfAlias(final String alias) {
92+
public static @Nullable AXSchemaType valueOfAlias(final String alias) {
6793
for(final AXSchemaType axSchemaType : AXSchemaType.values()) {
6894
if(axSchemaType.getAlias().equals(alias)) {
6995
return axSchemaType;

0 commit comments

Comments
 (0)