2019-01-17 05:20:53 +01:00
|
|
|
/* $OpenBSD: auth2.c,v 1.151 2019/01/17 04:20:53 djm Exp $ */
|
2000-04-29 15:57:08 +02:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2000 Markus Friedl. 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.
|
|
|
|
*/
|
2000-09-16 04:29:08 +02:00
|
|
|
|
2000-04-29 15:57:08 +02:00
|
|
|
#include "includes.h"
|
|
|
|
|
2006-07-10 12:53:08 +02:00
|
|
|
#include <sys/types.h>
|
2008-07-02 14:56:09 +02:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/uio.h>
|
2006-07-10 12:53:08 +02:00
|
|
|
|
2008-07-02 14:56:09 +02:00
|
|
|
#include <fcntl.h>
|
2017-06-24 08:34:38 +02:00
|
|
|
#include <limits.h>
|
2006-07-10 12:53:08 +02:00
|
|
|
#include <pwd.h>
|
2006-08-05 04:39:39 +02:00
|
|
|
#include <stdarg.h>
|
2006-07-24 06:13:33 +02:00
|
|
|
#include <string.h>
|
2008-07-02 14:56:09 +02:00
|
|
|
#include <unistd.h>
|
2019-01-17 05:20:53 +01:00
|
|
|
#include <time.h>
|
2006-07-10 12:53:08 +02:00
|
|
|
|
2008-07-05 01:44:53 +02:00
|
|
|
#include "atomicio.h"
|
2009-06-21 11:50:08 +02:00
|
|
|
#include "xmalloc.h"
|
2006-08-05 04:39:39 +02:00
|
|
|
#include "ssh2.h"
|
2000-04-29 15:57:08 +02:00
|
|
|
#include "packet.h"
|
2001-01-22 06:34:40 +01:00
|
|
|
#include "log.h"
|
2018-07-09 23:35:50 +02:00
|
|
|
#include "sshbuf.h"
|
2014-07-18 06:11:24 +02:00
|
|
|
#include "misc.h"
|
2000-04-29 15:57:08 +02:00
|
|
|
#include "servconf.h"
|
|
|
|
#include "compat.h"
|
2018-07-11 20:53:29 +02:00
|
|
|
#include "sshkey.h"
|
2006-08-05 04:39:39 +02:00
|
|
|
#include "hostfile.h"
|
2000-04-29 15:57:08 +02:00
|
|
|
#include "auth.h"
|
|
|
|
#include "dispatch.h"
|
2001-01-22 06:34:40 +01:00
|
|
|
#include "pathnames.h"
|
2018-07-10 11:39:52 +02:00
|
|
|
#include "sshbuf.h"
|
|
|
|
#include "ssherr.h"
|
2000-04-29 15:57:08 +02:00
|
|
|
|
2003-08-26 03:49:55 +02:00
|
|
|
#ifdef GSSAPI
|
|
|
|
#include "ssh-gss.h"
|
|
|
|
#endif
|
2006-08-05 04:39:39 +02:00
|
|
|
#include "monitor_wrap.h"
|
2017-06-24 08:34:38 +02:00
|
|
|
#include "ssherr.h"
|
2018-04-13 05:57:26 +02:00
|
|
|
#include "digest.h"
|
2003-08-26 03:49:55 +02:00
|
|
|
|
2000-04-29 15:57:08 +02:00
|
|
|
/* import */
|
|
|
|
extern ServerOptions options;
|
2000-12-22 02:43:59 +01:00
|
|
|
extern u_char *session_id2;
|
2003-06-28 04:38:01 +02:00
|
|
|
extern u_int session_id2_len;
|
2018-07-10 11:39:52 +02:00
|
|
|
extern struct sshbuf *loginmsg;
|
2000-04-29 15:57:08 +02:00
|
|
|
|
2002-06-06 22:52:37 +02:00
|
|
|
/* methods */
|
|
|
|
|
|
|
|
extern Authmethod method_none;
|
|
|
|
extern Authmethod method_pubkey;
|
|
|
|
extern Authmethod method_passwd;
|
|
|
|
extern Authmethod method_kbdint;
|
|
|
|
extern Authmethod method_hostbased;
|
2003-08-26 03:49:55 +02:00
|
|
|
#ifdef GSSAPI
|
|
|
|
extern Authmethod method_gssapi;
|
|
|
|
#endif
|
2002-06-06 22:52:37 +02:00
|
|
|
|
|
|
|
Authmethod *authmethods[] = {
|
|
|
|
&method_none,
|
|
|
|
&method_pubkey,
|
2003-08-26 03:49:55 +02:00
|
|
|
#ifdef GSSAPI
|
|
|
|
&method_gssapi,
|
|
|
|
#endif
|
2002-06-06 22:52:37 +02:00
|
|
|
&method_passwd,
|
|
|
|
&method_kbdint,
|
|
|
|
&method_hostbased,
|
|
|
|
NULL
|
2000-10-14 07:23:11 +02:00
|
|
|
};
|
|
|
|
|
2000-04-29 15:57:08 +02:00
|
|
|
/* protocol */
|
|
|
|
|
2017-05-30 16:23:52 +02:00
|
|
|
static int input_service_request(int, u_int32_t, struct ssh *);
|
|
|
|
static int input_userauth_request(int, u_int32_t, struct ssh *);
|
2000-04-29 15:57:08 +02:00
|
|
|
|
|
|
|
/* helper */
|
2012-11-04 13:21:40 +01:00
|
|
|
static Authmethod *authmethod_lookup(Authctxt *, const char *);
|
|
|
|
static char *authmethods_get(Authctxt *authctxt);
|
2013-04-23 07:18:10 +02:00
|
|
|
|
|
|
|
#define MATCH_NONE 0 /* method or submethod mismatch */
|
|
|
|
#define MATCH_METHOD 1 /* method matches (no submethod specified) */
|
|
|
|
#define MATCH_BOTH 2 /* method and submethod match */
|
|
|
|
#define MATCH_PARTIAL 3 /* method matches, submethod can't be checked */
|
|
|
|
static int list_starts_with(const char *, const char *, const char *);
|
2000-04-29 15:57:08 +02:00
|
|
|
|
2008-07-02 14:56:09 +02:00
|
|
|
char *
|
|
|
|
auth2_read_banner(void)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
char *banner = NULL;
|
|
|
|
size_t len, n;
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
if ((fd = open(options.banner, O_RDONLY)) == -1)
|
|
|
|
return (NULL);
|
|
|
|
if (fstat(fd, &st) == -1) {
|
|
|
|
close(fd);
|
|
|
|
return (NULL);
|
|
|
|
}
|
2011-12-19 00:52:50 +01:00
|
|
|
if (st.st_size <= 0 || st.st_size > 1*1024*1024) {
|
2008-07-02 14:56:09 +02:00
|
|
|
close(fd);
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
len = (size_t)st.st_size; /* truncate */
|
|
|
|
banner = xmalloc(len + 1);
|
|
|
|
n = atomicio(read, fd, banner, len);
|
|
|
|
close(fd);
|
|
|
|
|
|
|
|
if (n != len) {
|
2013-06-01 23:31:17 +02:00
|
|
|
free(banner);
|
2008-07-02 14:56:09 +02:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
banner[n] = '\0';
|
|
|
|
|
|
|
|
return (banner);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
userauth_send_banner(const char *msg)
|
|
|
|
{
|
|
|
|
packet_start(SSH2_MSG_USERAUTH_BANNER);
|
|
|
|
packet_put_cstring(msg);
|
|
|
|
packet_put_cstring(""); /* language, unused */
|
|
|
|
packet_send();
|
|
|
|
debug("%s: sent", __func__);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
userauth_banner(void)
|
|
|
|
{
|
|
|
|
char *banner = NULL;
|
|
|
|
|
2018-01-23 06:27:21 +01:00
|
|
|
if (options.banner == NULL)
|
2008-07-02 14:56:09 +02:00
|
|
|
return;
|
|
|
|
|
|
|
|
if ((banner = PRIVSEP(auth2_read_banner())) == NULL)
|
|
|
|
goto done;
|
|
|
|
userauth_send_banner(banner);
|
|
|
|
|
|
|
|
done:
|
2013-06-01 23:31:17 +02:00
|
|
|
free(banner);
|
2008-07-02 14:56:09 +02:00
|
|
|
}
|
|
|
|
|
2000-04-29 15:57:08 +02:00
|
|
|
/*
|
2000-10-14 07:23:11 +02:00
|
|
|
* loop until authctxt->success == TRUE
|
2000-04-29 15:57:08 +02:00
|
|
|
*/
|
2003-10-02 08:12:36 +02:00
|
|
|
void
|
|
|
|
do_authentication2(Authctxt *authctxt)
|
2000-04-29 15:57:08 +02:00
|
|
|
{
|
2017-05-30 16:18:15 +02:00
|
|
|
struct ssh *ssh = active_state; /* XXX */
|
|
|
|
ssh->authctxt = authctxt; /* XXX move to caller */
|
2017-05-30 16:29:59 +02:00
|
|
|
ssh_dispatch_init(ssh, &dispatch_protocol_error);
|
|
|
|
ssh_dispatch_set(ssh, SSH2_MSG_SERVICE_REQUEST, &input_service_request);
|
2017-05-31 09:00:13 +02:00
|
|
|
ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &authctxt->success);
|
2017-05-30 16:18:15 +02:00
|
|
|
ssh->authctxt = NULL;
|
2000-04-29 15:57:08 +02:00
|
|
|
}
|
|
|
|
|
2006-03-26 05:05:20 +02:00
|
|
|
/*ARGSUSED*/
|
2015-01-19 21:07:45 +01:00
|
|
|
static int
|
2017-05-30 16:23:52 +02:00
|
|
|
input_service_request(int type, u_int32_t seq, struct ssh *ssh)
|
2000-04-29 15:57:08 +02:00
|
|
|
{
|
2017-05-30 16:18:15 +02:00
|
|
|
Authctxt *authctxt = ssh->authctxt;
|
2000-12-22 02:43:59 +01:00
|
|
|
u_int len;
|
2002-07-04 02:12:53 +02:00
|
|
|
int acceptit = 0;
|
2010-08-31 14:36:39 +02:00
|
|
|
char *service = packet_get_cstring(&len);
|
2002-01-22 13:11:40 +01:00
|
|
|
packet_check_eom();
|
2000-04-29 15:57:08 +02:00
|
|
|
|
2000-10-14 07:23:11 +02:00
|
|
|
if (authctxt == NULL)
|
|
|
|
fatal("input_service_request: no authctxt");
|
|
|
|
|
2000-04-29 15:57:08 +02:00
|
|
|
if (strcmp(service, "ssh-userauth") == 0) {
|
2000-10-14 07:23:11 +02:00
|
|
|
if (!authctxt->success) {
|
2002-07-04 02:12:53 +02:00
|
|
|
acceptit = 1;
|
2000-04-29 15:57:08 +02:00
|
|
|
/* now we can handle user-auth requests */
|
2017-05-30 16:29:59 +02:00
|
|
|
ssh_dispatch_set(ssh, SSH2_MSG_USERAUTH_REQUEST, &input_userauth_request);
|
2000-04-29 15:57:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* XXX all other service requests are denied */
|
|
|
|
|
2002-07-04 02:12:53 +02:00
|
|
|
if (acceptit) {
|
2000-04-29 15:57:08 +02:00
|
|
|
packet_start(SSH2_MSG_SERVICE_ACCEPT);
|
|
|
|
packet_put_cstring(service);
|
|
|
|
packet_send();
|
|
|
|
packet_write_wait();
|
|
|
|
} else {
|
|
|
|
debug("bad service request %s", service);
|
|
|
|
packet_disconnect("bad service request %s", service);
|
|
|
|
}
|
2013-06-01 23:31:17 +02:00
|
|
|
free(service);
|
2015-01-19 21:07:45 +01:00
|
|
|
return 0;
|
2000-04-29 15:57:08 +02:00
|
|
|
}
|
|
|
|
|
2018-04-13 05:57:26 +02:00
|
|
|
#define MIN_FAIL_DELAY_SECONDS 0.005
|
|
|
|
static double
|
|
|
|
user_specific_delay(const char *user)
|
|
|
|
{
|
|
|
|
char b[512];
|
|
|
|
size_t len = ssh_digest_bytes(SSH_DIGEST_SHA512);
|
|
|
|
u_char *hash = xmalloc(len);
|
|
|
|
double delay;
|
|
|
|
|
2018-05-11 05:22:55 +02:00
|
|
|
(void)snprintf(b, sizeof b, "%llu%s",
|
|
|
|
(unsigned long long)options.timing_secret, user);
|
2018-04-13 05:57:26 +02:00
|
|
|
if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0)
|
|
|
|
fatal("%s: ssh_digest_memory", __func__);
|
|
|
|
/* 0-4.2 ms of delay */
|
|
|
|
delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000;
|
|
|
|
freezero(hash, len);
|
|
|
|
debug3("%s: user specific delay %0.3lfms", __func__, delay/1000);
|
|
|
|
return MIN_FAIL_DELAY_SECONDS + delay;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ensure_minimum_time_since(double start, double seconds)
|
|
|
|
{
|
|
|
|
struct timespec ts;
|
|
|
|
double elapsed = monotime_double() - start, req = seconds, remain;
|
|
|
|
|
|
|
|
/* if we've already passed the requested time, scale up */
|
|
|
|
while ((remain = seconds - elapsed) < 0.0)
|
|
|
|
seconds *= 2;
|
|
|
|
|
|
|
|
ts.tv_sec = remain;
|
|
|
|
ts.tv_nsec = (remain - ts.tv_sec) * 1000000000;
|
|
|
|
debug3("%s: elapsed %0.3lfms, delaying %0.3lfms (requested %0.3lfms)",
|
|
|
|
__func__, elapsed*1000, remain*1000, req*1000);
|
|
|
|
nanosleep(&ts, NULL);
|
|
|
|
}
|
|
|
|
|
2006-03-26 05:05:20 +02:00
|
|
|
/*ARGSUSED*/
|
2015-01-19 21:07:45 +01:00
|
|
|
static int
|
2017-05-30 16:23:52 +02:00
|
|
|
input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
|
2000-04-29 15:57:08 +02:00
|
|
|
{
|
2017-05-30 16:18:15 +02:00
|
|
|
Authctxt *authctxt = ssh->authctxt;
|
2000-10-14 07:23:11 +02:00
|
|
|
Authmethod *m = NULL;
|
2001-01-19 05:26:52 +01:00
|
|
|
char *user, *service, *method, *style = NULL;
|
2000-04-29 15:57:08 +02:00
|
|
|
int authenticated = 0;
|
2018-04-13 05:57:26 +02:00
|
|
|
double tstart = monotime_double();
|
2000-04-29 15:57:08 +02:00
|
|
|
|
2000-10-14 07:23:11 +02:00
|
|
|
if (authctxt == NULL)
|
|
|
|
fatal("input_userauth_request: no authctxt");
|
2000-04-29 15:57:08 +02:00
|
|
|
|
2010-08-31 14:36:39 +02:00
|
|
|
user = packet_get_cstring(NULL);
|
|
|
|
service = packet_get_cstring(NULL);
|
|
|
|
method = packet_get_cstring(NULL);
|
2000-10-14 07:23:11 +02:00
|
|
|
debug("userauth-request for user %s service %s method %s", user, service, method);
|
2000-12-28 17:40:05 +01:00
|
|
|
debug("attempt %d failures %d", authctxt->attempt, authctxt->failures);
|
2000-10-14 07:23:11 +02:00
|
|
|
|
2001-01-19 05:26:52 +01:00
|
|
|
if ((style = strchr(user, ':')) != NULL)
|
|
|
|
*style++ = 0;
|
|
|
|
|
2001-02-05 13:42:17 +01:00
|
|
|
if (authctxt->attempt++ == 0) {
|
2002-03-13 03:19:42 +01:00
|
|
|
/* setup auth context */
|
2002-03-22 21:43:05 +01:00
|
|
|
authctxt->pw = PRIVSEP(getpwnamallow(user));
|
2004-03-08 13:04:06 +01:00
|
|
|
authctxt->user = xstrdup(user);
|
2002-03-22 21:43:05 +01:00
|
|
|
if (authctxt->pw && strcmp(service, "ssh-connection")==0) {
|
2000-10-14 07:23:11 +02:00
|
|
|
authctxt->valid = 1;
|
2017-02-04 00:05:57 +01:00
|
|
|
debug2("%s: setting up authctxt for %s",
|
|
|
|
__func__, user);
|
2000-10-14 07:23:11 +02:00
|
|
|
} else {
|
2017-02-04 00:05:57 +01:00
|
|
|
/* Invalid user, fake password information */
|
2003-09-02 23:32:45 +02:00
|
|
|
authctxt->pw = fakepw();
|
2005-02-08 11:52:47 +01:00
|
|
|
#ifdef SSH_AUDIT_EVENTS
|
|
|
|
PRIVSEP(audit_event(SSH_INVALID_USER));
|
2001-01-19 05:46:38 +01:00
|
|
|
#endif
|
2000-10-14 07:23:11 +02:00
|
|
|
}
|
2005-09-24 04:43:51 +02:00
|
|
|
#ifdef USE_PAM
|
|
|
|
if (options.use_pam)
|
|
|
|
PRIVSEP(start_pam(authctxt));
|
|
|
|
#endif
|
2017-02-04 00:05:57 +01:00
|
|
|
ssh_packet_set_log_preamble(ssh, "%suser %s",
|
|
|
|
authctxt->valid ? "authenticating " : "invalid ", user);
|
2004-07-21 12:48:53 +02:00
|
|
|
setproctitle("%s%s", authctxt->valid ? user : "unknown",
|
2002-03-22 03:30:41 +01:00
|
|
|
use_privsep ? " [net]" : "");
|
2000-10-14 07:23:11 +02:00
|
|
|
authctxt->service = xstrdup(service);
|
2001-06-09 03:40:00 +02:00
|
|
|
authctxt->style = style ? xstrdup(style) : NULL;
|
2002-03-22 03:30:41 +01:00
|
|
|
if (use_privsep)
|
|
|
|
mm_inform_authserv(service, style);
|
2008-07-02 14:56:09 +02:00
|
|
|
userauth_banner();
|
2012-11-04 13:21:40 +01:00
|
|
|
if (auth2_setup_methods_lists(authctxt) != 0)
|
|
|
|
packet_disconnect("no authentication methods enabled");
|
2001-06-09 03:40:00 +02:00
|
|
|
} else if (strcmp(user, authctxt->user) != 0 ||
|
|
|
|
strcmp(service, authctxt->service) != 0) {
|
|
|
|
packet_disconnect("Change of username or service not allowed: "
|
|
|
|
"(%s,%s) -> (%s,%s)",
|
|
|
|
authctxt->user, authctxt->service, user, service);
|
2000-04-29 15:57:08 +02:00
|
|
|
}
|
2001-01-19 05:26:52 +01:00
|
|
|
/* reset state */
|
2017-05-30 16:29:59 +02:00
|
|
|
auth2_challenge_stop(ssh);
|
2003-08-26 03:49:55 +02:00
|
|
|
|
|
|
|
#ifdef GSSAPI
|
2008-11-05 06:20:46 +01:00
|
|
|
/* XXX move to auth2_gssapi_stop() */
|
2017-05-30 16:29:59 +02:00
|
|
|
ssh_dispatch_set(ssh, SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
|
|
|
|
ssh_dispatch_set(ssh, SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, NULL);
|
2003-08-26 03:49:55 +02:00
|
|
|
#endif
|
|
|
|
|
2017-06-24 08:34:38 +02:00
|
|
|
auth2_authctxt_reset_info(authctxt);
|
2001-01-19 05:26:52 +01:00
|
|
|
authctxt->postponed = 0;
|
2011-05-05 06:04:11 +02:00
|
|
|
authctxt->server_caused_failure = 0;
|
2000-09-16 07:25:12 +02:00
|
|
|
|
2001-01-19 05:26:52 +01:00
|
|
|
/* try to authenticate user */
|
2012-11-04 13:21:40 +01:00
|
|
|
m = authmethod_lookup(authctxt, method);
|
2008-07-02 14:56:09 +02:00
|
|
|
if (m != NULL && authctxt->failures < options.max_authtries) {
|
2000-10-14 07:23:11 +02:00
|
|
|
debug2("input_userauth_request: try method %s", method);
|
2017-05-30 16:29:59 +02:00
|
|
|
authenticated = m->userauth(ssh);
|
2000-09-16 07:25:12 +02:00
|
|
|
}
|
2018-04-13 05:57:26 +02:00
|
|
|
if (!authctxt->authenticated)
|
|
|
|
ensure_minimum_time_since(tstart,
|
|
|
|
user_specific_delay(authctxt->user));
|
2017-05-30 16:29:59 +02:00
|
|
|
userauth_finish(ssh, authenticated, method, NULL);
|
2001-03-30 02:48:31 +02:00
|
|
|
|
2013-06-01 23:31:17 +02:00
|
|
|
free(service);
|
|
|
|
free(user);
|
|
|
|
free(method);
|
2015-01-19 21:07:45 +01:00
|
|
|
return 0;
|
2001-03-30 02:48:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2017-05-30 16:29:59 +02:00
|
|
|
userauth_finish(struct ssh *ssh, int authenticated, const char *method,
|
2012-12-02 23:53:20 +01:00
|
|
|
const char *submethod)
|
2001-03-30 02:48:31 +02:00
|
|
|
{
|
2017-05-30 16:29:59 +02:00
|
|
|
Authctxt *authctxt = ssh->authctxt;
|
2001-06-09 02:23:17 +02:00
|
|
|
char *methods;
|
2012-11-04 13:21:40 +01:00
|
|
|
int partial = 0;
|
2001-06-09 02:23:17 +02:00
|
|
|
|
2001-01-19 05:26:52 +01:00
|
|
|
if (!authctxt->valid && authenticated)
|
|
|
|
fatal("INTERNAL ERROR: authenticated invalid user %s",
|
|
|
|
authctxt->user);
|
2012-12-02 23:53:20 +01:00
|
|
|
if (authenticated && authctxt->postponed)
|
|
|
|
fatal("INTERNAL ERROR: authenticated and postponed");
|
2000-09-16 07:25:12 +02:00
|
|
|
|
2000-10-14 07:23:11 +02:00
|
|
|
/* Special handling for root */
|
2003-02-24 01:59:26 +01:00
|
|
|
if (authenticated && authctxt->pw->pw_uid == 0 &&
|
2018-03-03 04:15:51 +01:00
|
|
|
!auth_root_allowed(ssh, method)) {
|
2000-04-29 15:57:08 +02:00
|
|
|
authenticated = 0;
|
2005-02-08 11:52:47 +01:00
|
|
|
#ifdef SSH_AUDIT_EVENTS
|
|
|
|
PRIVSEP(audit_event(SSH_LOGIN_ROOT_DENIED));
|
2005-02-02 14:20:53 +01:00
|
|
|
#endif
|
|
|
|
}
|
2000-04-29 15:57:08 +02:00
|
|
|
|
2012-12-02 23:53:20 +01:00
|
|
|
if (authenticated && options.num_auth_methods != 0) {
|
2013-04-23 07:18:10 +02:00
|
|
|
if (!auth2_update_methods_lists(authctxt, method, submethod)) {
|
2012-12-02 23:53:20 +01:00
|
|
|
authenticated = 0;
|
|
|
|
partial = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Log before sending the reply */
|
2013-06-01 23:41:51 +02:00
|
|
|
auth_log(authctxt, authenticated, partial, method, submethod);
|
2012-12-02 23:53:20 +01:00
|
|
|
|
2017-06-24 08:34:38 +02:00
|
|
|
/* Update information exposed to session */
|
|
|
|
if (authenticated || partial)
|
|
|
|
auth2_update_session_info(authctxt, method, submethod);
|
|
|
|
|
2012-12-02 23:53:20 +01:00
|
|
|
if (authctxt->postponed)
|
|
|
|
return;
|
|
|
|
|
2003-08-25 05:08:49 +02:00
|
|
|
#ifdef USE_PAM
|
2004-09-11 15:07:03 +02:00
|
|
|
if (options.use_pam && authenticated) {
|
2018-07-10 11:39:52 +02:00
|
|
|
int r;
|
|
|
|
|
2004-09-11 15:07:03 +02:00
|
|
|
if (!PRIVSEP(do_pam_account())) {
|
|
|
|
/* if PAM returned a message, send it to the user */
|
2018-07-10 11:39:52 +02:00
|
|
|
if (sshbuf_len(loginmsg) > 0) {
|
|
|
|
if ((r = sshbuf_put(loginmsg, "\0", 1)) != 0)
|
|
|
|
fatal("%s: buffer error: %s",
|
|
|
|
__func__, ssh_err(r));
|
|
|
|
userauth_send_banner(sshbuf_ptr(loginmsg));
|
2004-12-03 04:33:47 +01:00
|
|
|
packet_write_wait();
|
2004-09-11 15:07:03 +02:00
|
|
|
}
|
2004-12-03 04:33:47 +01:00
|
|
|
fatal("Access denied for user %s by PAM account "
|
2005-07-17 09:26:43 +02:00
|
|
|
"configuration", authctxt->user);
|
2004-09-11 15:07:03 +02:00
|
|
|
}
|
|
|
|
}
|
2003-08-25 05:08:49 +02:00
|
|
|
#endif
|
|
|
|
|
2001-06-09 02:23:17 +02:00
|
|
|
if (authenticated == 1) {
|
|
|
|
/* turn off userauth */
|
2017-05-30 16:29:59 +02:00
|
|
|
ssh_dispatch_set(ssh, SSH2_MSG_USERAUTH_REQUEST, &dispatch_protocol_ignore);
|
2001-06-09 02:23:17 +02:00
|
|
|
packet_start(SSH2_MSG_USERAUTH_SUCCESS);
|
|
|
|
packet_send();
|
|
|
|
packet_write_wait();
|
|
|
|
/* now we can break out */
|
|
|
|
authctxt->success = 1;
|
2017-02-04 00:05:57 +01:00
|
|
|
ssh_packet_set_log_preamble(ssh, "user %s", authctxt->user);
|
2001-06-09 02:23:17 +02:00
|
|
|
} else {
|
2008-07-05 01:44:53 +02:00
|
|
|
/* Allow initial try of "none" auth without failure penalty */
|
2014-12-19 00:58:04 +01:00
|
|
|
if (!partial && !authctxt->server_caused_failure &&
|
2011-05-05 06:04:11 +02:00
|
|
|
(authctxt->attempt > 1 || strcmp(method, "none") != 0))
|
2008-07-05 01:44:53 +02:00
|
|
|
authctxt->failures++;
|
|
|
|
if (authctxt->failures >= options.max_authtries) {
|
2005-02-08 11:52:47 +01:00
|
|
|
#ifdef SSH_AUDIT_EVENTS
|
|
|
|
PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES));
|
2005-02-02 14:20:53 +01:00
|
|
|
#endif
|
2014-07-03 13:29:38 +02:00
|
|
|
auth_maxtries_exceeded(authctxt);
|
2005-02-02 14:20:53 +01:00
|
|
|
}
|
2012-11-04 13:21:40 +01:00
|
|
|
methods = authmethods_get(authctxt);
|
|
|
|
debug3("%s: failure partial=%d next methods=\"%s\"", __func__,
|
|
|
|
partial, methods);
|
2001-06-09 02:23:17 +02:00
|
|
|
packet_start(SSH2_MSG_USERAUTH_FAILURE);
|
|
|
|
packet_put_cstring(methods);
|
2012-11-04 13:21:40 +01:00
|
|
|
packet_put_char(partial);
|
2001-06-09 02:23:17 +02:00
|
|
|
packet_send();
|
|
|
|
packet_write_wait();
|
2013-06-01 23:31:17 +02:00
|
|
|
free(methods);
|
2001-06-09 02:23:17 +02:00
|
|
|
}
|
2000-10-14 07:23:11 +02:00
|
|
|
}
|
|
|
|
|
2012-11-04 13:21:40 +01:00
|
|
|
/*
|
|
|
|
* Checks whether method is allowed by at least one AuthenticationMethods
|
|
|
|
* methods list. Returns 1 if allowed, or no methods lists configured.
|
|
|
|
* 0 otherwise.
|
|
|
|
*/
|
2013-04-23 07:18:10 +02:00
|
|
|
int
|
|
|
|
auth2_method_allowed(Authctxt *authctxt, const char *method,
|
|
|
|
const char *submethod)
|
2012-11-04 13:21:40 +01:00
|
|
|
{
|
|
|
|
u_int i;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NB. authctxt->num_auth_methods might be zero as a result of
|
|
|
|
* auth2_setup_methods_lists(), so check the configuration.
|
|
|
|
*/
|
|
|
|
if (options.num_auth_methods == 0)
|
|
|
|
return 1;
|
|
|
|
for (i = 0; i < authctxt->num_auth_methods; i++) {
|
2013-04-23 07:18:10 +02:00
|
|
|
if (list_starts_with(authctxt->auth_methods[i], method,
|
|
|
|
submethod) != MATCH_NONE)
|
2012-11-04 13:21:40 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-07-04 05:42:30 +02:00
|
|
|
static char *
|
2012-11-04 13:21:40 +01:00
|
|
|
authmethods_get(Authctxt *authctxt)
|
2000-04-29 15:57:08 +02:00
|
|
|
{
|
2018-07-09 23:35:50 +02:00
|
|
|
struct sshbuf *b;
|
2000-10-14 07:23:11 +02:00
|
|
|
char *list;
|
2018-07-09 23:35:50 +02:00
|
|
|
int i, r;
|
2000-10-14 07:23:11 +02:00
|
|
|
|
2018-07-09 23:35:50 +02:00
|
|
|
if ((b = sshbuf_new()) == NULL)
|
|
|
|
fatal("%s: sshbuf_new failed", __func__);
|
2002-06-06 22:52:37 +02:00
|
|
|
for (i = 0; authmethods[i] != NULL; i++) {
|
|
|
|
if (strcmp(authmethods[i]->name, "none") == 0)
|
2000-10-14 07:23:11 +02:00
|
|
|
continue;
|
2012-11-04 13:21:40 +01:00
|
|
|
if (authmethods[i]->enabled == NULL ||
|
|
|
|
*(authmethods[i]->enabled) == 0)
|
|
|
|
continue;
|
2013-04-23 07:18:10 +02:00
|
|
|
if (!auth2_method_allowed(authctxt, authmethods[i]->name,
|
|
|
|
NULL))
|
2012-11-04 13:21:40 +01:00
|
|
|
continue;
|
2018-07-09 23:35:50 +02:00
|
|
|
if ((r = sshbuf_putf(b, "%s%s", sshbuf_len(b) ? "," : "",
|
|
|
|
authmethods[i]->name)) != 0)
|
|
|
|
fatal("%s: buffer error: %s", __func__, ssh_err(r));
|
2000-04-29 15:57:08 +02:00
|
|
|
}
|
2018-07-09 23:35:50 +02:00
|
|
|
if ((list = sshbuf_dup_string(b)) == NULL)
|
2016-05-02 10:49:03 +02:00
|
|
|
fatal("%s: sshbuf_dup_string failed", __func__);
|
2018-07-09 23:35:50 +02:00
|
|
|
sshbuf_free(b);
|
2000-10-14 07:23:11 +02:00
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2001-06-25 07:01:22 +02:00
|
|
|
static Authmethod *
|
2012-11-04 13:21:40 +01:00
|
|
|
authmethod_lookup(Authctxt *authctxt, const char *name)
|
2000-10-14 07:23:11 +02:00
|
|
|
{
|
2002-06-06 22:52:37 +02:00
|
|
|
int i;
|
|
|
|
|
2000-10-14 07:23:11 +02:00
|
|
|
if (name != NULL)
|
2002-06-06 22:52:37 +02:00
|
|
|
for (i = 0; authmethods[i] != NULL; i++)
|
|
|
|
if (authmethods[i]->enabled != NULL &&
|
|
|
|
*(authmethods[i]->enabled) != 0 &&
|
2012-11-04 13:21:40 +01:00
|
|
|
strcmp(name, authmethods[i]->name) == 0 &&
|
2013-04-23 07:18:10 +02:00
|
|
|
auth2_method_allowed(authctxt,
|
|
|
|
authmethods[i]->name, NULL))
|
2002-06-06 22:52:37 +02:00
|
|
|
return authmethods[i];
|
|
|
|
debug2("Unrecognized authentication method name: %s",
|
|
|
|
name ? name : "NULL");
|
2000-10-14 07:23:11 +02:00
|
|
|
return NULL;
|
2000-04-29 15:57:08 +02:00
|
|
|
}
|
2008-07-02 14:56:09 +02:00
|
|
|
|
2012-11-04 13:21:40 +01:00
|
|
|
/*
|
|
|
|
* Check a comma-separated list of methods for validity. Is need_enable is
|
|
|
|
* non-zero, then also require that the methods are enabled.
|
|
|
|
* Returns 0 on success or -1 if the methods list is invalid.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
auth2_methods_valid(const char *_methods, int need_enable)
|
|
|
|
{
|
2013-04-23 07:18:10 +02:00
|
|
|
char *methods, *omethods, *method, *p;
|
2012-11-04 13:21:40 +01:00
|
|
|
u_int i, found;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (*_methods == '\0') {
|
|
|
|
error("empty authentication method list");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
omethods = methods = xstrdup(_methods);
|
|
|
|
while ((method = strsep(&methods, ",")) != NULL) {
|
|
|
|
for (found = i = 0; !found && authmethods[i] != NULL; i++) {
|
2013-04-23 07:18:10 +02:00
|
|
|
if ((p = strchr(method, ':')) != NULL)
|
|
|
|
*p = '\0';
|
2012-11-04 13:21:40 +01:00
|
|
|
if (strcmp(method, authmethods[i]->name) != 0)
|
|
|
|
continue;
|
|
|
|
if (need_enable) {
|
|
|
|
if (authmethods[i]->enabled == NULL ||
|
|
|
|
*(authmethods[i]->enabled) == 0) {
|
|
|
|
error("Disabled method \"%s\" in "
|
|
|
|
"AuthenticationMethods list \"%s\"",
|
|
|
|
method, _methods);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!found) {
|
|
|
|
error("Unknown authentication method \"%s\" in list",
|
|
|
|
method);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
out:
|
|
|
|
free(omethods);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Prune the AuthenticationMethods supplied in the configuration, removing
|
|
|
|
* any methods lists that include disabled methods. Note that this might
|
|
|
|
* leave authctxt->num_auth_methods == 0, even when multiple required auth
|
|
|
|
* has been requested. For this reason, all tests for whether multiple is
|
|
|
|
* enabled should consult options.num_auth_methods directly.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
auth2_setup_methods_lists(Authctxt *authctxt)
|
|
|
|
{
|
|
|
|
u_int i;
|
|
|
|
|
|
|
|
if (options.num_auth_methods == 0)
|
|
|
|
return 0;
|
|
|
|
debug3("%s: checking methods", __func__);
|
|
|
|
authctxt->auth_methods = xcalloc(options.num_auth_methods,
|
|
|
|
sizeof(*authctxt->auth_methods));
|
|
|
|
authctxt->num_auth_methods = 0;
|
|
|
|
for (i = 0; i < options.num_auth_methods; i++) {
|
|
|
|
if (auth2_methods_valid(options.auth_methods[i], 1) != 0) {
|
|
|
|
logit("Authentication methods list \"%s\" contains "
|
|
|
|
"disabled method, skipping",
|
|
|
|
options.auth_methods[i]);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
debug("authentication methods list %d: %s",
|
|
|
|
authctxt->num_auth_methods, options.auth_methods[i]);
|
|
|
|
authctxt->auth_methods[authctxt->num_auth_methods++] =
|
|
|
|
xstrdup(options.auth_methods[i]);
|
|
|
|
}
|
|
|
|
if (authctxt->num_auth_methods == 0) {
|
|
|
|
error("No AuthenticationMethods left after eliminating "
|
|
|
|
"disabled methods");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-04-23 07:18:10 +02:00
|
|
|
list_starts_with(const char *methods, const char *method,
|
|
|
|
const char *submethod)
|
2012-11-04 13:21:40 +01:00
|
|
|
{
|
|
|
|
size_t l = strlen(method);
|
2013-04-23 07:18:10 +02:00
|
|
|
int match;
|
|
|
|
const char *p;
|
2012-11-04 13:21:40 +01:00
|
|
|
|
|
|
|
if (strncmp(methods, method, l) != 0)
|
2013-04-23 07:18:10 +02:00
|
|
|
return MATCH_NONE;
|
|
|
|
p = methods + l;
|
|
|
|
match = MATCH_METHOD;
|
|
|
|
if (*p == ':') {
|
|
|
|
if (!submethod)
|
|
|
|
return MATCH_PARTIAL;
|
|
|
|
l = strlen(submethod);
|
|
|
|
p += 1;
|
|
|
|
if (strncmp(submethod, p, l))
|
|
|
|
return MATCH_NONE;
|
|
|
|
p += l;
|
|
|
|
match = MATCH_BOTH;
|
|
|
|
}
|
|
|
|
if (*p != ',' && *p != '\0')
|
|
|
|
return MATCH_NONE;
|
|
|
|
return match;
|
2012-11-04 13:21:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove method from the start of a comma-separated list of methods.
|
|
|
|
* Returns 0 if the list of methods did not start with that method or 1
|
|
|
|
* if it did.
|
|
|
|
*/
|
|
|
|
static int
|
2013-04-23 07:18:10 +02:00
|
|
|
remove_method(char **methods, const char *method, const char *submethod)
|
2012-11-04 13:21:40 +01:00
|
|
|
{
|
2013-04-23 07:18:10 +02:00
|
|
|
char *omethods = *methods, *p;
|
2012-11-04 13:21:40 +01:00
|
|
|
size_t l = strlen(method);
|
2013-04-23 07:18:10 +02:00
|
|
|
int match;
|
2012-11-04 13:21:40 +01:00
|
|
|
|
2013-04-23 07:18:10 +02:00
|
|
|
match = list_starts_with(omethods, method, submethod);
|
|
|
|
if (match != MATCH_METHOD && match != MATCH_BOTH)
|
2012-11-04 13:21:40 +01:00
|
|
|
return 0;
|
2013-04-23 07:18:10 +02:00
|
|
|
p = omethods + l;
|
|
|
|
if (submethod && match == MATCH_BOTH)
|
|
|
|
p += 1 + strlen(submethod); /* include colon */
|
|
|
|
if (*p == ',')
|
|
|
|
p++;
|
|
|
|
*methods = xstrdup(p);
|
2012-11-04 13:21:40 +01:00
|
|
|
free(omethods);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Called after successful authentication. Will remove the successful method
|
|
|
|
* from the start of each list in which it occurs. If it was the last method
|
|
|
|
* in any list, then authentication is deemed successful.
|
|
|
|
* Returns 1 if the method completed any authentication list or 0 otherwise.
|
|
|
|
*/
|
|
|
|
int
|
2013-04-23 07:18:10 +02:00
|
|
|
auth2_update_methods_lists(Authctxt *authctxt, const char *method,
|
|
|
|
const char *submethod)
|
2012-11-04 13:21:40 +01:00
|
|
|
{
|
|
|
|
u_int i, found = 0;
|
|
|
|
|
|
|
|
debug3("%s: updating methods list after \"%s\"", __func__, method);
|
|
|
|
for (i = 0; i < authctxt->num_auth_methods; i++) {
|
2013-04-23 07:18:10 +02:00
|
|
|
if (!remove_method(&(authctxt->auth_methods[i]), method,
|
|
|
|
submethod))
|
2012-11-04 13:21:40 +01:00
|
|
|
continue;
|
|
|
|
found = 1;
|
|
|
|
if (*authctxt->auth_methods[i] == '\0') {
|
|
|
|
debug2("authentication methods list %d complete", i);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
debug3("authentication methods list %d remaining: \"%s\"",
|
|
|
|
i, authctxt->auth_methods[i]);
|
|
|
|
}
|
|
|
|
/* This should not happen, but would be bad if it did */
|
|
|
|
if (!found)
|
|
|
|
fatal("%s: method not in AuthenticationMethods", __func__);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-06-24 08:34:38 +02:00
|
|
|
/* Reset method-specific information */
|
|
|
|
void auth2_authctxt_reset_info(Authctxt *authctxt)
|
|
|
|
{
|
|
|
|
sshkey_free(authctxt->auth_method_key);
|
|
|
|
free(authctxt->auth_method_info);
|
|
|
|
authctxt->auth_method_key = NULL;
|
|
|
|
authctxt->auth_method_info = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Record auth method-specific information for logs */
|
|
|
|
void
|
|
|
|
auth2_record_info(Authctxt *authctxt, const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
free(authctxt->auth_method_info);
|
|
|
|
authctxt->auth_method_info = NULL;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
i = vasprintf(&authctxt->auth_method_info, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
if (i < 0 || authctxt->auth_method_info == NULL)
|
|
|
|
fatal("%s: vasprintf failed", __func__);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Records a public key used in authentication. This is used for logging
|
|
|
|
* and to ensure that the same key is not subsequently accepted again for
|
|
|
|
* multiple authentication.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
auth2_record_key(Authctxt *authctxt, int authenticated,
|
|
|
|
const struct sshkey *key)
|
|
|
|
{
|
|
|
|
struct sshkey **tmp, *dup;
|
|
|
|
int r;
|
|
|
|
|
2018-09-13 04:08:33 +02:00
|
|
|
if ((r = sshkey_from_private(key, &dup)) != 0)
|
2017-06-24 08:34:38 +02:00
|
|
|
fatal("%s: copy key: %s", __func__, ssh_err(r));
|
|
|
|
sshkey_free(authctxt->auth_method_key);
|
|
|
|
authctxt->auth_method_key = dup;
|
|
|
|
|
|
|
|
if (!authenticated)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* If authenticated, make sure we don't accept this key again */
|
2018-09-13 04:08:33 +02:00
|
|
|
if ((r = sshkey_from_private(key, &dup)) != 0)
|
2017-06-24 08:34:38 +02:00
|
|
|
fatal("%s: copy key: %s", __func__, ssh_err(r));
|
|
|
|
if (authctxt->nprev_keys >= INT_MAX ||
|
|
|
|
(tmp = recallocarray(authctxt->prev_keys, authctxt->nprev_keys,
|
|
|
|
authctxt->nprev_keys + 1, sizeof(*authctxt->prev_keys))) == NULL)
|
|
|
|
fatal("%s: reallocarray failed", __func__);
|
|
|
|
authctxt->prev_keys = tmp;
|
|
|
|
authctxt->prev_keys[authctxt->nprev_keys] = dup;
|
|
|
|
authctxt->nprev_keys++;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Checks whether a key has already been previously used for authentication */
|
|
|
|
int
|
|
|
|
auth2_key_already_used(Authctxt *authctxt, const struct sshkey *key)
|
|
|
|
{
|
|
|
|
u_int i;
|
|
|
|
char *fp;
|
|
|
|
|
|
|
|
for (i = 0; i < authctxt->nprev_keys; i++) {
|
|
|
|
if (sshkey_equal_public(key, authctxt->prev_keys[i])) {
|
|
|
|
fp = sshkey_fingerprint(authctxt->prev_keys[i],
|
|
|
|
options.fingerprint_hash, SSH_FP_DEFAULT);
|
|
|
|
debug3("%s: key already used: %s %s", __func__,
|
|
|
|
sshkey_type(authctxt->prev_keys[i]),
|
|
|
|
fp == NULL ? "UNKNOWN" : fp);
|
|
|
|
free(fp);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Updates authctxt->session_info with details of authentication. Should be
|
|
|
|
* whenever an authentication method succeeds.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
auth2_update_session_info(Authctxt *authctxt, const char *method,
|
|
|
|
const char *submethod)
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
|
|
|
|
if (authctxt->session_info == NULL) {
|
|
|
|
if ((authctxt->session_info = sshbuf_new()) == NULL)
|
|
|
|
fatal("%s: sshbuf_new", __func__);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Append method[/submethod] */
|
|
|
|
if ((r = sshbuf_putf(authctxt->session_info, "%s%s%s",
|
|
|
|
method, submethod == NULL ? "" : "/",
|
|
|
|
submethod == NULL ? "" : submethod)) != 0)
|
|
|
|
fatal("%s: append method: %s", __func__, ssh_err(r));
|
|
|
|
|
|
|
|
/* Append key if present */
|
|
|
|
if (authctxt->auth_method_key != NULL) {
|
|
|
|
if ((r = sshbuf_put_u8(authctxt->session_info, ' ')) != 0 ||
|
|
|
|
(r = sshkey_format_text(authctxt->auth_method_key,
|
|
|
|
authctxt->session_info)) != 0)
|
|
|
|
fatal("%s: append key: %s", __func__, ssh_err(r));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (authctxt->auth_method_info != NULL) {
|
|
|
|
/* Ensure no ambiguity here */
|
|
|
|
if (strchr(authctxt->auth_method_info, '\n') != NULL)
|
|
|
|
fatal("%s: auth_method_info contains \\n", __func__);
|
|
|
|
if ((r = sshbuf_put_u8(authctxt->session_info, ' ')) != 0 ||
|
|
|
|
(r = sshbuf_putf(authctxt->session_info, "%s",
|
|
|
|
authctxt->auth_method_info)) != 0) {
|
|
|
|
fatal("%s: append method info: %s",
|
|
|
|
__func__, ssh_err(r));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ((r = sshbuf_put_u8(authctxt->session_info, '\n')) != 0)
|
|
|
|
fatal("%s: append: %s", __func__, ssh_err(r));
|
|
|
|
}
|
2012-11-04 13:21:40 +01:00
|
|
|
|