oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

check that the generated acceptor mechlist is acceptable too

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19411 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-12-18 15:42:03 +00:00
parent 826acbd391
commit 363515e856
4 changed files with 131 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
lib/gssapi/spnego/accept_sec_context.c
View File

@@ -67,7 +67,7 @@ send_reject (OM_uint32 *minor_status,
OM_uint32
_gss_spnego_indicate_mechtypelist (OM_uint32 *minor_status,
gss_name_t target_name,
int (*func)(gss_name_t, gss_OID),
OM_uint32 (*func)(gss_name_t, gss_OID),
int includeMSCompatOID,
const gssspnego_cred cred_handle,
MechTypeList *mechtypelist,
@@ -111,7 +111,8 @@ _gss_spnego_indicate_mechtypelist (OM_uint32 *minor_status,
return GSS_S_FAILURE;
}
if (func && (*func)(target_name, GSS_KRB5_MECHANISM)) {
ret = (*func)(target_name, GSS_KRB5_MECHANISM);
if (ret == GSS_S_COMPLETE) {
ret = _gss_spnego_add_mech_type(GSS_KRB5_MECHANISM,
includeMSCompatOID,
mechtypelist);
@@ -121,12 +122,14 @@ _gss_spnego_indicate_mechtypelist (OM_uint32 *minor_status,
for (i = 0; i < supported_mechs->count; i++) {
OM_uint32 subret;
if (gss_oid_equal(&supported_mechs->elements[i], GSS_SPNEGO_MECHANISM))
continue;
if (gss_oid_equal(&supported_mechs->elements[i], GSS_KRB5_MECHANISM))
continue;
if (func && !(*func)(target_name, &supported_mechs->elements[i]))
subret = (*func)(target_name, &supported_mechs->elements[i]);
if (subret != GSS_S_COMPLETE)
continue;
ret = _gss_spnego_add_mech_type(&supported_mechs->elements[i],
@@ -147,20 +150,39 @@ _gss_spnego_indicate_mechtypelist (OM_uint32 *minor_status,
return GSS_S_BAD_MECH;
}
if (ret == GSS_S_COMPLETE && preferred_mech != NULL) {
if (preferred_mech != NULL) {
ret = gss_duplicate_oid(minor_status, first_mech, preferred_mech);
}
if (ret != GSS_S_COMPLETE) {
free_MechTypeList(mechtypelist);
mechtypelist->len = 0;
mechtypelist->val = NULL;
if (ret != GSS_S_COMPLETE)
free_MechTypeList(mechtypelist);
}
gss_release_oid_set(minor_status, &supported_mechs);
return ret;
}
static OM_uint32
acceptor_approved(gss_name_t target_name, gss_OID mech)
{
gss_cred_id_t cred = GSS_C_NO_CREDENTIAL;
gss_OID_set oidset;
OM_uint32 junk, ret;
if (target_name == GSS_C_NO_NAME)
return GSS_S_COMPLETE;
gss_create_empty_oid_set(&junk, &oidset);
gss_add_oid_set_member(&junk, mech, &oidset);
ret = gss_acquire_cred(&junk, target_name, GSS_C_INDEFINITE, oidset,
GSS_C_ACCEPT, &cred, NULL, NULL);
gss_release_oid_set(&junk, &oidset);
if (ret != GSS_S_COMPLETE)
return ret;
gss_release_cred(&junk, &cred);
return GSS_S_COMPLETE;
}
static OM_uint32
send_supported_mechs (OM_uint32 *minor_status,
gss_buffer_t output_token)
@@ -177,8 +199,8 @@ send_supported_mechs (OM_uint32 *minor_status,
nt.u.negTokenInit.mechToken = NULL;
nt.u.negTokenInit.mechListMIC = NULL;
ret = _gss_spnego_indicate_mechtypelist(minor_status, GSS_C_NO_NAME,
NULL, 1, NULL,
ret = _gss_spnego_indicate_mechtypelist(minor_status, GSS_C_NO_NAME,
acceptor_approved, 1, NULL,
&nt.u.negTokenInit.mechTypes, NULL);
if (ret != GSS_S_COMPLETE) {
return ret;
@@ -366,6 +388,87 @@ verify_mechlist_mic
return ret;
}
static OM_uint32
select_mech(OM_uint32 *minor_status, MechType *mechType, gss_OID *mech_p)
{
char mechbuf[64];
size_t mech_len;
gss_OID_desc oid;
OM_uint32 ret, junk;
ret = der_put_oid ((unsigned char *)mechbuf + sizeof(mechbuf) - 1,
sizeof(mechbuf),
mechType,
&mech_len);
if (ret) {
return GSS_S_DEFECTIVE_TOKEN;
}
oid.length = mech_len;
oid.elements = mechbuf + sizeof(mechbuf) - mech_len;
if (gss_oid_equal(&oid, GSS_SPNEGO_MECHANISM)) {
return GSS_S_BAD_MECH;
}
*minor_status = 0;
/* Translate broken MS Kebreros OID */
if (gss_oid_equal(&oid, &_gss_spnego_mskrb_mechanism_oid_desc)) {
gssapi_mech_interface mech;
mech = __gss_get_mechanism(&_gss_spnego_krb5_mechanism_oid_desc);
if (mech == NULL)
return GSS_S_BAD_MECH;
ret = gss_duplicate_oid(minor_status,
&_gss_spnego_mskrb_mechanism_oid_desc,
mech_p);
} else {
gssapi_mech_interface mech;
mech = __gss_get_mechanism(&oid);
if (mech == NULL)
return GSS_S_BAD_MECH;
ret = gss_duplicate_oid(minor_status,
&mech->gm_mech_oid,
mech_p);
}
{
gss_name_t name = GSS_C_NO_NAME;
gss_buffer_desc namebuf;
char *str = NULL, *host, hostname[MAXHOSTNAMELEN];
host = getenv("GSSAPI_SPNEGO_NAME");
if (host == NULL || issuid()) {
if (gethostname(hostname, sizeof(hostname)) != 0) {
*minor_status = errno;
return GSS_S_FAILURE;
}
asprintf(&str, "host@%s", hostname);
host = str;
}
namebuf.length = strlen(host);
namebuf.value = host;
ret = gss_import_name(minor_status, &namebuf,
GSS_C_NT_HOSTBASED_SERVICE, &name);
if (str)
free(str);
if (ret != GSS_S_COMPLETE)
return ret;
ret = acceptor_approved(name, *mech_p);
gss_release_name(&junk, &name);
}
return ret;
}
static OM_uint32
acceptor_complete(OM_uint32 * minor_status,
gssspnego_ctx ctx,
@@ -521,8 +624,9 @@ acceptor_start
/* Call glue layer to find first mech we support */
for (i = 0; i < ni.mechTypes.len; ++i) {
ret = _gss_spnego_select_mech(minor_status, &ni.mechTypes.val[i],
&preferred_mech_type);
ret = select_mech(minor_status,
&ni.mechTypes.val[i],
&preferred_mech_type);
if (ret == 0)
break;
}

113
lib/gssapi/spnego/compat.c
View File

@@ -42,10 +42,10 @@ RCSID("$Id$");
* prefer to deal with this here rather than inside the
* Kerberos mechanism.
*/
static gss_OID_desc gss_mskrb_mechanism_oid_desc =
gss_OID_desc _gss_spnego_mskrb_mechanism_oid_desc =
{9, (void *)"\x2a\x86\x48\x82\xf7\x12\x01\x02\x02"};
static gss_OID_desc gss_krb5_mechanism_oid_desc =
gss_OID_desc _gss_spnego_krb5_mechanism_oid_desc =
{9, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02"};
/*
@@ -191,8 +191,8 @@ _gss_spnego_require_mechlist_mic(OM_uint32 *minor_status,
if (*require_mic) {
if (gss_oid_equal(ctx->negotiated_mech_type, ctx->preferred_mech_type)) {
*require_mic = 0;
} else if (gss_oid_equal(ctx->negotiated_mech_type, &gss_krb5_mechanism_oid_desc) &&
gss_oid_equal(ctx->preferred_mech_type, &gss_mskrb_mechanism_oid_desc)) {
} else if (gss_oid_equal(ctx->negotiated_mech_type, &_gss_spnego_krb5_mechanism_oid_desc) &&
gss_oid_equal(ctx->preferred_mech_type, &_gss_spnego_mskrb_mechanism_oid_desc)) {
*require_mic = 0;
}
}
@@ -210,9 +210,9 @@ int _gss_spnego_add_mech_type(gss_OID mech_type,
return 0;
if (includeMSCompatOID &&
gss_oid_equal(mech_type, &gss_krb5_mechanism_oid_desc)) {
ret = der_get_oid(gss_mskrb_mechanism_oid_desc.elements,
gss_mskrb_mechanism_oid_desc.length,
gss_oid_equal(mech_type, &_gss_spnego_krb5_mechanism_oid_desc)) {
ret = der_get_oid(_gss_spnego_mskrb_mechanism_oid_desc.elements,
_gss_spnego_mskrb_mechanism_oid_desc.length,
&mechtypelist->val[mechtypelist->len],
NULL);
if (ret)
@@ -229,102 +229,3 @@ int _gss_spnego_add_mech_type(gss_OID mech_type,
return 0;
}
OM_uint32
_gss_spnego_select_mech(OM_uint32 *minor_status,
MechType *mechType,
gss_OID *mech_p)
{
char mechbuf[64];
size_t mech_len;
gss_OID_desc oid;
OM_uint32 ret;
ret = der_put_oid ((unsigned char *)mechbuf + sizeof(mechbuf) - 1,
sizeof(mechbuf),
mechType,
&mech_len);
if (ret) {
return GSS_S_DEFECTIVE_TOKEN;
}
oid.length = mech_len;
oid.elements = mechbuf + sizeof(mechbuf) - mech_len;
if (gss_oid_equal(&oid, GSS_SPNEGO_MECHANISM)) {
return GSS_S_BAD_MECH;
}
*minor_status = 0;
/* Translate broken MS Kebreros OID */
if (gss_oid_equal(&oid, &gss_mskrb_mechanism_oid_desc)) {
gssapi_mech_interface mech;
mech = __gss_get_mechanism(&gss_krb5_mechanism_oid_desc);
if (mech == NULL)
return GSS_S_BAD_MECH;
ret = gss_duplicate_oid(minor_status,
&gss_mskrb_mechanism_oid_desc,
mech_p);
} else {
gssapi_mech_interface mech;
mech = __gss_get_mechanism(&oid);
if (mech == NULL)
return GSS_S_BAD_MECH;
ret = gss_duplicate_oid(minor_status,
&mech->gm_mech_oid,
mech_p);
}
{
gss_name_t name = GSS_C_NO_NAME;
gss_cred_id_t cred = GSS_C_NO_CREDENTIAL;
gss_buffer_desc namebuf;
gss_OID_set oidset;
char *str = NULL, *host, hostname[MAXHOSTNAMELEN];
OM_uint32 junk;
gss_create_empty_oid_set(minor_status, &oidset);
gss_add_oid_set_member(minor_status, *mech_p, &oidset);
host = getenv("GSSAPI_SPNEGO_NAME");
if (host == NULL || issuid()) {
if (gethostname(hostname, sizeof(hostname)) != 0) {
*minor_status = errno;
return GSS_S_FAILURE;
}
asprintf(&str, "host@%s", hostname);
host = str;
}
namebuf.length = strlen(host);
namebuf.value = host;
ret = gss_import_name(minor_status, &namebuf,
GSS_C_NT_HOSTBASED_SERVICE, &name);
if (str)
free(str);
if (ret != GSS_S_COMPLETE)
return ret;
ret = gss_acquire_cred(minor_status,
name,
GSS_C_INDEFINITE,
oidset,
GSS_C_ACCEPT,
&cred,
NULL,
NULL);
gss_release_oid_set(&junk, &oidset);
gss_release_name(&junk, &name);
if (ret == GSS_S_COMPLETE)
gss_release_cred(&junk, &cred);
}
return ret;
}

6
lib/gssapi/spnego/init_sec_context.c
View File

@@ -39,7 +39,7 @@ RCSID("$Id$");
* Is target_name an sane target for `mech<63>.
*/
static int
static OM_uint32
initiator_approved(gss_name_t target_name, gss_OID mech)
{
OM_uint32 min_stat, maj_stat;
@@ -60,11 +60,11 @@ initiator_approved(gss_name_t target_name, gss_OID mech)
NULL,
NULL);
if (GSS_ERROR(maj_stat))
return 0;
return GSS_S_BAD_MECH;
gss_release_buffer(&min_stat, &out);
gss_delete_sec_context(&min_stat, &ctx, NULL);
return 1;
return GSS_S_COMPLETE;
}
/*

3
lib/gssapi/spnego/spnego_locl.h
View File

@@ -107,6 +107,9 @@ typedef struct {
gss_name_t mech;
} *spnego_name;
extern gss_OID_desc _gss_spnego_mskrb_mechanism_oid_desc;
extern gss_OID_desc _gss_spnego_krb5_mechanism_oid_desc;
#include <spnego/spnego-private.h>
#endif /* SPNEGO_LOCL_H */