From 401ac054a8b2c9213fd7886a6c1ca587decd3223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Wed, 19 Jul 2006 11:02:33 +0000 Subject: [PATCH] Handle more error codes. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17835 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/mech/gss_display_status.c | 166 +++++++++++++++++++-------- 1 file changed, 121 insertions(+), 45 deletions(-) diff --git a/lib/gssapi/mech/gss_display_status.c b/lib/gssapi/mech/gss_display_status.c index 86c4bc78d..32334ca83 100644 --- a/lib/gssapi/mech/gss_display_status.c +++ b/lib/gssapi/mech/gss_display_status.c @@ -25,41 +25,117 @@ * * $FreeBSD: src/lib/libgssapi/gss_display_status.c,v 1.1 2005/12/29 14:40:20 dfr Exp $ */ +/* + * Copyright (c) 1998 - 2005 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ #include "mech_locl.h" RCSID("$Id$"); -struct _gss_status_desc { - OM_uint32 gs_status; - const char* gs_desc; -}; +static const char * +calling_error(OM_uint32 v) +{ + static const char *msgs[] = { + NULL, /* 0 */ + "A required input parameter could not be read.", /* */ + "A required output parameter could not be written.", /* */ + "A parameter was malformed" + }; -static struct _gss_status_desc _gss_status_descs[] = { - { GSS_S_BAD_MECH, "An unsupported mechanism was requested"}, - { GSS_S_BAD_NAME, "An invalid name was supplied"}, - { GSS_S_BAD_NAMETYPE, "A supplied name was of an unsupported type"}, - { GSS_S_BAD_BINDINGS, "Incorrect channel bindings were supplied"}, - { GSS_S_BAD_STATUS, "An invalid status code was supplied"}, - { GSS_S_BAD_MIC, "A token had an invalid MIC"}, - { GSS_S_NO_CRED, "No credentials were supplied, or the " - "credentials were unavailable or inaccessible"}, - { GSS_S_NO_CONTEXT, "No context has been established"}, - { GSS_S_DEFECTIVE_TOKEN,"A token was invalid"}, - { GSS_S_DEFECTIVE_CREDENTIAL, "A credential was invalid"}, - { GSS_S_CREDENTIALS_EXPIRED, "The referenced credentials have expired"}, - { GSS_S_CONTEXT_EXPIRED, "The context has expired"}, - { GSS_S_FAILURE, "Miscellaneous failure"}, - { GSS_S_BAD_QOP, "The quality-of-protection requested could " - "not be provided"}, - { GSS_S_UNAUTHORIZED, "The operation is forbidden by local security " - "policy"}, - { GSS_S_UNAVAILABLE, "The operation or option is unavailable"}, - { GSS_S_DUPLICATE_ELEMENT, "The requested credential element already " - "exists"}, - { GSS_S_NAME_NOT_MN, "The provided name was not a mechanism name"} -}; -#define _gss_status_desc_count \ - sizeof(_gss_status_descs) / sizeof(_gss_status_descs[0]) + v >>= GSS_C_CALLING_ERROR_OFFSET; + + if (v == 0) + return ""; + else if (v >= sizeof(msgs)/sizeof(*msgs)) + return "unknown calling error"; + else + return msgs[v]; +} + +static const char * +routine_error(OM_uint32 v) +{ + static const char *msgs[] = { + NULL, /* 0 */ + "An unsupported mechanism was requested", + "An invalid name was supplied", + "A supplied name was of an unsupported type", + "Incorrect channel bindings were supplied", + "An invalid status code was supplied", + "A token had an invalid MIC", + "No credentials were supplied, " + "or the credentials were unavailable or inaccessible.", + "No context has been established", + "A token was invalid", + "A credential was invalid", + "The referenced credentials have expired", + "The context has expired", + "Miscellaneous failure (see text)", + "The quality-of-protection requested could not be provide", + "The operation is forbidden by local security policy", + "The operation or option is not available", + "The requested credential element already exists", + "The provided name was not a mechanism name.", + }; + + v >>= GSS_C_ROUTINE_ERROR_OFFSET; + + if (v == 0) + return ""; + else if (v >= sizeof(msgs)/sizeof(*msgs)) + return "unknown routine error"; + else + return msgs[v]; +} + +static const char * +supplementary_error(OM_uint32 v) +{ + static const char *msgs[] = { + "normal completion", + "continuation call to routine required", + "duplicate per-message token detected", + "timed-out per-message token detected", + "reordered (early) per-message token detected", + "skipped predecessor token(s) detected" + }; + + v >>= GSS_C_SUPPLEMENTARY_OFFSET; + + if (v >= sizeof(msgs)/sizeof(*msgs)) + return "unknown routine error"; + else + return msgs[v]; +} OM_uint32 @@ -71,25 +147,25 @@ gss_display_status(OM_uint32 *minor_status, gss_buffer_t status_string) { OM_uint32 major_status; - int i; - const char *message; *minor_status = 0; switch (status_type) { - case GSS_C_GSS_CODE: - for (i = 0; i < _gss_status_desc_count; i++) { - if (_gss_status_descs[i].gs_status == status_value) { - message = _gss_status_descs[i].gs_desc; - status_string->length = strlen(message); - status_string->value = strdup(message); - return (GSS_S_COMPLETE); - } - } + case GSS_C_GSS_CODE: { + char *buf; - /* - * Fall through to attempt to get some underlying - * implementation to describe the value. - */ + if (GSS_SUPPLEMENTARY_INFO(status_value)) + asprintf(&buf, "%s", supplementary_error( + GSS_SUPPLEMENTARY_INFO(status_value))); + else + asprintf (&buf, "%s %s", + calling_error(GSS_CALLING_ERROR(status_value)), + routine_error(GSS_ROUTINE_ERROR(status_value))); + + status_string->length = strlen(buf); + status_string->value = buf; + + return GSS_S_COMPLETE; + } case GSS_C_MECH_CODE: { gssapi_mech_interface m; m = __gss_get_mechanism(mech_type);