From f3612b1aa023f12906a71cb12c6ca1cae12aa5dd Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 22 Mar 2013 13:01:05 +0000
Subject: [PATCH] Partial fix for OPENDJ-694: Implement HTTP BASIC authentication
---
opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Config.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Config.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Config.java
index f8f2c54..cbabe03 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Config.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Config.java
@@ -25,14 +25,17 @@
final class Config {
private final ConnectionFactory factory;
private final DecodeOptions options;
+ private final AuthorizationPolicy authzPolicy;
private final AuthzIdTemplate proxiedAuthzTemplate;
private final ReadOnUpdatePolicy readOnUpdatePolicy;
private final Schema schema;
Config(final ConnectionFactory factory, final ReadOnUpdatePolicy readOnUpdatePolicy,
- final AuthzIdTemplate proxiedAuthzTemplate, final Schema schema) {
+ final AuthorizationPolicy authzPolicy, final AuthzIdTemplate proxiedAuthzTemplate,
+ final Schema schema) {
this.factory = factory;
this.readOnUpdatePolicy = readOnUpdatePolicy;
+ this.authzPolicy = authzPolicy;
this.proxiedAuthzTemplate = proxiedAuthzTemplate;
this.schema = schema;
this.options = new DecodeOptions().setSchema(schema);
@@ -61,12 +64,22 @@
}
/**
+ * Returns the authorization policy which should be used for performing LDAP
+ * operations.
+ *
+ * @return The authorization policy which should be used for performing LDAP
+ * operations.
+ */
+ AuthorizationPolicy getAuthorizationPolicy() {
+ return authzPolicy;
+ }
+
+ /**
* Returns the authorization ID template which should be used when proxied
* authorization is enabled.
*
* @return The authorization ID template which should be used when proxied
- * authorization is enabled, or {@code null} if proxied
- * authorization is disabled.
+ * authorization is enabled.
*/
AuthzIdTemplate getProxiedAuthorizationTemplate() {
return proxiedAuthzTemplate;
@@ -93,15 +106,4 @@
Schema schema() {
return schema;
}
-
- /**
- * Returns {@code true} if the proxied authorization should be used for
- * authorizing LDAP requests.
- *
- * @return {@code true} if the proxied authorization should be used for
- * authorizing LDAP requests.
- */
- boolean useProxiedAuthorization() {
- return proxiedAuthzTemplate != null;
- }
}
--
Gitblit v1.10.0