From aeed3c534c0a52f3fbf525573715349fb187316a Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 08 Jun 2016 15:18:05 +0000
Subject: [PATCH] OPENDJ-3096 Fix incorrect response status code
---
opendj-rest2ldap/src/main/resources/org/forgerock/opendj/rest2ldap/rest2ldap.properties | 1 -
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorizations.java | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorizations.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorizations.java
index 9324c98..5fc5524 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorizations.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorizations.java
@@ -267,9 +267,8 @@
try {
authz.put(template.getSecurityContextID(), template.formatAsAuthzId(token.asJsonValue()));
} catch (final IllegalArgumentException e) {
- return newResultPromise(new Response().setStatus(Status.FORBIDDEN)
- .setCause(e)
- .setEntity(ERR_AUTHZID_DECODER_RESPONSE.get().toString()));
+ return newResultPromise(new Response().setStatus(Status.INTERNAL_SERVER_ERROR)
+ .setCause(e));
}
final Context securityContext = new SecurityContext(context, token.getToken(), authz);
return next.handle(securityContext, request);
diff --git a/opendj-rest2ldap/src/main/resources/org/forgerock/opendj/rest2ldap/rest2ldap.properties b/opendj-rest2ldap/src/main/resources/org/forgerock/opendj/rest2ldap/rest2ldap.properties
index d1ea5cd..4a6f321 100644
--- a/opendj-rest2ldap/src/main/resources/org/forgerock/opendj/rest2ldap/rest2ldap.properties
+++ b/opendj-rest2ldap/src/main/resources/org/forgerock/opendj/rest2ldap/rest2ldap.properties
@@ -41,7 +41,6 @@
security principal '%s' could not be determined
ERR_AUTHZID_DECODER_PRINCIPAL_INVALID_DATA_TYPE_18=The request could not be authorized because the required \
security principal '%s' had an invalid data type
-ERR_AUTHZID_DECODER_RESPONSE_19=Invalid configuration
ERR_RESOLVING_AUTHZID_TEMPLATE_20=Unable to resolve oauthzid template placeholders for access token '%s': '%s'
# Runtime errors > OAuth2 > CTS Resolver
ERR_OAUTH2_CTS_INVALID_TOKEN_TYPE_21=The token '%s' must be an access token, but it is a '%s'
--
Gitblit v1.10.0