Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
* Portions Copyright 2014 Manuel Gaupp
* Portions Copyright 2011-2016 ForgeRock AS.
* Portions Copyright 2026 3A Systems, LLC.
*/
package org.forgerock.opendj.ldap.schema;

Expand Down Expand Up @@ -2116,7 +2117,7 @@ public boolean removeSyntax(final String numericOID) {

final Syntax element = numericOID2Syntaxes.get(numericOID);
if (element != null) {
removeSyntax(element, null);
removeSyntax(element);
return true;
}
return false;
Expand Down Expand Up @@ -2490,7 +2491,7 @@ SchemaBuilder addSyntax(final Syntax syntax, final boolean overwrite) {
syntax, syntax.getOID(), conflictingSyntax.getOID());
throw new ConflictingSchemaElementException(message);
}
removeSyntax(conflictingSyntax, null);
removeSyntax(conflictingSyntax);
}

numericOID2Syntaxes.put(syntax.getOID(), syntax);
Expand Down Expand Up @@ -2688,7 +2689,7 @@ private void removeObjectClass(final ObjectClass oc, NamesMapping names) {
}
}

private void removeSyntax(final Syntax syntax, NamesMapping names) {
private void removeSyntax(final Syntax syntax) {
for (Map.Entry<String, List<String>> property : syntax.getExtraProperties().entrySet()) {
if ("x-enum".equalsIgnoreCase(property.getKey())) {
removeMatchingRule(OMR_OID_GENERIC_ENUM + "." + syntax.getOID());
Expand All @@ -2705,7 +2706,7 @@ private void validate(final Schema schema, NamesMapping names) {
try {
syntax.validate(schema, warnings);
} catch (final SchemaException e) {
removeSyntax(syntax, names);
removeSyntax(syntax);
warnings.add(ERR_SYNTAX_VALIDATION_FAIL.get(syntax, e.getMessageObject()));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,7 @@ private static SubResource configureSubResource(final String urlTemplate,
return configureCollectionSubResource(
config, resourceId, urlTemplate, dnTemplate, isReadOnly);
} else {
return configureSingletonSubResource(
config, resourceId, urlTemplate, dnTemplate, isReadOnly);
return configureSingletonSubResource(resourceId, urlTemplate, dnTemplate, isReadOnly);
}
}

Expand Down Expand Up @@ -372,8 +371,7 @@ private static void configureCollectionNamingStrategy(final JsonValue config,
}
}

private static SubResource configureSingletonSubResource(final JsonValue config,
final String resourceId,
private static SubResource configureSingletonSubResource(final String resourceId,
final String urlTemplate,
final String dnTemplate,
final Boolean isReadOnly) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -575,22 +575,11 @@ public void notifyEntryChanged(BrowserNodeInfo nodeInfo) {
/** Notify this controller that authentication data have changed in the connection pool. */
@Override
public void notifyAuthDataChanged() {
notifyAuthDataChanged(null);
}

/**
* Notify this controller that authentication data have changed in the
* connection pool for the specified url.
* The controller starts refreshing the node which represent entries from the
* url.
* @param url the URL of the connection that changed.
*/
private void notifyAuthDataChanged(LDAPURL url) {
// TODO: temporary implementation
// we should refresh only nodes :
// - whose URL matches 'url'
// - whose URL matches the URL of the connection that changed
// - whose errorType == ERROR_SOLVING_REFERRAL and
// errorArg == url
// errorArg == that URL
startRefreshReferralNodes(rootNode);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*
* Copyright 2008-2009 Sun Microsystems, Inc.
* Portions Copyright 2014-2016 ForgeRock AS.
* Portions Copyright 2026 3A Systems, LLC.
*/
package org.opends.guitools.controlpanel.task;

Expand Down Expand Up @@ -158,7 +159,7 @@ public void run()
{
final List<String> args = getObfuscatedCommandLineArguments(getDSConfigCommandLineArguments(index));
args.removeAll(getConfigCommandLineArguments());
printEquivalentCommandLine(getConfigCommandLineName(index), args,
printEquivalentCommandLine(getConfigCommandLineName(), args,
INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_INDEX.get());
}
});
Expand Down Expand Up @@ -307,7 +308,7 @@ protected ArrayList<String> getCommandLineArguments()
* @return the path of the command line to be used to delete the specified
* index.
*/
private String getConfigCommandLineName(AbstractIndexDescriptor index)
private String getConfigCommandLineName()
{
if (isServerRunning())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public void readConfiguration(final ConnectionWrapper connWrapper)

hmConnectionHandlersMonitor.clear();

readSchemaIfNeeded(connWrapper, errors);
readSchemaIfNeeded(connWrapper);

try
{
Expand Down Expand Up @@ -324,7 +324,7 @@ public void readConfiguration(final ConnectionWrapper connWrapper)
exceptions = Collections.unmodifiableList(errors);
}

private void readSchemaIfNeeded(final ConnectionWrapper connWrapper, final List<Exception> errors)
private void readSchemaIfNeeded(final ConnectionWrapper connWrapper)
{
if (mustReadSchema())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ private void copyZipEntry(ZipEntry entry, File destination,

if (entry.isDirectory())
{
String perm = getDirectoryFileSystemPermissions(destination);
String perm = getDirectoryFileSystemPermissions();
addPermission(destination, permissions, perm);
if (!Utils.createDirectory(destination))
{
Expand Down Expand Up @@ -331,10 +331,9 @@ private String getProtectedDirectoryPermissionUnix()

/**
* Returns the file system permissions for a directory.
* @param path the directory for which we want the file permissions.
* @return the file system permissions for the directory.
*/
private String getDirectoryFileSystemPermissions(File path)
private String getDirectoryFileSystemPermissions()
{
// TODO We should get this dynamically during build?
return "755";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,18 @@
*
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2015-2016 ForgeRock AS.
* Portions Copyright 2026 3A Systems, LLC.
*/
package org.opends.server.authorization.dseecompat;

/** This class provides an enumeration of the allowed authmethod types. */
enum EnumAuthMethod {
/** The enumeration type when the bind rule has specified authentication of none. */
AUTHMETHOD_NONE ("none"),
AUTHMETHOD_NONE,
/** The enumeration type when the bind rule has specified authentication of simple. */
AUTHMETHOD_SIMPLE ("simple"),
AUTHMETHOD_SIMPLE,
/** The enumeration type when the bind rule has specified authentication of ssl client auth. */
AUTHMETHOD_SSL ("ssl"),
AUTHMETHOD_SSL,
/** The enumeration type when the bind rule has specified authentication of a sasl mechanism. */
AUTHMETHOD_SASL ("sasl");

/**
* Creates a new enumeration type for this authmethod.
* @param authmethod The authemethod name.
*/
EnumAuthMethod (String authmethod){
}
AUTHMETHOD_SASL;
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2026 3A Systems, LLC.
*/

package org.opends.server.authorization.dseecompat;
Expand All @@ -28,36 +29,30 @@ public enum EnumEvalReason {
/**
* There are aren't any allow ACIs.
*/
NO_ALLOW_ACIS(0),
NO_ALLOW_ACIS,

/**
* An deny ACI either evaluated to FAIL or to TRUE.
*/
EVALUATED_DENY_ACI(1),
EVALUATED_DENY_ACI,

/**
* An allow evaluated to true.
*/
EVALUATED_ALLOW_ACI(2),
EVALUATED_ALLOW_ACI,

/**
* None of the allow and deny ACIs evaluated to true.
*/
NO_MATCHED_ALLOWS_ACIS(3),
NO_MATCHED_ALLOWS_ACIS,

/**
* No specific reason could be determined.
*/
NO_REASON(4),
NO_REASON,

/**
* The authorization DN has bypass-acl privileges.
*/
SKIP_ACI(5);

/**
* Create a new enumeration type for the specified result value.
* @param v The value of the result.
*/
EnumEvalReason(int v) {}
SKIP_ACI;
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,30 +26,22 @@ public enum EnumEvalResult {
/**
* This enumeration is returned when the result of the evaluation is TRUE.
*/
TRUE(0),
TRUE,
/**
* This enumeration is returned when the result of the evaluation is FALSE.
*/
FALSE(1),
FALSE,
/**
* This enumeration is returned when the result of the evaluation is FAIL.
* This should only be returned when a system failure occurred.
*/
FAIL(2),
FAIL,
/**
* This is an internal enumeration used during evaluation of bind rule when
* internal processing of the evaluation is undefined. It is never returned
* back as a result of the evaluation.
*/
ERR(3);

/**
* Create a new enumeration type for the specified result value.
* @param v The value of the result.
*/
EnumEvalResult(int v) {
}

ERR;
/**
* The method tries to determine if the result was undefined, and if so
* it returns an FAIL enumeration. If the result was not undefined (the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2016 ForgeRock AS.
* Portions Copyright 2026 3A Systems, LLC.
*/
package org.opends.server.authorization.dseecompat;

Expand All @@ -33,26 +34,20 @@ enum EnumUserDNType {
* The enumeration type when the "userdn" URL contains only a DN (no
* filter or scope) and that DN has no pattern.
*/
DN(0),
DN,
/**
* The enumeration type when the "userdn" URL contains only a DN (no
* filter or scope) and that DN has a substring pattern.
*/
DNPATTERN(1),
DNPATTERN,
/** The enumeration type when the "userdn" URL has the value of: "ldap:///all". */
ALL(2),
ALL,
/** The enumeration type when the "userdn" URL has the value of: "ldap:///parent". */
PARENT(3),
PARENT,
/** The enumeration type when the "userdn" URL has the value of: "ldap:///self". */
SELF(4),
SELF,
/** The enumeration type when the "userdn" URL has the value of: "ldap:///anyone". */
ANYONE(5),
ANYONE,
/** The enumeration type when the "userdn" URL is contains a DN (suffix), a scope and a filter. */
URL(6);

/**
* Constructor taking an integer value.
* @param v Integer value.
*/
EnumUserDNType(int v) {}
URL;
}
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,6 @@ private void addJsonHandler(PublisherConfig publisher, AuditServiceBuilder build
jsonConfig.setLogDirectory(logDirectory.getAbsolutePath());
jsonConfig.setName(publisher.getName());
jsonConfig.setTopics(Collections.singleton(publisher.getCommonAuditTopic()));
addJsonHandlerBufferingConfig(config, jsonConfig);
addHandlerRetentionConfig(publisher, config, jsonConfig);
addHandlerRotationConfig(publisher, config, jsonConfig);

Expand All @@ -531,12 +530,6 @@ private void addJsonHandler(PublisherConfig publisher, AuditServiceBuilder build
}
}

private void addJsonHandlerBufferingConfig(JsonConfigData config, JsonAuditEventHandlerConfiguration auditConfig)
{
JsonAuditEventHandlerConfiguration.EventBufferingConfiguration jsonBufferingConfig =
new JsonAuditEventHandlerConfiguration.EventBufferingConfiguration();
}

private void addHandlerRotationConfig(PublisherConfig publisher, HandlerConfigData config,
FileBasedEventHandlerConfiguration auditConfig) throws ConfigException
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ private void updateTrustManager() throws ConfigureDSException
}

if (StaticUtils.isFips()) {
putAdminTrustManagerConfigAttribute(trustManagerProviderDN, DN_ADMIN_TRUST_MANAGER);
putAdminTrustManagerConfigAttribute(DN_ADMIN_TRUST_MANAGER);
}
}

Expand All @@ -1045,7 +1045,7 @@ private void putTrustManagerAttribute(final Argument arg, final String attribute
}
}

private void putAdminTrustManagerConfigAttribute(final Argument trustManagerProviderDN, final String attributeDN)
private void putAdminTrustManagerConfigAttribute(final String attributeDN)
throws ConfigureDSException
{
if (keyManagerProviderDN.isPresent())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ public String doSASLBind(ByteSequence bindDN, ByteSequence bindPassword,
case SASL_MECHANISM_EXTERNAL:
return doSASLExternal(bindDN, saslProperties, requestControls, responseControls);
case SASL_MECHANISM_GSSAPI:
return doSASLGSSAPI(bindDN, bindPassword, saslProperties, requestControls, responseControls);
return doSASLGSSAPI(bindDN, bindPassword, saslProperties);
case SASL_MECHANISM_PLAIN:
return doSASLPlain(bindDN, bindPassword, saslProperties, requestControls, responseControls);
default:
Expand Down Expand Up @@ -1747,10 +1747,6 @@ private static LinkedHashMap<String, LocalizableMessage> getSASLExternalProperti
* to process the SASL bind. SASL EXTERNAL does not
* take any properties, so this should be empty or
* <CODE>null</CODE>.
* @param requestControls The set of controls to include the request to the
* server.
* @param responseControls A list to hold the set of controls included in
* the response from the server.
*
* @return A message providing additional information about the bind if
* appropriate, or <CODE>null</CODE> if there is no special
Expand All @@ -1764,9 +1760,7 @@ private static LinkedHashMap<String, LocalizableMessage> getSASLExternalProperti
*/
private String doSASLGSSAPI(ByteSequence bindDN,
ByteSequence bindPassword,
Map<String,List<String>> saslProperties,
List<Control> requestControls,
List<Control> responseControls)
Map<String,List<String>> saslProperties)
throws ClientException, LDAPException
{
String kdc = null;
Expand Down
Loading
Loading