[#859] Warn and continue loading LDIF schemas on install (#860)

Author: maximthomas

openam-core/src/main/java/com/sun/identity/setup/AMSetupDSConfig.java

@@ -25,6 +25,7 @@
  * $Id: AMSetupDSConfig.java,v 1.20 2009/11/20 23:52:55 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2025 3A Systems LLC.
  */
 package com.sun.identity.setup;
 
@@ -43,6 +44,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.forgerock.openam.ldap.LDAPRequests;
+import org.forgerock.openam.ldap.LDAPSchemaModificationException;
 import org.forgerock.openam.ldap.LDAPUtils;
 import org.forgerock.openam.ldap.LdifUtils;
 import org.forgerock.opendj.ldap.Connection;
@@ -245,24 +247,27 @@ String isDITLoaded(boolean ssl) {
      */
     public void loadSchemaFiles(List schemaFiles)
         throws ConfiguratorException {
-        try {
-            for (Iterator i = schemaFiles.iterator(); i.hasNext(); ) {
-                String file = (String)i.next();
-                int idx = file.lastIndexOf("/");
-                String schemaFile = (idx != -1) ? file.substring(idx+1) : file;
-                Object[] params = {schemaFile};
-                SetupProgress.reportStart("emb.loadingschema", params);
+
+        for (Iterator i = schemaFiles.iterator(); i.hasNext(); ) {
+            String file = (String) i.next();
+            int idx = file.lastIndexOf("/");
+            String schemaFile = (idx != -1) ? file.substring(idx + 1) : file;
+            Object[] params = {schemaFile};
+            SetupProgress.reportStart("emb.loadingschema", params);
+            try {
                 LdifUtils.createSchemaFromLDIF(basedir + "/" + schemaFile, ld.getConnection());
                 SetupProgress.reportEnd("emb.success", null);
+            } catch (IOException e) {
+                Debug.getInstance(SetupConstants.DEBUG_NAME).error(
+                        "AMSetupDSConfig.loadSchemaFiles:failed", e);
+                SetupProgress.reportEnd("emb.failed", null);
+                InstallLog.getInstance().write(
+                        "AMSetupDSConfig.loadSchemaFiles:failed", e);
+                if(!(e instanceof LDAPSchemaModificationException)) {
+                    throw new ConfiguratorException("configurator.ldiferror",
+                            null, locale);
+                }
             }
-        } catch (IOException e) {
-            Debug.getInstance(SetupConstants.DEBUG_NAME).error(
-                 "AMSetupDSConfig.loadSchemaFiles:failed", e);
-            SetupProgress.reportEnd("emb.failed", null);
-            InstallLog.getInstance().write(
-                 "AMSetupDSConfig.loadSchemaFiles:failed", e);
-            throw new ConfiguratorException("configurator.ldiferror",
-                null, locale);
         }
     }
 

openam-ldap-utils/src/main/java/org/forgerock/openam/ldap/LDAPSchemaModificationException.java

@@ -0,0 +1,45 @@
+/*
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions copyright [year] [name of copyright owner]".
+ *
+ * Copyright 2025 3A Systems LLC.
+ */
+
+package org.forgerock.openam.ldap;
+
+import java.io.IOException;
+
+/**
+ * Exception thrown when an LDAP schema modification fails.
+ */
+public class LDAPSchemaModificationException extends IOException {
+
+    /**
+     * Constructs a new exception with the specified detail message.
+     *
+     * @param message The detail message explaining the error.
+     */
+    public LDAPSchemaModificationException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message
+     * and cause of the error.
+     *
+     * @param message The detail message explaining the error.
+     * @param cause   The cause of the error (can be null).
+     */
+    public LDAPSchemaModificationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

openam-ldap-utils/src/main/java/org/forgerock/openam/ldap/LdifUtils.java

@@ -117,13 +117,13 @@ public IOException visitChangeRecord(Void aVoid, AddRequest change) {
                                 } catch (LdapException ex) {
                                     DEBUG.error("LDAPUtils.createSchemaFromLDIF - Could not modify schema: {}",
                                             modifyRequest, ex);
-                                    return new IOException(String.format("LDAPUtils.createSchemaFromLDIF - " +
+                                    return new LDAPSchemaModificationException(String.format("LDAPUtils.createSchemaFromLDIF - " +
                                             "Could not modify schema: %s; ex: %s", modifyRequest, ex));
                                 }
                             }
                         } else {
                             DEBUG.error("LDAPUtils.createSchemaFromLDIF - Could not add to schema: {}", change, e);
-                            return new IOException(String.format("LDAPUtils.createSchemaFromLDIF - " +
+                            return new LDAPSchemaModificationException(String.format("LDAPUtils.createSchemaFromLDIF - " +
                                     "Could not add to schema: %s; ex: %s", change, e));
                         }
                     }
@@ -138,7 +138,7 @@ public IOException visitChangeRecord(Void aVoid, ModifyRequest change) {
                         ld.modify(change);
                     } catch (LdapException e) {
                         DEBUG.error("LDAPUtils.createSchemaFromLDIF - Could not modify schema: {}", change, e);
-                        return new IOException(String.format("LDAPUtils.createSchemaFromLDIF - " +
+                        return new LDAPSchemaModificationException(String.format("LDAPUtils.createSchemaFromLDIF - " +
                                 "Could not modify schema: %s; ex: %s", change, e));
                     }
                     return null;