Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#438] FIX import-ldif --offline "import has been aborted because the entry does not have a parent entry" #444

Merged
merged 13 commits into from
Oct 29, 2024
Merged

[#438] FIX import-ldif --offline "import has been aborted because the entry does not have a parent entry" #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b45f335
[#438] FIX import-ldif --offline "import has been aborted because the…
vharseko Oct 22, 2024
df249d2
Fix windows test
vharseko Oct 22, 2024
4dcd2bb
Fix test
vharseko Oct 22, 2024
5cd2c6e
Fix MAC OS build failure (#445)
maximthomas Oct 24, 2024
46e5540
[#438] FIX import-ldif --offline "import has been aborted because the…
vharseko Oct 22, 2024
9949774
Fix windows test
vharseko Oct 22, 2024
e46fc78
Fix test
vharseko Oct 22, 2024
89b98af
Merge remote-tracking branch 'vharseko/issue/438' into issue/438
vharseko Oct 24, 2024
a9019df
FIX children should only have one RDN separator past the parent lengt…
vharseko Oct 28, 2024
129d778
FIX children should only have one RDN separator past the parent lengt…
vharseko Oct 28, 2024
d7c59e3
Revert "Fix test"
vharseko Oct 28, 2024
10ad784
FIX children should only have one RDN separator past the parent lengt…
vharseko Oct 28, 2024
bbfbcae
Immediate children should only have one RDN separator past the parent…
vharseko Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ jobs:
opendj-server-legacy/target/package/opendj/bin/status --bindDN "cn=Directory Manager" --bindPassword password
opendj-server-legacy/target/package/opendj/bin/ldapsearch --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example,dc=com" --searchScope base "(objectClass=*)" 1.1
opendj-server-legacy/target/package/opendj/bin/ldapsearch --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "ou=people,dc=example,dc=com" --searchScope sub "(uid=user.*)" dn | grep ^dn: | wc -l | grep -q 5000
opendj-server-legacy/target/package/opendj/bin/dsconfig create-backend --hostname localhost --port 4444 --bindDN "cn=Directory Manager" --bindPassword password --backend-name=example2 --type je --set=base-dn:dc=example2,dc=com --set=enabled:true --no-prompt --trustAll
opendj-server-legacy/target/package/opendj/bin/makeldif -o /tmp/test.ldif -c suffix=dc=example2,dc=com opendj-server-legacy/target/package/opendj/config/MakeLDIF/example.template
opendj-server-legacy/target/package/opendj/bin/stop-ds
opendj-server-legacy/target/package/opendj/bin/makeldif -o /tmp/test.ldif opendj-server-legacy/target/package/opendj/config/MakeLDIF/example.template
opendj-server-legacy/target/package/opendj/bin/import-ldif --offline --ldifFile /tmp/test.ldif --backendID=userRoot
opendj-server-legacy/target/package/opendj/bin/import-ldif --offline --ldifFile /tmp/test.ldif --backendID=example2
opendj-server-legacy/target/package/opendj/bin/start-ds
opendj-server-legacy/target/package/opendj/bin/ldapsearch --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "ou=people,dc=example,dc=com" --searchScope sub "(uid=user.*)" dn | grep ^dn: | wc -l | grep -q 10000
opendj-server-legacy/target/package/opendj/bin/ldapsearch --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "ou=people,dc=example2,dc=com" --searchScope sub "(uid=user.*)" dn | grep ^dn: | wc -l | grep -q 10000
opendj-server-legacy/target/package/opendj/bin/stop-ds
rm -rf opendj-server-legacy/target/package/opendj/config opendj-server-legacy/target/package/opendj/db opendj-server-legacy/target/package/opendj/changelogDb opendj-server-legacy/target/package/opendj/logs
- name: Test LDAP in Cassandra
Expand All @@ -89,11 +90,12 @@ jobs:
opendj-server-legacy\target\package\opendj\bat\status.bat --bindDN "cn=Directory Manager" --bindPassword password
opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example,dc=com" --searchScope base "(objectClass=*)" 1.1
opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example,dc=com" --searchScope sub "(uid=user.*)" dn | find /c '"dn:"' | findstr "5000"
opendj-server-legacy\target\package\opendj\bat\dsconfig.bat create-backend --hostname localhost --port 4444 --bindDN "cn=Directory Manager" --bindPassword password --backend-name=example2 --type je --set=base-dn:dc=example2,dc=com --set=enabled:true --no-prompt --trustAll
opendj-server-legacy\target\package\opendj\bat\makeldif.bat -o test.ldif -c suffix=dc=example2,dc=com opendj-server-legacy\target\package\opendj\config\MakeLDIF\example.template
opendj-server-legacy\target\package\opendj\bat\stop-ds.bat
opendj-server-legacy\target\package\opendj\bat\makeldif.bat -o test.ldif opendj-server-legacy\target\package\opendj\config\MakeLDIF\example.template
opendj-server-legacy\target\package\opendj\bat\import-ldif.bat --offline --ldifFile test.ldif --backendID=userRoot
opendj-server-legacy\target\package\opendj\bat\import-ldif.bat --offline --ldifFile test.ldif --backendID=example2
opendj-server-legacy\target\package\opendj\bat\start-ds.bat
opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example,dc=com" --searchScope sub "(uid=user.*)" dn | find /c '"dn:"' | findstr "10000"
opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example2,dc=com" --searchScope sub "(uid=user.*)" dn | find /c '"dn:"' | findstr "10000"
opendj-server-legacy\target\package\opendj\bat\stop-ds.bat
- name: Upload artifacts OpenDJ Server
uses: actions/upload-artifact@v4
Expand Down
19 changes: 18 additions & 1 deletion opendj-packages/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@
<profile>
<id>distribution-unix</id>
<activation>
<os><family>unix</family></os>
<os>
<family>unix</family>
<name>Linux</name>
</os>
</activation>
<modules>
<module>../opendj-doc-generated-ref</module>
Expand All @@ -56,6 +59,20 @@
<module>opendj-docker</module>
</modules>
</profile>
<profile>
<id>distribution-mac</id>
<activation>
<os>
<family>unix</family>
<name>Mac OS X</name>
</os>
</activation>
<modules>
<module>opendj-svr4</module>
<module>opendj-msi</module>
<module>opendj-docker</module>
</modules>
</profile>
<profile>
<id>distribution-windows</id>
<activation>
Expand Down
8 changes: 6 additions & 2 deletions opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DnKeyFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2014-2016 ForgeRock AS.
* Portions Copyright 2024 3A Systems, LLC.
*/
package org.opends.server.backends.pluggable;

Expand Down Expand Up @@ -119,8 +120,8 @@ static ByteStringBuilder afterLastChildOf(final ByteSequence key)
static boolean isChild(ByteSequence parent, ByteSequence child)
{
if (child.length() <= parent.length()
|| child.byteAt(parent.length()) != NORMALIZED_RDN_SEPARATOR
|| !child.startsWith(parent))
|| child.byteAt(parent.length()) != NORMALIZED_RDN_SEPARATOR
|| !child.startsWith(parent))
{
return false;
}
Expand All @@ -132,6 +133,9 @@ static boolean isChild(ByteSequence parent, ByteSequence child)
{
if (childSeparatorDetected)
{
if (child.byteAt(i-1)==NORMALIZED_ESC_BYTE) {
continue;
}
Comment on lines +136 to +138
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

problem cause

return false;
}
childSeparatorDetected = true;
Expand Down
15 changes: 1 addition & 14 deletions ...server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,7 @@
*
* Portions Copyright 2014 The Apache Software Foundation
* Copyright 2015-2016 ForgeRock AS.
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Portions Copyright 2023-2024 3A Systems, LLC
*/
package org.opends.server.backends.pluggable;

Expand Down
5 changes: 4 additions & 1 deletion opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*
* Copyright 2006-2009 Sun Microsystems, Inc.
* Portions Copyright 2014-2016 ForgeRock AS.
* Portions Copyright 2024 3A Systems, LLC.
*/
package org.opends.server.backends.pluggable;

Expand Down Expand Up @@ -506,7 +507,9 @@ private Object[][] testIsChildData()
{ "dc=example,dc=com\\,org", // parentDn
"ou=people,dc=example,dc=com\\,org", // childDn
true }, // Is childDn a child of parentDn ?

{ "dc=example,dc=com",
"n=0,dc=example,dc=com",
true },
{ "dc=example,dc=com",
"dc=com",
false },
Expand Down