=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/auth1.c,v retrieving revision 1.25.2.4 retrieving revision 1.26 diff -u -r1.25.2.4 -r1.26 --- src/usr.bin/ssh/Attic/auth1.c 2002/10/11 14:53:06 1.25.2.4 +++ src/usr.bin/ssh/Attic/auth1.c 2001/12/05 03:56:39 1.26 @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth1.c,v 1.25.2.4 2002/10/11 14:53:06 miod Exp $"); +RCSID("$OpenBSD: auth1.c,v 1.26 2001/12/05 03:56:39 itojun Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -22,10 +22,9 @@ #include "servconf.h" #include "compat.h" #include "auth.h" -#include "channels.h" #include "session.h" +#include "misc.h" #include "uidswap.h" -#include "monitor_wrap.h" /* import */ extern ServerOptions options; @@ -67,28 +66,29 @@ { int authenticated = 0; u_int bits; - Key *client_host_key; + RSA *client_host_key; BIGNUM *n; char *client_user, *password; char info[1024]; u_int dlen; + int plen, nlen, elen; u_int ulen; int type = 0; struct passwd *pw = authctxt->pw; debug("Attempting authentication for %s%.100s.", - authctxt->valid ? "" : "illegal user ", authctxt->user); + authctxt->valid ? "" : "illegal user ", authctxt->user); /* If the user has no password, accept authentication immediately. */ if (options.password_authentication && #if defined(KRB4) || defined(KRB5) (!options.kerberos_authentication || options.kerberos_or_local_passwd) && #endif - PRIVSEP(auth_password(authctxt, ""))) { + auth_password(authctxt, "")) { auth_log(authctxt, 1, "without authentication", ""); return; } - + /* Indicate that authentication is needed. */ packet_start(SSH_SMSG_FAILURE); packet_send(); @@ -101,7 +101,7 @@ info[0] = '\0'; /* Get a packet from the client. */ - type = packet_read(); + type = packet_read(&plen); /* Process the packet. */ switch (type) { @@ -112,55 +112,36 @@ verbose("Kerberos authentication disabled."); } else { char *kdata = packet_get_string(&dlen); - packet_check_eom(); - + + packet_integrity_check(plen, 4 + dlen, type); + if (kdata[0] == 4) { /* KRB_PROT_VERSION */ #ifdef KRB4 - KTEXT_ST tkt, reply; + KTEXT_ST tkt; + tkt.length = dlen; if (tkt.length < MAX_KTXT_LEN) memcpy(tkt.dat, kdata, tkt.length); - - if (PRIVSEP(auth_krb4(authctxt, &tkt, - &client_user, &reply))) { + + if (auth_krb4(authctxt, &tkt, &client_user)) { authenticated = 1; snprintf(info, sizeof(info), " tktuser %.100s", client_user); - - packet_start( - SSH_SMSG_AUTH_KERBEROS_RESPONSE); - packet_put_string((char *) - reply.dat, reply.length); - packet_send(); - packet_write_wait(); - xfree(client_user); } #endif /* KRB4 */ } else { #ifdef KRB5 - krb5_data tkt, reply; + krb5_data tkt; tkt.length = dlen; tkt.data = kdata; - - if (PRIVSEP(auth_krb5(authctxt, &tkt, - &client_user, &reply))) { + + if (auth_krb5(authctxt, &tkt, &client_user)) { authenticated = 1; snprintf(info, sizeof(info), " tktuser %.100s", client_user); - - /* Send response to client */ - packet_start( - SSH_SMSG_AUTH_KERBEROS_RESPONSE); - packet_put_string((char *) - reply.data, reply.length); - packet_send(); - packet_write_wait(); - - if (reply.length) - xfree(reply.data); xfree(client_user); } #endif /* KRB5 */ @@ -169,7 +150,7 @@ } break; #endif /* KRB4 || KRB5 */ - + #if defined(AFS) || defined(KRB5) /* XXX - punt on backward compatibility here. */ case SSH_CMSG_HAVE_KERBEROS_TGT: @@ -181,7 +162,7 @@ break; #endif /* AFS */ #endif /* AFS || KRB5 */ - + case SSH_CMSG_AUTH_RHOSTS: if (!options.rhosts_authentication) { verbose("Rhosts authentication disabled."); @@ -194,7 +175,7 @@ * IP-spoofing on a local network.) */ client_user = packet_get_string(&ulen); - packet_check_eom(); + packet_integrity_check(plen, 4 + ulen, type); /* Try to authenticate using /etc/hosts.equiv and .rhosts. */ authenticated = auth_rhosts(pw, client_user); @@ -216,20 +197,24 @@ client_user = packet_get_string(&ulen); /* Get the client host key. */ - client_host_key = key_new(KEY_RSA1); + client_host_key = RSA_new(); + if (client_host_key == NULL) + fatal("RSA_new failed"); + client_host_key->e = BN_new(); + client_host_key->n = BN_new(); + if (client_host_key->e == NULL || client_host_key->n == NULL) + fatal("BN_new failed"); bits = packet_get_int(); - packet_get_bignum(client_host_key->rsa->e); - packet_get_bignum(client_host_key->rsa->n); + packet_get_bignum(client_host_key->e, &elen); + packet_get_bignum(client_host_key->n, &nlen); - if (bits != BN_num_bits(client_host_key->rsa->n)) + if (bits != BN_num_bits(client_host_key->n)) verbose("Warning: keysize mismatch for client_host_key: " - "actual %d, announced %d", - BN_num_bits(client_host_key->rsa->n), bits); - packet_check_eom(); + "actual %d, announced %d", BN_num_bits(client_host_key->n), bits); + packet_integrity_check(plen, (4 + ulen) + 4 + elen + nlen, type); - authenticated = auth_rhosts_rsa(pw, client_user, - client_host_key); - key_free(client_host_key); + authenticated = auth_rhosts_rsa(pw, client_user, client_host_key); + RSA_free(client_host_key); snprintf(info, sizeof info, " ruser %.100s", client_user); xfree(client_user); @@ -241,10 +226,9 @@ break; } /* RSA authentication requested. */ - if ((n = BN_new()) == NULL) - fatal("do_authloop: BN_new failed"); - packet_get_bignum(n); - packet_check_eom(); + n = BN_new(); + packet_get_bignum(n, &nlen); + packet_integrity_check(plen, nlen, type); authenticated = auth_rsa(pw, n); BN_clear_free(n); break; @@ -260,10 +244,10 @@ * not visible to an outside observer. */ password = packet_get_string(&dlen); - packet_check_eom(); + packet_integrity_check(plen, 4 + dlen, type); /* Try authentication with the password. */ - authenticated = PRIVSEP(auth_password(authctxt, password)); + authenticated = auth_password(authctxt, password); memset(password, 0, strlen(password)); xfree(password); @@ -289,7 +273,7 @@ if (options.challenge_response_authentication == 1) { char *response = packet_get_string(&dlen); debug("got response '%s'", response); - packet_check_eom(); + packet_integrity_check(plen, 4 + dlen, type); authenticated = verify_response(authctxt, response); memset(response, 'r', dlen); xfree(response); @@ -315,8 +299,7 @@ authctxt->user); /* Special handling for root */ - if (!use_privsep && - authenticated && authctxt->pw->pw_uid == 0 && + if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(get_authname(type))) authenticated = 0; @@ -339,52 +322,51 @@ * Performs authentication of an incoming connection. Session key has already * been exchanged and encryption is enabled. */ -Authctxt * +void do_authentication(void) { Authctxt *authctxt; + struct passwd *pw; + int plen; u_int ulen; - char *user, *style = NULL; + char *p, *user, *style = NULL; /* Get the name of the user that we wish to log in as. */ - packet_read_expect(SSH_CMSG_USER); + packet_read_expect(&plen, SSH_CMSG_USER); /* Get the user name. */ user = packet_get_string(&ulen); - packet_check_eom(); + packet_integrity_check(plen, (4 + ulen), SSH_CMSG_USER); if ((style = strchr(user, ':')) != NULL) *style++ = '\0'; -#ifdef KRB5 /* XXX - SSH.com Kerberos v5 braindeath. */ - if ((datafellows & SSH_BUG_K5USER) && - options.kerberos_authentication) { - char *p; - if ((p = strchr(user, '@')) != NULL) - *p = '\0'; - } -#endif - + if ((p = strchr(user, '@')) != NULL) + *p = '\0'; + authctxt = authctxt_new(); authctxt->user = user; authctxt->style = style; /* Verify that the user is a valid user. */ - if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL) + pw = getpwnam(user); + if (pw && allowed_user(pw)) { authctxt->valid = 1; - else + pw = pwcopy(pw); + } else { debug("do_authentication: illegal user %s", user); + pw = NULL; + } + authctxt->pw = pw; - setproctitle("%s%s", authctxt->pw ? user : "unknown", - use_privsep ? " [net]" : ""); + setproctitle("%s", pw ? user : "unknown"); /* * If we are not running as root, the user must have the same uid as * the server. */ - if (!use_privsep && getuid() != 0 && authctxt->pw && - authctxt->pw->pw_uid != getuid()) + if (getuid() != 0 && pw && pw->pw_uid != getuid()) packet_disconnect("Cannot change user when server not running as root."); /* @@ -398,5 +380,6 @@ packet_send(); packet_write_wait(); - return (authctxt); + /* Perform session preparation. */ + do_authenticated(authctxt); }