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

use krb5_err instead of sysloging directly, handle the new protocol,

Browse Source 
and bail out if an old client tries to connect


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11377 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-09-04 20:31:48 +00:00
parent 4553415279
commit 4c81cc848e
1 changed files with 80 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
appl/kf/kfd.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2001 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2002 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -40,7 +40,7 @@ char krb5_tkfile[MAXPATHLEN];
static int help_flag; static int help_flag;
static int version_flag; static int version_flag;
static char *port_str; static char *port_str;
char *service = SERVICE; char *service = KF_SERVICE;
int do_inetd = 0; int do_inetd = 0;
static char *regpag_str=NULL; static char *regpag_str=NULL;
@@ -92,7 +92,7 @@ server_setup(krb5_context *context, int argc, char **argv)
} }
if (port == 0) if (port == 0)
port = krb5_getportbyname (*context, PORT, "tcp", PORT_NUM); port = krb5_getportbyname (*context, KF_PORT_NAME, "tcp", KF_PORT_NUM);
if(argv[local_argc] != NULL) if(argv[local_argc] != NULL)
usage(1, args, num_args); usage(1, args, num_args);
@@ -100,26 +100,23 @@ server_setup(krb5_context *context, int argc, char **argv)
return port; return port;
} }
static void static int protocol_version;
syslog_and_die (const char *m, ...)
static krb5_boolean
kfd_match_version(const void *arg, const char *version)
{ {
va_list args; if(strcmp(version, KF_VERSION_1) == 0) {
protocol_version = 1;
va_start(args, m); return TRUE;
vsyslog (LOG_ERR, m, args); } else if (strlen(version) == 4 &&
va_end(args); version[0] == '0' &&
exit (1); version[1] == '.' &&
} (version[2] == '4' || version[2] == '3') &&
islower(version[3])) {
static void protocol_version = 0;
syslog_and_cont (const char *m, ...) return TRUE;
{ }
va_list args; return FALSE;
va_start(args, m);
vsyslog (LOG_ERR, m, args);
va_end(args);
return;
} }
static int static int
@@ -132,31 +129,25 @@ proto (int sock, const char *service)
char *name; char *name;
char ret_string[10]; char ret_string[10];
char hostname[MAXHOSTNAMELEN]; char hostname[MAXHOSTNAMELEN];
krb5_data packet;
krb5_data data; krb5_data data;
krb5_data remotename; krb5_data remotename;
krb5_data tk_file; krb5_data tk_file;
u_int32_t len, net_len;
krb5_ccache ccache; krb5_ccache ccache;
char ccname[MAXPATHLEN]; char ccname[MAXPATHLEN];
struct passwd *pwd; struct passwd *pwd;
ssize_t n;
status = krb5_auth_con_init (context, &auth_context); status = krb5_auth_con_init (context, &auth_context);
if (status) if (status)
syslog_and_die("krb5_auth_con_init: %s", krb5_err(context, 1, status, "krb5_auth_con_init");
krb5_get_err_text(context, status));
status = krb5_auth_con_setaddrs_from_fd (context, status = krb5_auth_con_setaddrs_from_fd (context,
auth_context, auth_context,
&sock); &sock);
if (status) if (status)
syslog_and_die("krb5_auth_con_setaddr: %s", krb5_err(context, 1, status, "krb5_auth_con_setaddr");
krb5_get_err_text(context, status));
if(gethostname (hostname, sizeof(hostname)) < 0) if(gethostname (hostname, sizeof(hostname)) < 0)
syslog_and_die("gethostname: %s",strerror(errno)); krb5_err(context, 1, errno, "gethostname");
status = krb5_sname_to_principal (context, status = krb5_sname_to_principal (context,
hostname, hostname,
@@ -164,71 +155,63 @@ proto (int sock, const char *service)
KRB5_NT_SRV_HST, KRB5_NT_SRV_HST,
&server); &server);
if (status) if (status)
syslog_and_die("krb5_sname_to_principal: %s", krb5_err(context, 1, status, "krb5_sname_to_principal");
krb5_get_err_text(context, status));
status = krb5_recvauth (context, status = krb5_recvauth_match_version (context,
&auth_context, &auth_context,
&sock, &sock,
VERSION, kfd_match_version,
NULL,
server, server,
0, 0,
NULL, NULL,
&ticket); &ticket);
if (status) if (status)
syslog_and_die("krb5_recvauth: %s", krb5_err(context, 1, status, "krb5_recvauth");
krb5_get_err_text(context, status));
status = krb5_unparse_name (context, status = krb5_unparse_name (context,
ticket->client, ticket->client,
&name); &name);
if (status) if (status)
syslog_and_die("krb5_unparse_name: %s", krb5_err(context, 1, status, "krb5_unparse_name");
krb5_get_err_text(context, status));
status=krb5_read_message (context, &sock, &remotename); if(protocol_version == 0) {
if (status) { data.data = "old clnt"; /* XXX old clients only had room for
syslog_and_die("krb5_read_message: %s", 10 bytes of message, and also
krb5_get_err_text(context, status)); didn't show it to the user */
} data.length = strlen(data.data) + 1;
status=krb5_read_message (context, &sock, &tk_file); krb5_write_message(context, &sock, &data);
if (status) { sleep(2); /* XXX give client time to finish */
syslog_and_die("krb5_read_message: %s", krb5_errx(context, 1, "old client; exiting");
krb5_get_err_text(context, status));
} }
status=krb5_read_priv_message (context, auth_context,
&sock, &remotename);
if (status)
krb5_err(context, 1, status, "krb5_read_message");
status=krb5_read_priv_message (context, auth_context,
&sock, &tk_file);
if (status)
krb5_err(context, 1, status, "krb5_read_message");
krb5_data_zero (&data); krb5_data_zero (&data);
krb5_data_zero (&packet);
n = krb5_net_read (context, &sock, &net_len, 4); if(((char*)remotename.data)[remotename.length-1] != '\0')
if (n < 0) krb5_errx(context, 1, "unterminated received");
syslog_and_die("krb5_net_read: %s", strerror(errno)); if(((char*)tk_file.data)[tk_file.length-1] != '\0')
if (n == 0) krb5_errx(context, 1, "unterminated received");
syslog_and_die("EOF in krb5_net_read");
len = ntohl(net_len); status = krb5_read_priv_message(context, auth_context, &sock, &data);
krb5_data_alloc (&packet, len);
n = krb5_net_read (context, &sock, packet.data, len);
if (n < 0)
syslog_and_die("krb5_net_read: %s", strerror(errno));
if (n == 0)
syslog_and_die("EOF in krb5_net_read");
status = krb5_rd_priv (context,
auth_context,
&packet,
&data,
NULL);
if (status) { if (status) {
syslog_and_cont("krb5_rd_priv: %s", krb5_err(context, 1, errno, "krb5_read_priv_message");
krb5_get_err_text(context, status));
goto out; goto out;
} }
pwd = getpwnam ((char *)(remotename.data)); pwd = getpwnam ((char *)(remotename.data));
if (pwd == NULL) { if (pwd == NULL) {
status=1; status=1;
syslog_and_cont("getpwnam: %s failed",(char *)(remotename.data)); krb5_warnx(context, "getpwnam: %s failed",(char *)(remotename.data));
goto out; goto out;
} }
@@ -236,16 +219,16 @@ proto (int sock, const char *service)
ticket->client, ticket->client,
(char *)(remotename.data))) { (char *)(remotename.data))) {
status=1; status=1;
syslog_and_cont("krb5_kuserok: permission denied"); krb5_warnx(context, "krb5_kuserok: permission denied");
goto out; goto out;
} }
if (setgid(pwd->pw_gid) < 0) { if (setgid(pwd->pw_gid) < 0) {
syslog_and_cont ("setgid: %s", strerror(errno)); krb5_warn(context, errno, "setgid");
goto out; goto out;
} }
if (setuid(pwd->pw_uid) < 0) { if (setuid(pwd->pw_uid) < 0) {
syslog_and_cont ("setuid: %s", strerror(errno)); krb5_warn(context, errno, "setuid");
goto out; goto out;
} }
@@ -256,49 +239,41 @@ proto (int sock, const char *service)
status = krb5_cc_resolve (context, ccname, &ccache); status = krb5_cc_resolve (context, ccname, &ccache);
if (status) { if (status) {
syslog_and_cont("krb5_cc_resolve: %s", krb5_warn(context, status, "krb5_cc_resolve");
krb5_get_err_text(context, status));
goto out; goto out;
} }
status = krb5_cc_initialize (context, ccache, ticket->client); status = krb5_cc_initialize (context, ccache, ticket->client);
if (status) { if (status) {
syslog_and_cont("krb5_cc_initialize: %s", krb5_warn(context, status, "krb5_cc_initialize");
krb5_get_err_text(context, status));
goto out; goto out;
} }
status = krb5_rd_cred2 (context, auth_context, ccache, &data); status = krb5_rd_cred2 (context, auth_context, ccache, &data);
krb5_cc_close (context, ccache); krb5_cc_close (context, ccache);
if (status) { if (status) {
syslog_and_cont("krb5_rd_cred: %s", krb5_warn(context, status, "krb5_rd_cred");
krb5_get_err_text(context, status));
goto out; goto out;
} }
strlcpy(krb5_tkfile,ccname,sizeof(krb5_tkfile)); strlcpy(krb5_tkfile,ccname,sizeof(krb5_tkfile));
syslog_and_cont("%s forwarded ticket to %s,%s", krb5_warnx(context, "%s forwarded ticket to %s,%s",
name, name,
(char *)(remotename.data),ccname); (char *)(remotename.data),ccname);
out: out:
if (status) { if (status) {
strcpy(ret_string, "no"); strcpy(ret_string, "no");
syslog_and_cont("failed"); krb5_warnx(context, "failed");
} else { } else {
strcpy(ret_string, "ok"); strcpy(ret_string, "ok");
} }
krb5_data_free (&tk_file); krb5_data_free (&tk_file);
krb5_data_free (&remotename); krb5_data_free (&remotename);
krb5_data_free (&packet);
krb5_data_free (&data); krb5_data_free (&data);
free(name); free(name);
len = strlen(ret_string) + 1; data.data = ret_string;
net_len = htonl(len); data.length = strlen(ret_string) + 1;
if (krb5_net_write (context, &sock, &net_len, 4) != 4) return krb5_write_priv_message(context, auth_context, &sock, &data);
return 1;
if (krb5_net_write (context, &sock, ret_string, len) != len)
return 1;
return status;
} }
static int static int
@@ -314,10 +289,16 @@ main(int argc, char **argv)
{ {
int port; int port;
int ret; int ret;
krb5_log_facility *fac;
setprogname (argv[0]); setprogname (argv[0]);
roken_openlog (argv[0], LOG_ODELAY | LOG_PID,LOG_AUTH); roken_openlog (argv[0], LOG_ODELAY | LOG_PID,LOG_AUTH);
port = server_setup(&context, argc, argv); port = server_setup(&context, argc, argv);
ret = krb5_openlog(context, "kfd", &fac);
if(ret) krb5_err(context, 1, ret, "krb5_openlog");
ret = krb5_set_warn_dest(context, fac);
if(ret) krb5_err(context, 1, ret, "krb5_set_warn_dest");
ret = doit (port, service); ret = doit (port, service);
closelog(); closelog();
if (ret == 0 && regpag_str != NULL) if (ret == 0 && regpag_str != NULL)