Skip to content

krb5: improve reporting failure on reading keytab #8530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
257 wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −7
Open

krb5: improve reporting failure on reading keytab #8530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions src/providers/krb5/krb5_keytab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
#include "util/sss_krb5.h"
#include "providers/krb5/krb5_common.h"

#include <fcntl.h>

static krb5_error_code do_keytab_copy(krb5_context kctx, krb5_keytab s_keytab,
krb5_keytab d_keytab)
{
Expand Down Expand Up @@ -120,13 +122,6 @@ krb5_error_code copy_keytab_into_memory(TALLOC_CTX *mem_ctx, krb5_context kctx,
return kerr;
}

kerr = sss_krb5_kt_have_content(kctx, keytab);
if (kerr != 0) {
DEBUG(SSSDBG_CRIT_FAILURE, "keytab [%s] has not entries.\n",
keytab_file);
goto done;
}

kerr = krb5_kt_get_name(kctx, keytab, keytab_name, sizeof(keytab_name));
if (kerr != 0) {
DEBUG(SSSDBG_CRIT_FAILURE, "Failed to read name for keytab [%s].\n",
Expand All @@ -142,6 +137,21 @@ krb5_error_code copy_keytab_into_memory(TALLOC_CTX *mem_ctx, krb5_context kctx,
goto done;
}

if (faccessat(AT_FDCWD, sep+1, R_OK, AT_EACCESS) != 0) {
int saved_errno = errno;
DEBUG(SSSDBG_CRIT_FAILURE, "keytab [%s] is not readable by us (%s).\n",
keytab_file, sss_strerror(saved_errno));
kerr = KRB5KRB_ERR_GENERIC;
goto done;
}

kerr = sss_krb5_kt_have_content(kctx, keytab);
if (kerr != 0) {
DEBUG(SSSDBG_CRIT_FAILURE, "keytab [%s] has no entries.\n",
keytab_file);
goto done;
}

if (strncmp(keytab_name, "MEMORY:", sizeof("MEMORY:") -1) == 0) {
DEBUG(SSSDBG_TRACE_FUNC, "Keytab [%s] is already memory keytab.\n",
keytab_name);
Expand Down
Loading