69b0a8f4eb
kadmin should not permit a modify that stores invalid keys into the database. Accepting bad key data into the database will result in errors when those keys are eventually used. This change does not address the general case. It does address the specific case of the kadmin client attempting to store the magic bogus key since that is trivial to check for and can be unintentionally returned to kadmind by a 1.6rc2 or prior client. This can happen when a user has get privilege but lacks the new get-keys privilege. Change-Id: I44795e6428472b75ab1e4257ce7cb9160f0299f5
133 lines
4.3 KiB
C
133 lines
4.3 KiB
C
/*
|
|
* Copyright (c) 1997-2001, 2003, 2005-2006 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 "kadm5_locl.h"
|
|
|
|
RCSID("$Id$");
|
|
|
|
static kadm5_ret_t
|
|
modify_principal(void *server_handle,
|
|
kadm5_principal_ent_t princ,
|
|
uint32_t mask,
|
|
uint32_t forbidden_mask)
|
|
{
|
|
kadm5_server_context *context = server_handle;
|
|
hdb_entry_ex ent;
|
|
kadm5_ret_t ret;
|
|
|
|
memset(&ent, 0, sizeof(ent));
|
|
|
|
if((mask & forbidden_mask))
|
|
return KADM5_BAD_MASK;
|
|
if((mask & KADM5_POLICY) && strcmp(princ->policy, "default"))
|
|
return KADM5_UNK_POLICY;
|
|
|
|
if (!context->keep_open) {
|
|
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
|
if(ret)
|
|
return ret;
|
|
}
|
|
ret = context->db->hdb_fetch_kvno(context->context, context->db,
|
|
princ->principal, HDB_F_GET_ANY|HDB_F_ADMIN_DATA, 0, &ent);
|
|
if(ret)
|
|
goto out;
|
|
ret = _kadm5_setup_entry(context, &ent, mask, princ, mask, NULL, 0);
|
|
if(ret)
|
|
goto out2;
|
|
ret = _kadm5_set_modifier(context, &ent.entry);
|
|
if(ret)
|
|
goto out2;
|
|
|
|
/*
|
|
* If any keys are bogus, disallow the modify. If the keys were
|
|
* bogus as stored in the HDB we could allow those through, but
|
|
* distinguishing that case from a pre-1.6 client using add_enctype
|
|
* without the get-keys privilege requires more work (mainly: checking that
|
|
* the bogus keys in princ->key_data[] have corresponding bogus keys in ent
|
|
* before calling _kadm5_setup_entry()).
|
|
*/
|
|
if ((mask & KADM5_KEY_DATA) &&
|
|
kadm5_some_keys_are_bogus(princ->n_key_data, princ->key_data)) {
|
|
ret = KADM5_AUTH_GET_KEYS; /* Not quite appropriate, but it'll do */
|
|
goto out2;
|
|
}
|
|
|
|
ret = hdb_seal_keys(context->context, context->db, &ent.entry);
|
|
if (ret)
|
|
goto out2;
|
|
|
|
if ((mask & KADM5_POLICY)) {
|
|
HDB_extension ext;
|
|
|
|
ext.data.element = choice_HDB_extension_data_policy;
|
|
ext.data.u.policy = strdup(princ->policy);
|
|
if (ext.data.u.policy == NULL) {
|
|
ret = ENOMEM;
|
|
goto out2;
|
|
}
|
|
/* This calls free_HDB_extension(), freeing ext.data.u.policy */
|
|
ret = hdb_replace_extension(context->context, &ent.entry, &ext);
|
|
if (ret)
|
|
goto out2;
|
|
}
|
|
|
|
ret = context->db->hdb_store(context->context, context->db,
|
|
HDB_F_REPLACE, &ent);
|
|
if (ret)
|
|
goto out2;
|
|
|
|
kadm5_log_modify (context,
|
|
&ent.entry,
|
|
mask | KADM5_MOD_NAME | KADM5_MOD_TIME);
|
|
|
|
out2:
|
|
hdb_free_entry(context->context, &ent);
|
|
out:
|
|
if (!context->keep_open)
|
|
context->db->hdb_close(context->context, context->db);
|
|
return _kadm5_error_code(ret);
|
|
}
|
|
|
|
|
|
kadm5_ret_t
|
|
kadm5_s_modify_principal(void *server_handle,
|
|
kadm5_principal_ent_t princ,
|
|
uint32_t mask)
|
|
{
|
|
return modify_principal(server_handle, princ, mask,
|
|
KADM5_LAST_PWD_CHANGE | KADM5_MOD_TIME
|
|
| KADM5_MOD_NAME | KADM5_MKVNO
|
|
| KADM5_AUX_ATTRIBUTES | KADM5_LAST_SUCCESS
|
|
| KADM5_LAST_FAILED);
|
|
}
|