diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2013-01-11 10:51:46 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-01-14 09:58:54 -0500 |
commit | 45a2040bc203a9e27315d817670303bca1640b34 (patch) | |
tree | 89372b981988c974894eb8bc661dc9f90db8d094 | |
parent | d93a522df48a294018468c1db60f651e501ec458 (diff) | |
download | pki-45a2040bc203a9e27315d817670303bca1640b34.tar.gz pki-45a2040bc203a9e27315d817670303bca1640b34.tar.xz pki-45a2040bc203a9e27315d817670303bca1640b34.zip |
Added LDAP exception converter.ticket-214-2
A utility class has been added to convert LDAP exceptions into PKI
exceptions.
Ticket #191, #214
-rw-r--r-- | base/common/src/com/netscape/certsrv/ldap/LDAPExceptionConverter.java | 46 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/admin/UserService.java | 7 |
2 files changed, 50 insertions, 3 deletions
diff --git a/base/common/src/com/netscape/certsrv/ldap/LDAPExceptionConverter.java b/base/common/src/com/netscape/certsrv/ldap/LDAPExceptionConverter.java new file mode 100644 index 000000000..dd68795d1 --- /dev/null +++ b/base/common/src/com/netscape/certsrv/ldap/LDAPExceptionConverter.java @@ -0,0 +1,46 @@ +// --- BEGIN COPYRIGHT BLOCK --- +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; version 2 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// (C) 2007 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- +package com.netscape.certsrv.ldap; + +import com.netscape.certsrv.base.BadRequestException; +import com.netscape.certsrv.base.ConflictingOperationException; +import com.netscape.certsrv.base.PKIException; +import com.netscape.certsrv.base.ResourceNotFoundException; + +import netscape.ldap.LDAPException; + +/** + * @author Endi S. Dewata + */ +public class LDAPExceptionConverter { + + public static PKIException toPKIException(LDAPException e) { + switch (e.getLDAPResultCode()) { + case LDAPException.ATTRIBUTE_OR_VALUE_EXISTS: + return new ConflictingOperationException("Attribute or value exists.", e); + case LDAPException.NO_SUCH_OBJECT: + return new ResourceNotFoundException("No such object.", e); + case LDAPException.INVALID_DN_SYNTAX: + return new BadRequestException("Invalid DN syntax.", e); + case LDAPException.ENTRY_ALREADY_EXISTS: + return new ConflictingOperationException("Entry already exists.", e); + default: + return new PKIException("LDAP error ("+e.getLDAPResultCode()+"): "+e.getMessage(), e); + } + } +} diff --git a/base/common/src/com/netscape/cms/servlet/admin/UserService.java b/base/common/src/com/netscape/cms/servlet/admin/UserService.java index 4813d10be..901d3891c 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/UserService.java +++ b/base/common/src/com/netscape/cms/servlet/admin/UserService.java @@ -40,6 +40,7 @@ import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.base.UserNotFoundException; import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.ldap.LDAPExceptionConverter; import com.netscape.certsrv.logging.IAuditor; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.password.IPasswordCheck; @@ -298,16 +299,16 @@ public class UserService extends PKIService implements UserResource { if (user.getUserID() == null) { throw new BadRequestDataException(getUserMessage("CMS_USRGRP_USER_ADD_FAILED_1", "uid")); } else { - throw new PKIException(getUserMessage("CMS_USRGRP_USER_ADD_FAILED")); + throw new PKIException(e.getMessage(), e); } } catch (LDAPException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_ADD_USER_FAIL", e.toString())); - throw new PKIException(getUserMessage("CMS_USRGRP_USER_ADD_FAILED")); + throw LDAPExceptionConverter.toPKIException(e); } catch (Exception e) { log(ILogger.LL_FAILURE, e.toString()); - throw new PKIException(getUserMessage("CMS_USRGRP_USER_ADD_FAILED")); + throw new PKIException(e.getMessage(), e); } } catch (PKIException e) { |