Skip to content

modifiy kcrapclient to allow keytab & principal name to be specified #3

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
daniel1111 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

modifiy kcrapclient to allow keytab & principal name to be specified #3

Show file tree
Hide file tree
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
46 changes: 36 additions & 10 deletions client/kcrapclient.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,43 @@ int main(int argc, char *argv[])
char cchal[130];
char resp[24];
int auth_status;

if (argc != 4)
int ch;
char *princ_name = NULL;
char *keytab = NULL;
int arg_count = 0;

while ((ch = getopt(argc, argv, "p:k:")) != -1)
switch (ch)
{
case 'p':
princ_name = optarg;
arg_count += 2;
break;

case 'k':
keytab = optarg;
arg_count += 2;
break;

default:
exit(2);
break;
}

if (argc-arg_count != 4)
{
fprintf(OSTREAM, "Error: Invalid parameters...\n");
fprintf(OSTREAM, "Usage: %s <username> <challenge> <response>\n", argv[0]);
fprintf(OSTREAM, "Usage: %s [-p principal name] [-k keytab] <username> <challenge> <response>\n", argv[0]);
exit(1);
}

if (strlen(argv[2]) != 16)
if (strlen(argv[2+arg_count]) != 16)
{
fprintf(OSTREAM, "Error: Invalid challenge length.\n");
exit(1);
}

if (strlen(argv[3]) != 48)
if (strlen(argv[3+arg_count]) != 48)
{
fprintf(OSTREAM, "Error: Invalid response length.\n");
exit(1);
Expand All @@ -83,13 +105,13 @@ int main(int argc, char *argv[])
SDATA(req.chal_type, "NTLM");

// SDATA(req.principal, "user");
req.principal.data = argv[1];
req.principal.length = strlen(argv[1]);
req.principal.data = argv[1+arg_count];
req.principal.length = strlen(argv[1+arg_count]);

req.server_challenge.length = 8;
req.server_challenge.data = schal;
// FILL(schal, "0123456789abcdef");
if (fillhex(schal, argv[2]))
if (fillhex(schal, argv[2+arg_count]))
{
fprintf(OSTREAM, "Error: Invalid challenge string.\n");
exit(1);
Expand All @@ -98,13 +120,17 @@ int main(int argc, char *argv[])
req.response.length = 24;
req.response.data = resp;
// FILL(resp, "25a98c1c31e81847466b29b2df4680f39958fb8c213a9cc6");
if (fillhex(resp, argv[3]))
if (fillhex(resp, argv[3+arg_count]))
{
fprintf(OSTREAM, "Error: Invalid response string.\n");
exit(1);
}

context = kcrap_init(NULL, NULL);
if (princ_name == NULL)
context = kcrap_init(keytab, NULL);
else
context = kcrap_init_princ(keytab, princ_name);

if (context == NULL)
{
fprintf(OSTREAM, "Error: %s\n", kcrap_errmsg());
Expand Down
2 changes: 2 additions & 0 deletions lib/kcrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ struct kcrap_chal_rep_data
};

struct kcrap_context *kcrap_init(char *keytab, char *service);
struct kcrap_context *kcrap_init_princ(char *keytab, char *princ_name);
struct kcrap_context *kcrap_init_ex(char *keytab, char *service, char *princ_name);
void kcrap_free(struct kcrap_context *context);
const char *kcrap_errmsg();
const struct kcrap_data kcrap_get_extra_data();
Expand Down
26 changes: 22 additions & 4 deletions lib/kcraplib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ const struct kcrap_data kcrap_get_extra_data()
}

struct kcrap_context *kcrap_init(char *keytab, char *service)
{
return kcrap_init_ex(keytab, service, NULL);
}

struct kcrap_context *kcrap_init_princ(char *keytab, char *princ_name)
{
return kcrap_init_ex(keytab, NULL, princ_name);
}

struct kcrap_context *kcrap_init_ex(char *keytab, char *service, char *princ_name)
{
struct kcrap_context *context;
krb5_error_code retval;
Expand Down Expand Up @@ -68,10 +78,18 @@ struct kcrap_context *kcrap_init(char *keytab, char *service)
}

/* my princ */
if (service == NULL)
service = "host";
if ((retval = krb5_sname_to_principal(context->krb5_context, NULL, service, KRB5_NT_SRV_HST, &context->sprinc)))
break;
if (princ_name != NULL)
{
if ((retval = krb5_parse_name(context->krb5_context, princ_name, &context->sprinc)))
break;
}
else
{
if (service == NULL)
service = "host";
if ((retval = krb5_sname_to_principal(context->krb5_context, NULL, service, KRB5_NT_SRV_HST, &context->sprinc)))
break;
}

/* Get credentials for server */
if ((retval = krb5_cc_resolve(context->krb5_context, "MEMORY:kcraplib", &context->ccache)))
Expand Down