Improvements to sub-entry security model: remove absolute subtree specifica...

matthew_swift

18.02.2010 64da486b69147b1bb7a646fb0164182cb2ef5fbe

Improvements to sub-entry security model: remove absolute subtree specification

 opends/src/server/org/opends/server/core/AbsoluteSubtreeSpecification.java

File was deleted

 opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java

File was deleted

 opends/src/server/org/opends/server/schema/SchemaConstants.java

@@ -1692,30 +1692,6 @@


  /**
   * The OID for the absolute subtree specification attribute syntax.
   */
  public static final String SYNTAX_ABSOLUTE_SUBTREE_SPECIFICATION_OID =
       SYNTAX_SUBTREE_SPECIFICATION_OID;



  /**
   * The description for the absolute subtree specification attribute syntax.
   */
  public static final String SYNTAX_ABSOLUTE_SUBTREE_SPECIFICATION_DESCRIPTION =
    "Absolute Subtree Specification";



  /**
   * The name for the absolute subtree specification attribute syntax.
   */
  public static final String SYNTAX_ABSOLUTE_SUBTREE_SPECIFICATION_NAME =
    SYNTAX_SUBTREE_SPECIFICATION_NAME;



  /**
   * The OID for the relative subtree specification attribute syntax.
   */
  public static final String SYNTAX_RELATIVE_SUBTREE_SPECIFICATION_OID =

 opends/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java

@@ -43,7 +43,6 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.api.SubtreeSpecification;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AbsoluteSubtreeSpecification;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.RFC3672SubtreeSpecification;
import org.opends.server.core.RelativeSubtreeSpecification;
@@ -122,11 +121,6 @@
                rootDN, specString);
        return subTreeSpec;
      } catch (DirectoryException de) {}
      try {
        subTreeSpec = AbsoluteSubtreeSpecification.valueOf(
                specString);
        return subTreeSpec;
      } catch (DirectoryException de) {}

      if (subTreeSpec == null) {
        Message message =
@@ -294,11 +288,6 @@
              DN.nullDN(), specString);
      return true;
    } catch (DirectoryException de) {}
    try {
      subTreeSpec = AbsoluteSubtreeSpecification.valueOf(
              specString);
      return true;
    } catch (DirectoryException de) {}

    if (subTreeSpec == null) {
      Message message =

 opends/src/server/org/opends/server/types/SubEntry.java

@@ -28,7 +28,6 @@
package org.opends.server.types;

import org.opends.messages.Message;
import org.opends.server.core.AbsoluteSubtreeSpecification;
import org.opends.server.core.RelativeSubtreeSpecification;
import org.opends.server.api.SubtreeSpecification;
import java.util.List;
@@ -247,17 +246,6 @@
          {
            break;
          }
          try
          {
            this.subTreeSpec = AbsoluteSubtreeSpecification.valueOf(
                    specString);
            isValidSpec = true;
          }
          catch (DirectoryException de)
          {
            isValidSpec = false;
          }
          break;
        }
        if (this.subTreeSpec != null)
        {

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java

@@ -569,35 +569,6 @@

    // Remove Relative Spec test subentry.
    TestCaseUtils.deleteEntry(relativeSubentry.getDN());

    // Add Absolute Spec test subentry.
    Entry absoluteSubentry = TestCaseUtils.makeEntry(
         "dn: cn=Absolute Subentry," + SUFFIX,
         "objectClass: top",
         "objectclass: subentry",
         "subtreeSpecification: {absoluteBase \"ou=Test SubEntry Manager\"}",
         "cn: Subentry");
    addOperation =
         connection.processAdd(absoluteSubentry.getDN(),
                               absoluteSubentry.getObjectClasses(),
                               absoluteSubentry.getUserAttributes(),
                               absoluteSubentry.getOperationalAttributes());
    assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
    assertNotNull(DirectoryServer.getEntry(absoluteSubentry.getDN()));

    List<SubEntry> absoluteSubList =
            DirectoryServer.getSubentryManager().getSubentries();
    for (SubEntry subentry : absoluteSubList)
    {
      if (subentry.getDN().equals(absoluteSubentry.getDN()))
      {
        SubtreeSpecification spec = subentry.getSubTreeSpecification();
        assertTrue(spec instanceof AbsoluteSubtreeSpecification);
      }
    }

    // Remove Absolute Spec test subentry.
    TestCaseUtils.deleteEntry(absoluteSubentry.getDN());
  }

  private void addTestEntries() throws Exception

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestAbsoluteSubtreeSpecification.java

File was deleted