mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve SASL error handling

Browse Source
This commit is contained in:
Kurt Zeilenga 2005-11-06 22:43:23 +00:00
parent e1a7fa2ee9
commit 4f63434511
3 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/libldap/cyrus.c
View File

@ -455,6 +455,15 @@ sasl_err2ldap( int saslerr )
{ {
int rc; int rc;
/* map SASL errors to LDAP API errors returned by:
* sasl_client_new()
* SASL_OK, SASL_NOMECH, SASL_NOMEM
* sasl_client_start()
* SASL_OK, SASL_NOMECH, SASL_NOMEM, SASL_INTERACT
* sasl_client_step()
* SASL_OK, SASL_INTERACT, SASL_BADPROT, SASL_BADSERV
*/
switch (saslerr) { switch (saslerr) {
case SASL_CONTINUE: case SASL_CONTINUE:
rc = LDAP_MORE_RESULTS_TO_RETURN; rc = LDAP_MORE_RESULTS_TO_RETURN;
@ -465,21 +474,29 @@ sasl_err2ldap( int saslerr )
case SASL_OK: case SASL_OK:
rc = LDAP_SUCCESS; rc = LDAP_SUCCESS;
break; break;
case SASL_FAIL:
rc = LDAP_LOCAL_ERROR;
break;
case SASL_NOMEM: case SASL_NOMEM:
rc = LDAP_NO_MEMORY; rc = LDAP_NO_MEMORY;
break; break;
case SASL_NOMECH: case SASL_NOMECH:
rc = LDAP_AUTH_UNKNOWN; rc = LDAP_AUTH_UNKNOWN;
break; break;
case SASL_BADPROT:
rc = LDAP_DECODING_ERROR;
break;
case SASL_BADSERV:
rc = LDAP_AUTH_UNKNOWN;
break;
/* other codes */
case SASL_BADAUTH: case SASL_BADAUTH:
rc = LDAP_AUTH_UNKNOWN; rc = LDAP_AUTH_UNKNOWN;
break; break;
case SASL_NOAUTHZ: case SASL_NOAUTHZ:
rc = LDAP_PARAM_ERROR; rc = LDAP_PARAM_ERROR;
break; break;
case SASL_FAIL:
rc = LDAP_LOCAL_ERROR;
break;
case SASL_TOOWEAK: case SASL_TOOWEAK:
case SASL_ENCRYPT: case SASL_ENCRYPT:
rc = LDAP_AUTH_UNKNOWN; rc = LDAP_AUTH_UNKNOWN;

13
libraries/libldap/error.c
View File

@ -98,6 +98,13 @@ static struct ldaperror ldap_builtin_errlist[] = {
{LDAP_X_NO_OPERATION, N_("No Operation (X)")}, {LDAP_X_NO_OPERATION, N_("No Operation (X)")},
{LDAP_CUP_RESOURCES_EXHAUSTED, N_("LCUP Resources Exhausted")},
{LDAP_CUP_SECURITY_VIOLATION, N_("LCUP Security Violation")},
{LDAP_CUP_INVALID_DATA, N_("LCUP Invalid Data")},
{LDAP_CUP_UNSUPPORTED_SCHEME, N_("LCUP Unsupported Scheme")},
{LDAP_CUP_RELOAD_REQUIRED, N_("LCUP Reload Required")},
/* API ResultCodes */ /* API ResultCodes */
{LDAP_SERVER_DOWN, N_("Can't contact LDAP server")}, {LDAP_SERVER_DOWN, N_("Can't contact LDAP server")},
{LDAP_LOCAL_ERROR, N_("Local error")}, {LDAP_LOCAL_ERROR, N_("Local error")},
@ -118,12 +125,6 @@ static struct ldaperror ldap_builtin_errlist[] = {
{LDAP_CLIENT_LOOP, N_("Client Loop")}, {LDAP_CLIENT_LOOP, N_("Client Loop")},
{LDAP_REFERRAL_LIMIT_EXCEEDED, N_("Referral Limit Exceeded")}, {LDAP_REFERRAL_LIMIT_EXCEEDED, N_("Referral Limit Exceeded")},
{LDAP_CUP_RESOURCES_EXHAUSTED, N_("LCUP Resources Exhausted")},
{LDAP_CUP_SECURITY_VIOLATION, N_("LCUP Security Violation")},
{LDAP_CUP_INVALID_DATA, N_("LCUP Invalid Data")},
{LDAP_CUP_UNSUPPORTED_SCHEME, N_("LCUP Unsupported Scheme")},
{LDAP_CUP_RELOAD_REQUIRED, N_("LCUP Reload Required")},
{0, NULL} {0, NULL}
}; };

24
servers/slapd/sasl.c
View File

@ -833,6 +833,18 @@ slap_sasl_err2ldap( int saslerr )
{ {
int rc; int rc;
/* map SASL errors to LDAP resultCode returned by:
* sasl_server_new()
* SASL_OK, SASL_NOMEM
* sasl_server_step()
* SASL_OK, SASL_CONTINUE, SASL_TRANS, SASL_BADPARAM, SASL_BADPROT,
* ...
* sasl_server_start()
* + SASL_NOMECH
* sasl_setprop()
* SASL_OK, SASL_BADPARAM
*/
switch (saslerr) { switch (saslerr) {
case SASL_OK: case SASL_OK:
rc = LDAP_SUCCESS; rc = LDAP_SUCCESS;
@ -841,8 +853,6 @@ slap_sasl_err2ldap( int saslerr )
rc = LDAP_SASL_BIND_IN_PROGRESS; rc = LDAP_SASL_BIND_IN_PROGRESS;
break; break;
case SASL_FAIL: case SASL_FAIL:
rc = LDAP_OTHER;
break;
case SASL_NOMEM: case SASL_NOMEM:
rc = LDAP_OTHER; rc = LDAP_OTHER;
break; break;
@ -850,6 +860,9 @@ slap_sasl_err2ldap( int saslerr )
rc = LDAP_AUTH_METHOD_NOT_SUPPORTED; rc = LDAP_AUTH_METHOD_NOT_SUPPORTED;
break; break;
case SASL_BADAUTH: case SASL_BADAUTH:
case SASL_NOUSER:
case SASL_TRANS:
case SASL_EXPIRED:
rc = LDAP_INVALID_CREDENTIALS; rc = LDAP_INVALID_CREDENTIALS;
break; break;
case SASL_NOAUTHZ: case SASL_NOAUTHZ:
@ -859,6 +872,13 @@ slap_sasl_err2ldap( int saslerr )
case SASL_ENCRYPT: case SASL_ENCRYPT:
rc = LDAP_INAPPROPRIATE_AUTH; rc = LDAP_INAPPROPRIATE_AUTH;
break; break;
case SASL_UNAVAIL:
case SASL_TRYAGAIN:
rc = LDAP_UNAVAILABLE;
break;
case SASL_DISABLED:
rc = LDAP_UNWILLING_TO_PERFORM;
break;
default: default:
rc = LDAP_OTHER; rc = LDAP_OTHER;
break; break;