From 91fdf0048df4c43fe3b7412ccb7f862eab5f7669 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 02 Feb 2011 20:45:14 +0000
Subject: [PATCH] Fix issue OPENDJ-24: Fix OpenDS issue 4583: during a search op, ACI with targetfilter and targetattrs gets evaluated wrongly https://bugster.forgerock.org/jira/browse/OPENDJ-24
---
opends/src/server/org/opends/server/core/DefaultAccessControlHandler.java | 33 +++++++--------------------------
1 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/DefaultAccessControlHandler.java b/opends/src/server/org/opends/server/core/DefaultAccessControlHandler.java
index c5c888a..40ebc16 100644
--- a/opends/src/server/org/opends/server/core/DefaultAccessControlHandler.java
+++ b/opends/src/server/org/opends/server/core/DefaultAccessControlHandler.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.core;
@@ -48,13 +49,6 @@
extends AccessControlHandler<AccessControlHandlerCfg>
{
/**
- * The single handler instance.
- */
- private static DefaultAccessControlHandler instance = null;
-
-
-
- /**
* Create a new default access control handler.
*/
public DefaultAccessControlHandler()
@@ -204,22 +198,21 @@
* {@inheritDoc}
*/
@Override
- public boolean maySend(SearchOperation searchOperation,
- SearchResultEntry searchEntry)
+ public boolean maySend(Operation operation, SearchResultEntry unfilteredEntry)
{
return true;
}
+
/**
* {@inheritDoc}
*/
@Override
- public SearchResultEntry filterEntry(SearchOperation searchOperation,
- SearchResultEntry searchEntry)
+ public void filterEntry(Operation operation,
+ SearchResultEntry unfilteredEntry, SearchResultEntry filteredEntry)
{
- // No implementation required.
- return searchEntry;
+ return;
}
@@ -228,19 +221,7 @@
* {@inheritDoc}
*/
@Override
- public SearchResultEntry filterEntry(Operation operation, Entry entry)
- {
- // No implementation required.
- return new SearchResultEntry(entry);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean maySend(DN dn, SearchOperation searchOperation,
+ public boolean maySend(DN dn, Operation operation,
SearchResultReference searchReference)
{
return true;
--
Gitblit v1.10.0