From 80f2b0aa58435f8b67b5f6c220b65b4f1b46efef Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Sun, 22 Oct 2006 04:38:52 +0000
Subject: [PATCH] Update the server and tools to use the correct encoding for the proxied authorization v2 control. The encoding was based on a pre-RFC draft that wrapped the authorization ID in an ASN.1 octet string, but the official specification in RFC 4370 does not include this wrapper. This change removes the wrapper from the value.
---
opends/src/server/org/opends/server/tools/LDAPModify.java | 3 +--
opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java | 4 ++--
opends/src/server/org/opends/server/tools/LDAPSearch.java | 3 +--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java b/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
index 34d8f06..1814727 100644
--- a/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
+++ b/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
@@ -132,11 +132,11 @@
if (authorizationID == null)
{
- return new ASN1OctetString(new ASN1OctetString().encode());
+ return new ASN1OctetString();
}
else
{
- return new ASN1OctetString(authorizationID.encode());
+ return authorizationID;
}
}
diff --git a/opends/src/server/org/opends/server/tools/LDAPModify.java b/opends/src/server/org/opends/server/tools/LDAPModify.java
index 7cd8f0c..0c40f4b 100644
--- a/opends/src/server/org/opends/server/tools/LDAPModify.java
+++ b/opends/src/server/org/opends/server/tools/LDAPModify.java
@@ -822,8 +822,7 @@
if (proxyAuthzID.isPresent())
{
- ASN1OctetString authzIDOS = new ASN1OctetString(proxyAuthzID.getValue());
- ASN1OctetString proxyValue = new ASN1OctetString(authzIDOS.encode());
+ ASN1OctetString proxyValue = new ASN1OctetString(proxyAuthzID.getValue());
LDAPControl proxyControl =
new LDAPControl(OID_PROXIED_AUTH_V2, true, proxyValue);
diff --git a/opends/src/server/org/opends/server/tools/LDAPSearch.java b/opends/src/server/org/opends/server/tools/LDAPSearch.java
index 29aa566..2c2e9d8 100644
--- a/opends/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opends/src/server/org/opends/server/tools/LDAPSearch.java
@@ -865,8 +865,7 @@
if (proxyAuthzID.isPresent())
{
- ASN1OctetString authzIDOS = new ASN1OctetString(proxyAuthzID.getValue());
- ASN1OctetString proxyValue = new ASN1OctetString(authzIDOS.encode());
+ ASN1OctetString proxyValue = new ASN1OctetString(proxyAuthzID.getValue());
LDAPControl proxyControl =
new LDAPControl(OID_PROXIED_AUTH_V2, true, proxyValue);
--
Gitblit v1.10.0