From 79811e7a2c59f9e4b237043466b736b5ece294dc Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 08 Jun 2016 14:37:08 +0000
Subject: [PATCH] OPENDJ-3067 Use curly brace notation in all templates for consistency
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java
index 7b65de3..0c53d23 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java
@@ -387,14 +387,14 @@
private AuthenticationStrategy buildSimpleBindStrategy(final JsonValue config) {
return newSimpleBindStrategy(getConnectionFactory(config.get("ldapConnectionFactory")
.defaultTo(DEFAULT_BIND_FACTORY).asString()),
- config.get("bindDNTemplate").defaultTo("%s").asString(),
+ parseUserNameTemplate(config.get("bindDNTemplate").defaultTo("%s")),
schema);
}
private AuthenticationStrategy buildSASLBindStrategy(JsonValue config) {
return newSASLPlainStrategy(
getConnectionFactory(config.get("ldapConnectionFactory").defaultTo(DEFAULT_BIND_FACTORY).asString()),
- schema, config.get(AUTHZID_TEMPLATE).defaultTo("u:%s").asString());
+ schema, parseUserNameTemplate(config.get(AUTHZID_TEMPLATE).defaultTo("u:%s")));
}
private AuthenticationStrategy buildSearchThenBindStrategy(JsonValue config) {
@@ -405,6 +405,10 @@
config.get("bindLDAPConnectionFactory").defaultTo(DEFAULT_BIND_FACTORY).asString()),
DN.valueOf(config.get("baseDN").required().asString(), schema),
SearchScope.valueOf(config.get("scope").required().asString().toLowerCase()),
- config.get("filterTemplate").required().asString());
+ parseUserNameTemplate(config.get("filterTemplate").required()));
+ }
+
+ private String parseUserNameTemplate(final JsonValue template) {
+ return template.asString().replace("{username}", "%s");
}
}
--
Gitblit v1.10.0