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

gssapi: implement gss_set_neg_mechs() (#495)

Browse Source 
Implementation of gss_set_neg_mechs() and gss_get_neg_mechs() as defined in RFC
4178. New gss_release_cred_by_mech() API for dropping a credential from a
mechanism glue credential.
This commit is contained in:
Luke Howard
2019-01-04 10:13:03 +11:00
parent dfaaf9c93f
commit 735039dbdc
15 changed files with 354 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/gssapi/mech/cred.c
View File

@@ -37,6 +37,17 @@
#include "heim_threads.h"
#include "heimbase.h"
static OM_uint32
release_mech_cred(OM_uint32 *minor, struct _gss_mechanism_cred *mc)
{
OM_uint32 major;
major = mc->gmc_mech->gm_release_cred(minor, &mc->gmc_cred);
free(mc);
return major;
}
void
_gss_mg_release_cred(struct _gss_cred *cred)
@@ -47,8 +58,7 @@ _gss_mg_release_cred(struct _gss_cred *cred)
while (HEIM_SLIST_FIRST(&cred->gc_mc)) {
mc = HEIM_SLIST_FIRST(&cred->gc_mc);
HEIM_SLIST_REMOVE_HEAD(&cred->gc_mc, gmc_link);
mc->gmc_mech->gm_release_cred(&junk, &mc->gmc_cred);
free(mc);
release_mech_cred(&junk, mc);
}
free(cred);
}
@@ -65,3 +75,27 @@ _gss_mg_alloc_cred(void)
return cred;
}
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
gss_release_cred_by_mech(OM_uint32 *minor_status,
gss_cred_id_t cred_handle,
gss_const_OID mech_oid)
{
struct _gss_cred *cred = (struct _gss_cred *)cred_handle;
struct _gss_mechanism_cred *mc;
OM_uint32 major_status;
HEIM_SLIST_FOREACH(mc, &cred->gc_mc, gmc_link) {
if (gss_oid_equal(mech_oid, mc->gmc_mech_oid))
break;
}
if (mc) {
HEIM_SLIST_REMOVE(&cred->gc_mc, mc, _gss_mechanism_cred, gmc_link);
major_status = release_mech_cred(minor_status, mc);
} else {
*minor_status = 0;
major_status = GSS_S_NO_CRED;
}
return major_status;
}

113
lib/gssapi/mech/gss_get_neg_mechs.c Normal file
View File

@@ -0,0 +1,113 @@
/*
* Copyright (c) 2018, PADL Software Pty Ltd.
* 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 PADL Software 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 PADL SOFTWARE 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 PADL SOFTWARE 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"
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
gss_get_neg_mechs (OM_uint32 *minor_status,
gss_const_cred_id_t cred_handle,
gss_OID_set *mechs)
{
struct _gss_cred *cred = (struct _gss_cred *)cred_handle;
OM_uint32 major, minor;
gss_cred_id_t tmp_cred = GSS_C_NO_CREDENTIAL;
struct _gss_mechanism_cred *mc;
if (minor_status == NULL)
return GSS_S_CALL_INACCESSIBLE_WRITE;
*minor_status = 0;
if (mechs == NULL)
return GSS_S_CALL_INACCESSIBLE_WRITE;
*mechs = GSS_C_NO_OID_SET;
_gss_load_mech();
if (cred == NULL) {
major = gss_acquire_cred(minor_status, GSS_C_NO_NAME, GSS_C_INDEFINITE,
GSS_C_NO_OID_SET, GSS_C_BOTH,
&tmp_cred, NULL, NULL);
if (GSS_ERROR(major))
return major;
cred = (struct _gss_cred *)tmp_cred;
}
major = gss_create_empty_oid_set(minor_status, mechs);
if (GSS_ERROR(major))
goto cleanup;
major = GSS_S_UNAVAILABLE;
HEIM_SLIST_FOREACH(mc, &cred->gc_mc, gmc_link) {
gssapi_mech_interface m;
gss_OID_set mechs2 = GSS_C_NO_OID_SET;
size_t i;
m = mc->gmc_mech;
if (m == NULL) {
major = GSS_S_BAD_MECH;
goto cleanup;
}
if (m->gm_get_neg_mechs == NULL)
continue;
major = m->gm_get_neg_mechs(minor_status, mc->gmc_cred, &mechs2);
if (GSS_ERROR(major))
goto cleanup;
if (mechs2 == GSS_C_NO_OID_SET)
continue;
for (i = 0; i < mechs2->count; i++) {
major = gss_add_oid_set_member(minor_status, &mechs2->elements[i],
mechs);
if (GSS_ERROR(major)) {
gss_release_oid_set(&minor, &mechs2);
goto cleanup;
}
}
gss_release_oid_set(&minor, &mechs2);
}
cleanup:
if (tmp_cred)
gss_release_cred(&minor, &tmp_cred);
if (major == GSS_S_COMPLETE && *mechs == GSS_C_NO_OID_SET)
major = GSS_S_NO_CRED;
if (GSS_ERROR(major))
gss_release_oid_set(&minor, mechs);
return major;
}

2
lib/gssapi/mech/gss_mech_switch.c
View File

@@ -397,6 +397,8 @@ _gss_load_mech(void)
OPTSYM(duplicate_cred);
OPTSYM(add_cred_from);
OPTSYM(store_cred_into);
OPTSYM(set_neg_mechs);
OPTSYM(get_neg_mechs);
OPTSPISYM(authorize_localname);
mi = (_gss_mo_init *)dlsym(so, "gss_mo_init");

93
lib/gssapi/mech/gss_set_neg_mechs.c Normal file
View File

@@ -0,0 +1,93 @@
/*
* Copyright (c) 2018, PADL Software Pty Ltd.
* 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 PADL Software 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 PADL SOFTWARE 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 PADL SOFTWARE 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"
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
gss_set_neg_mechs (OM_uint32 *minor_status,
gss_cred_id_t cred_handle,
const gss_OID_set mechs)
{
struct _gss_cred *cred = (struct _gss_cred *)cred_handle;
OM_uint32 major;
int found = 0;
if (minor_status == NULL)
return GSS_S_CALL_INACCESSIBLE_WRITE;
*minor_status = 0;
if (mechs == GSS_C_NO_OID_SET)
return GSS_S_CALL_INACCESSIBLE_READ;
_gss_load_mech();
major = GSS_S_UNAVAILABLE;
if (cred == NULL) {
struct _gss_mech_switch *m;
HEIM_SLIST_FOREACH(m, &_gss_mechs, gm_link) {
if (m->gm_mech.gm_set_neg_mechs == NULL)
continue;
major = m->gm_mech.gm_set_neg_mechs(minor_status,
GSS_C_NO_CREDENTIAL, mechs);
if (major == GSS_S_COMPLETE)
found++;
else
_gss_mg_error(&m->gm_mech, *minor_status);
}
} else {
struct _gss_mechanism_cred *mc;
HEIM_SLIST_FOREACH(mc, &cred->gc_mc, gmc_link) {
gssapi_mech_interface m;
m = mc->gmc_mech;
if (m == NULL)
return GSS_S_BAD_MECH;
if (m->gm_set_neg_mechs == NULL)
continue;
major = m->gm_set_neg_mechs(minor_status, mc->gmc_cred, mechs);
if (major == GSS_S_COMPLETE)
found++;
else
_gss_mg_error(m, *minor_status);
}
}
if (found) {
*minor_status = 0;
return GSS_S_COMPLETE;
}
return major;
}