From 135dcefa19b992dad85ff2f440894111344bc841 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 Make authzIdTemplate config parameter specific to each resolver config
---
opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/OAuth2JsonConfigurationTestCase.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/OAuth2JsonConfigurationTestCase.java b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/OAuth2JsonConfigurationTestCase.java
index 72c29b4..74690ee 100644
--- a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/OAuth2JsonConfigurationTestCase.java
+++ b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/OAuth2JsonConfigurationTestCase.java
@@ -83,19 +83,23 @@
// Invalid 'authzIdTemplate' content
{
"{'realm': 'example.com',"
- + "'authzIdTemplate': 'userName: ou={/user/id},dc=example,dc=com',"
+ "'requiredScopes': ['read', 'write', 'dolphin'],"
+ "'resolver': 'openam',"
- + "'openam': {'endpointURL': 'http://www.example.com/token-info'},"
+ + "'openam': {"
+ + " 'endpointURL': 'http://www.example.com/token-info',"
+ + " 'authzIdTemplate': 'userName: ou={/user/id},dc=example,dc=com'"
+ + "},"
+ "'accessTokenCache': {'enabled': true, 'cacheExpiration': '42'}}",
},
// Invalid 'accessTokenCache/expiration' duration
{
"{'realm': 'example.com',"
- + "'authzIdTemplate': 'dn: ou={/user/id},dc=example,dc=com',"
+ "'requiredScopes': ['read', 'write', 'dolphin'],"
+ "'resolver': 'openam',"
- + "'openam': {'endpointURL': 'http://www.example.com/token-info'},"
+ + "'openam': {"
+ + " 'endpointURL': 'http://www.example.com/token-info',"
+ + " 'authzIdTemplate': 'dn: ou={/user/id},dc=example,dc=com'"
+ + "},"
+ "'accessTokenCache': {'enabled': true, 'cacheExpiration': '42'}}",
}
};
@@ -112,10 +116,12 @@
public void testOAuth2FilterWithEmptyScopes() throws Exception {
final String config =
"{'realm': 'example.com',"
- + "'authzIdTemplate': 'dn: ou={/user/id},dc=example,dc=com',"
+ "'requiredScopes': [],"
+ "'resolver': 'openam',"
- + "'openam': {'endpointURL': 'http://www.example.com/token-info'}}";
+ + "'openam': {"
+ + " 'endpointURL': 'http://www.example.com/token-info',"
+ + " 'authzIdTemplate': 'dn: ou={/user/id},dc=example,dc=com'"
+ + "}}";
fakeApp.buildOAuth2Filter(parseJson(config));
}
@@ -211,20 +217,25 @@
{
"{'resolver': 'rfc7662',"
+ "'rfc7662': { 'endpointURL': 'http:/example.com/introspect',"
- + " 'clientId': 'client_app_id',"
- + " 'clientSecret': 'client_app_secret'}}"
+ + " 'clientId': 'client_app_id',"
+ + " 'clientSecret': 'client_app_secret',"
+ + " 'authzIdTemplate': 'dn: ou={/user/id},dc=example,dc=com'}}"
},
{
"{'resolver': 'openam',"
- + "'openam': { 'endpointURL': 'http:/example.com/tokeninfo'}}"
+ + "'openam': { "
+ + " 'endpointURL': 'http:/example.com/tokeninfo',"
+ + " 'authzIdTemplate': 'dn: ou={/user/id},dc=example,dc=com'}}"
},
{
"{'resolver': 'cts',"
- + "'cts': { 'baseDN': 'coreTokenId={token},dc=com' }}"
+ + "'cts': { 'baseDN': 'coreTokenId={token},dc=com',"
+ + " 'authzIdTemplate': 'dn: ou={/user/id},dc=example,dc=com'}}"
},
{
"{'resolver': 'file',"
- + "'file': { 'folderPath': '/path/to/test/folder'}}"
+ + "'file': { 'folderPath': '/path/to/test/folder',"
+ + " 'authzIdTemplate': 'dn: ou={/user/id},dc=example,dc=com'}}"
}
};
// @Checkstyle:on
--
Gitblit v1.10.0