]> andersk Git - openssh.git/blobdiff - auth-krb4.c
- markus@cvs.openbsd.org 2001/05/17 21:34:15
[openssh.git] / auth-krb4.c
index fb0e20ce21b836c16ae7eb7bcb7e66f1659b4b65..8bb6e3d6f363ea13b34869631d630f3c71de03eb 100644 (file)
@@ -1,13 +1,41 @@
 /*
- *    Dug Song <dugsong@UMICH.EDU>
- *    Kerberos v4 authentication and ticket-passing routines.
+ * Copyright (c) 1999 Dug Song.  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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 "includes.h"
+RCSID("$OpenBSD: auth-krb4.c,v 1.23 2001/01/22 08:15:00 markus Exp $");
+
+#include "ssh.h"
+#include "ssh1.h"
 #include "packet.h"
 #include "xmalloc.h"
-#include "ssh.h"
+#include "log.h"
 #include "servconf.h"
+#include "auth.h"
+
+#ifdef AFS
+#include "radix.h"
+#endif
 
 #ifdef KRB4
 char *ticket = NULL;
@@ -19,13 +47,13 @@ extern ServerOptions options;
  * return 1 on success, 0 on failure, -1 if krb4 is not available
  */
 
-int 
+int
 auth_krb4_password(struct passwd * pw, const char *password)
 {
        AUTH_DAT adata;
        KTEXT_ST tkt;
        struct hostent *hp;
-       unsigned long faddr;
+       u_long faddr;
        char localhost[MAXHOSTNAMELEN];
        char phost[INST_SZ];
        char realm[REALM_SZ];
@@ -80,11 +108,12 @@ auth_krb4_password(struct passwd * pw, const char *password)
                        if (r == RD_AP_UNDEC) {
                                /*
                                 * Probably didn't have a srvtab on
-                                * localhost. Allow login.
+                                * localhost. Disallow login.
                                 */
                                log("Kerberos V4 TGT for %s unverifiable, "
                                    "no srvtab installed? krb_rd_req: %s",
                                    pw->pw_name, krb_err_txt[r]);
+                               goto kerberos_auth_failure;
                        } else if (r != KSUCCESS) {
                                log("Kerberos V4 %s ticket unverifiable: %s",
                                    KRB4_SERVICE_NAME, krb_err_txt[r]);
@@ -92,12 +121,13 @@ auth_krb4_password(struct passwd * pw, const char *password)
                        }
                } else if (r == KDC_PR_UNKNOWN) {
                        /*
-                        * Allow login if no rcmd service exists, but
+                        * Disallow login if no rcmd service exists, and
                         * log the error.
                         */
                        log("Kerberos V4 TGT for %s unverifiable: %s; %s.%s "
                            "not registered, or srvtab is wrong?", pw->pw_name,
                        krb_err_txt[r], KRB4_SERVICE_NAME, phost);
+                       goto kerberos_auth_failure;
                } else {
                        /*
                         * TGT is bad, forget it. Possibly spoofed!
@@ -135,11 +165,11 @@ krb4_cleanup_proc(void *ignore)
        }
 }
 
-int 
+int
 krb4_init(uid_t uid)
 {
        static int cleanup_registered = 0;
-       char *tkt_root = TKT_ROOT;
+       const char *tkt_root = TKT_ROOT;
        struct stat st;
        int fd;
 
@@ -150,7 +180,7 @@ krb4_init(uid_t uid)
                if (lstat("/ticket", &st) != -1)
                        tkt_root = "/ticket/";
 #endif /* AFS */
-               snprintf(ticket, MAXPATHLEN, "%s%d_%d", tkt_root, uid, getpid());
+               snprintf(ticket, MAXPATHLEN, "%s%u_%d", tkt_root, uid, getpid());
                (void) krb_set_tkt_string(ticket);
        }
        /* Register ticket cleanup in case of fatal error. */
@@ -179,26 +209,27 @@ krb4_init(uid_t uid)
        return 0;
 }
 
-int 
+int
 auth_krb4(const char *server_user, KTEXT auth, char **client)
 {
        AUTH_DAT adat = {0};
        KTEXT_ST reply;
        char instance[INST_SZ];
        int r, s;
+       socklen_t slen;
        u_int cksum;
        Key_schedule schedule;
        struct sockaddr_in local, foreign;
 
        s = packet_get_connection_in();
 
-       r = sizeof(local);
+       slen = sizeof(local);
        memset(&local, 0, sizeof(local));
-       if (getsockname(s, (struct sockaddr *) & local, &r) < 0)
+       if (getsockname(s, (struct sockaddr *) & local, &slen) < 0)
                debug("getsockname failed: %.100s", strerror(errno));
-       r = sizeof(foreign);
+       slen = sizeof(foreign);
        memset(&foreign, 0, sizeof(foreign));
-       if (getpeername(s, (struct sockaddr *) & foreign, &r) < 0) {
+       if (getpeername(s, (struct sockaddr *) & foreign, &slen) < 0) {
                debug("getpeername failed: %.100s", strerror(errno));
                fatal_cleanup();
        }
@@ -251,11 +282,13 @@ auth_krb4(const char *server_user, KTEXT auth, char **client)
 #endif /* KRB4 */
 
 #ifdef AFS
-int 
+int
 auth_kerberos_tgt(struct passwd *pw, const char *string)
 {
        CREDENTIALS creds;
 
+       if (pw == NULL)
+               goto auth_kerberos_tgt_failure;
        if (!radix_to_creds(string, &creds)) {
                log("Protocol error decoding Kerberos V4 tgt");
                packet_send_debug("Protocol error decoding Kerberos V4 tgt");
@@ -306,12 +339,20 @@ auth_kerberos_tgt_failure:
        return 0;
 }
 
-int 
+int
 auth_afs_token(struct passwd *pw, const char *token_string)
 {
        CREDENTIALS creds;
-       uid_t uid = pw->pw_uid;
+       uid_t uid;
 
+       if (pw == NULL) {
+               /* XXX fake protocol error */
+               packet_send_debug("Protocol error decoding AFS token");
+               packet_start(SSH_SMSG_FAILURE);
+               packet_send();
+               packet_write_wait();
+               return 0;
+       }
        if (!radix_to_creds(token_string, &creds)) {
                log("Protocol error decoding AFS token");
                packet_send_debug("Protocol error decoding AFS token");
@@ -325,6 +366,8 @@ auth_afs_token(struct passwd *pw, const char *token_string)
 
        if (strncmp(creds.pname, "AFS ID ", 7) == 0)
                uid = atoi(creds.pname + 7);
+       else
+               uid = pw->pw_uid;
 
        if (kafs_settoken(creds.realm, uid, &creds)) {
                log("AFS token (%s@%s) rejected for %s", creds.pname, creds.realm,
This page took 0.696548 seconds and 4 git commands to generate.