From 59869bedd9ba1d3e3565f729db16c63aa6386ea1 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 15 Sep 2011 08:55:53 +0000
Subject: [PATCH] Fix OPENDJ-283: Log usage of obsolete proxied authorization V1 control
---
opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java | 4 ++
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java | 4 ++
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java | 4 ++
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java | 23 ++---------
opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java | 4 ++
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java | 4 ++
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java | 16 ++-----
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java | 4 ++
8 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java b/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
index 1e1053f..4e8fa76 100644
--- a/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
+++ b/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
@@ -168,6 +168,10 @@
}
else
{
+ // Log usage of legacy proxy authz V1 control.
+ operation.addAdditionalLogItem(AdditionalLogItem.keyOnly(getClass(),
+ "obsoleteProxiedAuthzV1Control"));
+
authorizationEntry = proxyControlV1.getAuthorizationEntry();
}
operation.setAuthorizationEntry(authorizationEntry);
diff --git a/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java b/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
index 27150bf..b6aea06 100644
--- a/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
@@ -477,6 +477,10 @@
}
else if (oid.equals(OID_PROXIED_AUTH_V1))
{
+ // Log usage of legacy proxy authz V1 control.
+ addAdditionalLogItem(AdditionalLogItem.keyOnly(getClass(),
+ "obsoleteProxiedAuthzV1Control"));
+
// The requester must have the PROXIED_AUTH privilige in order to be
// able to use this control.
if (! clientConnection.hasPrivilege(Privilege.PROXIED_AUTH, this))
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
index 9a2f57b..54196ae 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
@@ -1496,6 +1496,10 @@
}
else if (oid.equals(OID_PROXIED_AUTH_V1))
{
+ // Log usage of legacy proxy authz V1 control.
+ addAdditionalLogItem(AdditionalLogItem.keyOnly(getClass(),
+ "obsoleteProxiedAuthzV1Control"));
+
// The requester must have the PROXIED_AUTH privilige in order to
// be able to use this control.
if (! getClientConnection().hasPrivilege(Privilege.PROXIED_AUTH,
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
index b37d0ae..f663e1b 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
@@ -476,6 +476,10 @@
}
else if (oid.equals(OID_PROXIED_AUTH_V1))
{
+ // Log usage of legacy proxy authz V1 control.
+ addAdditionalLogItem(AdditionalLogItem.keyOnly(getClass(),
+ "obsoleteProxiedAuthzV1Control"));
+
// The requester must have the PROXIED_AUTH privilige in order to
// be able to use this control.
if (! clientConnection.hasPrivilege(Privilege.PROXIED_AUTH, this))
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
index d15fd66..846aeba 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
@@ -46,17 +46,7 @@
import org.opends.server.core.PersistentSearch;
import org.opends.server.core.PluginConfigManager;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.CanceledOperationException;
-import org.opends.server.types.Control;
-import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
-import org.opends.server.types.LockManager;
-import org.opends.server.types.Privilege;
-import org.opends.server.types.ResultCode;
-import org.opends.server.types.SearchFilter;
-import org.opends.server.types.SynchronizationProviderResult;
+import org.opends.server.types.*;
import org.opends.server.types.operation.PostOperationDeleteOperation;
import org.opends.server.types.operation.PostResponseDeleteOperation;
import org.opends.server.types.operation.PreOperationDeleteOperation;
@@ -595,6 +585,10 @@
}
else if (oid.equals(OID_PROXIED_AUTH_V1))
{
+ // Log usage of legacy proxy authz V1 control.
+ addAdditionalLogItem(AdditionalLogItem.keyOnly(getClass(),
+ "obsoleteProxiedAuthzV1Control"));
+
// The requester must have the PROXIED_AUTH privilige in order to
// be able to use this control.
if (! clientConnection.hasPrivilege(Privilege.PROXIED_AUTH, this))
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
index 4fb55d9..80ac7b9 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
@@ -52,24 +52,7 @@
import org.opends.server.core.PersistentSearch;
import org.opends.server.core.PluginConfigManager;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.Attributes;
-import org.opends.server.types.CanceledOperationException;
-import org.opends.server.types.Control;
-import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
-import org.opends.server.types.LockManager;
-import org.opends.server.types.Modification;
-import org.opends.server.types.ModificationType;
-import org.opends.server.types.Privilege;
-import org.opends.server.types.RDN;
-import org.opends.server.types.ResultCode;
-import org.opends.server.types.SearchFilter;
-import org.opends.server.types.SynchronizationProviderResult;
+import org.opends.server.types.*;
import org.opends.server.types.operation.PostOperationModifyDNOperation;
import org.opends.server.types.operation.PostResponseModifyDNOperation;
import org.opends.server.types.operation.PreOperationModifyDNOperation;
@@ -833,6 +816,10 @@
}
else if (oid.equals(OID_PROXIED_AUTH_V1))
{
+ // Log usage of legacy proxy authz V1 control.
+ addAdditionalLogItem(AdditionalLogItem.keyOnly(getClass(),
+ "obsoleteProxiedAuthzV1Control"));
+
// The requester must have the PROXIED_AUTH privilige in order to
// be able to use this control.
if (! clientConnection.hasPrivilege(Privilege.PROXIED_AUTH, this))
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
index 327323e..31a0525 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
@@ -859,6 +859,10 @@
}
else if (oid.equals(OID_PROXIED_AUTH_V1))
{
+ // Log usage of legacy proxy authz V1 control.
+ addAdditionalLogItem(AdditionalLogItem.keyOnly(getClass(),
+ "obsoleteProxiedAuthzV1Control"));
+
// The requester must have the PROXIED_AUTH privilige in order to
// be able to use this control.
if (! clientConnection.hasPrivilege(Privilege.PROXIED_AUTH, this))
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
index e9d6e30..7cfc1eb 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
@@ -439,6 +439,10 @@
}
else if (oid.equals(OID_PROXIED_AUTH_V1))
{
+ // Log usage of legacy proxy authz V1 control.
+ addAdditionalLogItem(AdditionalLogItem.keyOnly(getClass(),
+ "obsoleteProxiedAuthzV1Control"));
+
// The requester must have the PROXIED_AUTH privilige in order to be
// able to use this control.
if (! clientConnection.hasPrivilege(Privilege.PROXIED_AUTH, this))
--
Gitblit v1.10.0