diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2014-07-28 14:27:20 -0700 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2014-07-28 15:04:54 -0700 |
| commit | 7883dc39b639b825e7b6aeb6cce75878fc1d3e63 (patch) | |
| tree | ae40d3aaf86b55a8d6bf4da6a9cbf18b07c6cbac /base/server | |
| parent | ca5fe6b5b8973b21a76cd41548af39451f90b124 (diff) | |
| download | pki-7883dc39b639b825e7b6aeb6cce75878fc1d3e63.tar.gz pki-7883dc39b639b825e7b6aeb6cce75878fc1d3e63.tar.xz pki-7883dc39b639b825e7b6aeb6cce75878fc1d3e63.zip | |
Remove ACL mapping to user from error messages
- PKI TRAC Ticket #965 - Improve error message - remove ACL mapping to the user
Diffstat (limited to 'base/server')
3 files changed, 5 insertions, 3 deletions
diff --git a/base/server/cms/src/com/netscape/cms/authorization/BasicAclAuthz.java b/base/server/cms/src/com/netscape/cms/authorization/BasicAclAuthz.java index 729b017d8..c883758b3 100644 --- a/base/server/cms/src/com/netscape/cms/authorization/BasicAclAuthz.java +++ b/base/server/cms/src/com/netscape/cms/authorization/BasicAclAuthz.java @@ -145,8 +145,9 @@ public class BasicAclAuthz extends AAclAuthz // audit here later log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_AUTHORIZATION_FAILED")); String params[] = { resource, operation }; + log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_AUTHZ_ACCESS_DENIED_2", params)); - throw new EAuthzAccessDenied(CMS.getUserMessage("CMS_AUTHORIZATION_AUTHZ_ACCESS_DENIED", params)); + throw new EAuthzAccessDenied(CMS.getUserMessage("CMS_AUTHORIZATION_ERROR")); } return authzToken; diff --git a/base/server/cms/src/com/netscape/cms/authorization/DirAclAuthz.java b/base/server/cms/src/com/netscape/cms/authorization/DirAclAuthz.java index 133fe759e..d0677875c 100644 --- a/base/server/cms/src/com/netscape/cms/authorization/DirAclAuthz.java +++ b/base/server/cms/src/com/netscape/cms/authorization/DirAclAuthz.java @@ -233,8 +233,9 @@ public class DirAclAuthz extends AAclAuthz // audit here later log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_AUTHORIZATION_FAILED")); String params[] = { resource, operation }; + log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_AUTHZ_ACCESS_DENIED_2", params)); - throw new EAuthzAccessDenied(CMS.getUserMessage("CMS_AUTHORIZATION_AUTHZ_ACCESS_DENIED", params)); + throw new EAuthzAccessDenied(CMS.getUserMessage("CMS_AUTHORIZATION_ERROR")); } return authzToken; diff --git a/base/server/cmsbundle/src/LogMessages.properties b/base/server/cmsbundle/src/LogMessages.properties index 54dd7aaaf..f1485deec 100644 --- a/base/server/cmsbundle/src/LogMessages.properties +++ b/base/server/cmsbundle/src/LogMessages.properties @@ -599,7 +599,7 @@ AUTHZ_AUTHZ_MGR_PLUGIN_NOT_FOUND_1=Authorization manager plugin name {0} not fou AUTHZ_MISSING_REQUIRED_AUTHZMGR_1=Missing system required authz manager instance of {0} AUTHZ_AUTHZ_INTERNAL_ERROR=Authorization subsystem encountered an internal error AUTHZ_AUTHZ_INTERNAL_ERROR_1=Authorization encountered an internal error. Detailed msg: {0} -AUTHZ_AUTHZ_ACCESS_DENIED_2=authorization failed on resource: {0}, operation: {1} +AUTHZ_AUTHZ_ACCESS_DENIED_2=Authorization failed on resource: {0}, operation: {1} AUTHZ_UNKNOWN_PROTECTED_RESOURCE_1=unknown protected resource specified: {0} AUTHZ_UNKNOWN_OPERATION_1=unknown operation specified: {0} AUTHZ_ILLEGAL_FORMAT=Illegal Format |