2008-07-23 09:33:08 +00:00
|
|
|
/* $OpenBSD: ssh-agent.c,v 1.159 2008/06/28 14:05:15 djm Exp $ */
|
2000-02-24 14:29:47 +00:00
|
|
|
/*
|
|
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
|
|
* All rights reserved
|
|
|
|
* The authentication agent program.
|
2000-09-10 09:35:38 +00:00
|
|
|
*
|
|
|
|
* As far as I am concerned, the code I have written for this software
|
|
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
|
|
* software must be clearly marked as such, and if the derived work is
|
|
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
|
|
* called by a name other than "ssh" or "Secure Shell".
|
|
|
|
*
|
2002-03-18 10:09:43 +00:00
|
|
|
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
|
2000-09-10 09:35:38 +00:00
|
|
|
*
|
|
|
|
* 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-02-24 14:29:47 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "includes.h"
|
2006-09-30 13:38:06 +00:00
|
|
|
__RCSID("$FreeBSD$");
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/resource.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#ifdef HAVE_SYS_TIME_H
|
|
|
|
# include <sys/time.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_UN_H
|
|
|
|
# include <sys/un.h>
|
|
|
|
#endif
|
2002-10-29 10:16:02 +00:00
|
|
|
#include "openbsd-compat/sys-queue.h"
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2001-05-04 04:14:23 +00:00
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/md5.h>
|
2008-07-23 09:28:49 +00:00
|
|
|
#include "openbsd-compat/openssl-compat.h"
|
2001-05-04 04:14:23 +00:00
|
|
|
|
2006-09-30 13:38:06 +00:00
|
|
|
#include <errno.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#ifdef HAVE_PATHS_H
|
|
|
|
# include <paths.h>
|
|
|
|
#endif
|
|
|
|
#include <signal.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
#include "xmalloc.h"
|
2000-02-24 14:29:47 +00:00
|
|
|
#include "ssh.h"
|
|
|
|
#include "rsa.h"
|
|
|
|
#include "buffer.h"
|
2000-09-10 09:35:38 +00:00
|
|
|
#include "key.h"
|
|
|
|
#include "authfd.h"
|
2000-12-05 02:55:12 +00:00
|
|
|
#include "compat.h"
|
2001-05-04 04:14:23 +00:00
|
|
|
#include "log.h"
|
2003-04-23 17:13:13 +00:00
|
|
|
#include "misc.h"
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
#ifdef SMARTCARD
|
|
|
|
#include "scard.h"
|
|
|
|
#endif
|
|
|
|
|
2004-04-20 09:46:41 +00:00
|
|
|
#if defined(HAVE_SYS_PRCTL_H)
|
|
|
|
#include <sys/prctl.h> /* For prctl() and PR_SET_DUMPABLE */
|
|
|
|
#endif
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
typedef enum {
|
|
|
|
AUTH_UNUSED,
|
|
|
|
AUTH_SOCKET,
|
|
|
|
AUTH_CONNECTION
|
|
|
|
} sock_type;
|
|
|
|
|
2000-02-24 14:29:47 +00:00
|
|
|
typedef struct {
|
|
|
|
int fd;
|
2002-03-18 10:09:43 +00:00
|
|
|
sock_type type;
|
2000-02-24 14:29:47 +00:00
|
|
|
Buffer input;
|
|
|
|
Buffer output;
|
2002-06-23 16:09:08 +00:00
|
|
|
Buffer request;
|
2000-02-24 14:29:47 +00:00
|
|
|
} SocketEntry;
|
|
|
|
|
2001-05-04 04:14:23 +00:00
|
|
|
u_int sockets_alloc = 0;
|
2000-02-24 14:29:47 +00:00
|
|
|
SocketEntry *sockets = NULL;
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
typedef struct identity {
|
|
|
|
TAILQ_ENTRY(identity) next;
|
2000-09-10 09:35:38 +00:00
|
|
|
Key *key;
|
2000-02-24 14:29:47 +00:00
|
|
|
char *comment;
|
2002-06-23 16:09:08 +00:00
|
|
|
u_int death;
|
2003-04-23 17:13:13 +00:00
|
|
|
u_int confirm;
|
2000-02-24 14:29:47 +00:00
|
|
|
} Identity;
|
|
|
|
|
2000-09-10 09:35:38 +00:00
|
|
|
typedef struct {
|
|
|
|
int nentries;
|
2002-03-18 10:09:43 +00:00
|
|
|
TAILQ_HEAD(idqueue, identity) idlist;
|
2000-09-10 09:35:38 +00:00
|
|
|
} Idtab;
|
|
|
|
|
|
|
|
/* private key table, one per protocol version */
|
|
|
|
Idtab idtable[3];
|
2000-02-24 14:29:47 +00:00
|
|
|
|
|
|
|
int max_fd = 0;
|
|
|
|
|
|
|
|
/* pid of shell == parent of agent */
|
2000-05-15 05:24:25 +00:00
|
|
|
pid_t parent_pid = -1;
|
2008-07-23 09:23:42 +00:00
|
|
|
u_int parent_alive_interval = 0;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
|
|
|
/* pathname and directory for AUTH_SOCKET */
|
2006-09-30 13:38:06 +00:00
|
|
|
char socket_name[MAXPATHLEN];
|
|
|
|
char socket_dir[MAXPATHLEN];
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
/* locking */
|
|
|
|
int locked = 0;
|
|
|
|
char *lock_passwd = NULL;
|
|
|
|
|
2000-02-24 14:29:47 +00:00
|
|
|
extern char *__progname;
|
|
|
|
|
2003-04-23 17:13:13 +00:00
|
|
|
/* Default lifetime (0 == forever) */
|
|
|
|
static int lifetime = 0;
|
|
|
|
|
2002-10-29 10:16:02 +00:00
|
|
|
static void
|
|
|
|
close_socket(SocketEntry *e)
|
|
|
|
{
|
|
|
|
close(e->fd);
|
|
|
|
e->fd = -1;
|
|
|
|
e->type = AUTH_UNUSED;
|
|
|
|
buffer_free(&e->input);
|
|
|
|
buffer_free(&e->output);
|
|
|
|
buffer_free(&e->request);
|
|
|
|
}
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2000-09-10 09:35:38 +00:00
|
|
|
idtab_init(void)
|
|
|
|
{
|
|
|
|
int i;
|
2002-06-29 11:48:59 +00:00
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
for (i = 0; i <=2; i++) {
|
|
|
|
TAILQ_INIT(&idtable[i].idlist);
|
2000-09-10 09:35:38 +00:00
|
|
|
idtable[i].nentries = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* return private key table for requested protocol version */
|
2002-03-18 10:09:43 +00:00
|
|
|
static Idtab *
|
2000-09-10 09:35:38 +00:00
|
|
|
idtab_lookup(int version)
|
|
|
|
{
|
|
|
|
if (version < 1 || version > 2)
|
|
|
|
fatal("internal error, bad protocol version %d", version);
|
|
|
|
return &idtable[version];
|
|
|
|
}
|
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
static void
|
|
|
|
free_identity(Identity *id)
|
|
|
|
{
|
|
|
|
key_free(id->key);
|
|
|
|
xfree(id->comment);
|
|
|
|
xfree(id);
|
|
|
|
}
|
|
|
|
|
2000-09-10 09:35:38 +00:00
|
|
|
/* return matching private key for given public key */
|
2002-03-18 10:09:43 +00:00
|
|
|
static Identity *
|
|
|
|
lookup_identity(Key *key, int version)
|
2000-09-10 09:35:38 +00:00
|
|
|
{
|
2002-03-18 10:09:43 +00:00
|
|
|
Identity *id;
|
|
|
|
|
2000-09-10 09:35:38 +00:00
|
|
|
Idtab *tab = idtab_lookup(version);
|
2002-03-18 10:09:43 +00:00
|
|
|
TAILQ_FOREACH(id, &tab->idlist, next) {
|
|
|
|
if (key_equal(key, id->key))
|
|
|
|
return (id);
|
2000-09-10 09:35:38 +00:00
|
|
|
}
|
2002-03-18 10:09:43 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
2003-04-23 17:13:13 +00:00
|
|
|
/* Check confirmation of keysign request */
|
|
|
|
static int
|
|
|
|
confirm_key(Identity *id)
|
|
|
|
{
|
2005-06-05 15:46:09 +00:00
|
|
|
char *p;
|
2003-04-23 17:13:13 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
p = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX);
|
2005-06-05 15:46:09 +00:00
|
|
|
if (ask_permission("Allow use of key %s?\nKey fingerprint %s.",
|
|
|
|
id->comment, p))
|
|
|
|
ret = 0;
|
2003-04-23 17:13:13 +00:00
|
|
|
xfree(p);
|
2005-06-05 15:46:09 +00:00
|
|
|
|
2003-04-23 17:13:13 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
2000-09-10 09:35:38 +00:00
|
|
|
/* send list of supported public keys to 'client' */
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2000-09-10 09:35:38 +00:00
|
|
|
process_request_identities(SocketEntry *e, int version)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2000-09-10 09:35:38 +00:00
|
|
|
Idtab *tab = idtab_lookup(version);
|
2002-03-18 10:09:43 +00:00
|
|
|
Identity *id;
|
2002-06-29 11:48:59 +00:00
|
|
|
Buffer msg;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
|
|
|
buffer_init(&msg);
|
2000-09-10 09:35:38 +00:00
|
|
|
buffer_put_char(&msg, (version == 1) ?
|
|
|
|
SSH_AGENT_RSA_IDENTITIES_ANSWER : SSH2_AGENT_IDENTITIES_ANSWER);
|
|
|
|
buffer_put_int(&msg, tab->nentries);
|
2002-03-18 10:09:43 +00:00
|
|
|
TAILQ_FOREACH(id, &tab->idlist, next) {
|
2001-05-04 04:14:23 +00:00
|
|
|
if (id->key->type == KEY_RSA1) {
|
2000-09-10 09:35:38 +00:00
|
|
|
buffer_put_int(&msg, BN_num_bits(id->key->rsa->n));
|
|
|
|
buffer_put_bignum(&msg, id->key->rsa->e);
|
|
|
|
buffer_put_bignum(&msg, id->key->rsa->n);
|
|
|
|
} else {
|
2001-05-04 04:14:23 +00:00
|
|
|
u_char *blob;
|
|
|
|
u_int blen;
|
|
|
|
key_to_blob(id->key, &blob, &blen);
|
2000-09-10 09:35:38 +00:00
|
|
|
buffer_put_string(&msg, blob, blen);
|
|
|
|
xfree(blob);
|
|
|
|
}
|
|
|
|
buffer_put_cstring(&msg, id->comment);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
buffer_put_int(&e->output, buffer_len(&msg));
|
|
|
|
buffer_append(&e->output, buffer_ptr(&msg), buffer_len(&msg));
|
|
|
|
buffer_free(&msg);
|
|
|
|
}
|
|
|
|
|
2000-09-10 09:35:38 +00:00
|
|
|
/* ssh1 only */
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2000-09-10 09:35:38 +00:00
|
|
|
process_authentication_challenge1(SocketEntry *e)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2002-06-29 11:48:59 +00:00
|
|
|
u_char buf[32], mdbuf[16], session_id[16];
|
|
|
|
u_int response_type;
|
2000-09-10 09:35:38 +00:00
|
|
|
BIGNUM *challenge;
|
2002-06-29 11:48:59 +00:00
|
|
|
Identity *id;
|
2000-09-10 09:35:38 +00:00
|
|
|
int i, len;
|
2000-02-24 14:29:47 +00:00
|
|
|
Buffer msg;
|
|
|
|
MD5_CTX md;
|
2002-06-29 11:48:59 +00:00
|
|
|
Key *key;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
|
|
|
buffer_init(&msg);
|
2001-05-04 04:14:23 +00:00
|
|
|
key = key_new(KEY_RSA1);
|
2002-03-18 10:09:43 +00:00
|
|
|
if ((challenge = BN_new()) == NULL)
|
|
|
|
fatal("process_authentication_challenge1: BN_new failed");
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2002-06-29 11:48:59 +00:00
|
|
|
(void) buffer_get_int(&e->request); /* ignored */
|
2002-06-23 16:09:08 +00:00
|
|
|
buffer_get_bignum(&e->request, key->rsa->e);
|
|
|
|
buffer_get_bignum(&e->request, key->rsa->n);
|
|
|
|
buffer_get_bignum(&e->request, challenge);
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2000-09-10 09:35:38 +00:00
|
|
|
/* Only protocol 1.1 is supported */
|
2002-06-23 16:09:08 +00:00
|
|
|
if (buffer_len(&e->request) == 0)
|
2000-09-10 09:35:38 +00:00
|
|
|
goto failure;
|
2002-06-23 16:09:08 +00:00
|
|
|
buffer_get(&e->request, session_id, 16);
|
|
|
|
response_type = buffer_get_int(&e->request);
|
2000-09-10 09:35:38 +00:00
|
|
|
if (response_type != 1)
|
|
|
|
goto failure;
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
id = lookup_identity(key, 1);
|
2003-04-23 17:13:13 +00:00
|
|
|
if (id != NULL && (!id->confirm || confirm_key(id) == 0)) {
|
2002-03-18 10:09:43 +00:00
|
|
|
Key *private = id->key;
|
2000-09-10 09:35:38 +00:00
|
|
|
/* Decrypt the challenge using the private key. */
|
2001-02-12 06:44:51 +00:00
|
|
|
if (rsa_private_decrypt(challenge, challenge, private->rsa) <= 0)
|
|
|
|
goto failure;
|
2000-09-10 09:35:38 +00:00
|
|
|
|
|
|
|
/* The response is MD5 of decrypted challenge plus session id. */
|
|
|
|
len = BN_num_bytes(challenge);
|
|
|
|
if (len <= 0 || len > 32) {
|
2004-01-07 11:16:27 +00:00
|
|
|
logit("process_authentication_challenge: bad challenge length %d", len);
|
2000-09-10 09:35:38 +00:00
|
|
|
goto failure;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
2000-09-10 09:35:38 +00:00
|
|
|
memset(buf, 0, 32);
|
|
|
|
BN_bn2bin(challenge, buf + 32 - len);
|
|
|
|
MD5_Init(&md);
|
|
|
|
MD5_Update(&md, buf, 32);
|
|
|
|
MD5_Update(&md, session_id, 16);
|
|
|
|
MD5_Final(mdbuf, &md);
|
|
|
|
|
|
|
|
/* Send the response. */
|
|
|
|
buffer_put_char(&msg, SSH_AGENT_RSA_RESPONSE);
|
|
|
|
for (i = 0; i < 16; i++)
|
|
|
|
buffer_put_char(&msg, mdbuf[i]);
|
|
|
|
goto send;
|
|
|
|
}
|
|
|
|
|
|
|
|
failure:
|
|
|
|
/* Unknown identity or protocol error. Send failure. */
|
2000-02-24 14:29:47 +00:00
|
|
|
buffer_put_char(&msg, SSH_AGENT_FAILURE);
|
|
|
|
send:
|
2000-09-10 09:35:38 +00:00
|
|
|
buffer_put_int(&e->output, buffer_len(&msg));
|
|
|
|
buffer_append(&e->output, buffer_ptr(&msg), buffer_len(&msg));
|
|
|
|
key_free(key);
|
|
|
|
BN_clear_free(challenge);
|
|
|
|
buffer_free(&msg);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ssh2 only */
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2000-09-10 09:35:38 +00:00
|
|
|
process_sign_request2(SocketEntry *e)
|
|
|
|
{
|
2001-05-04 04:14:23 +00:00
|
|
|
u_char *blob, *data, *signature = NULL;
|
|
|
|
u_int blen, dlen, slen = 0;
|
2002-06-29 11:48:59 +00:00
|
|
|
extern int datafellows;
|
2008-07-23 09:33:08 +00:00
|
|
|
int odatafellows;
|
2002-06-29 11:48:59 +00:00
|
|
|
int ok = -1, flags;
|
2000-09-10 09:35:38 +00:00
|
|
|
Buffer msg;
|
2002-06-29 11:48:59 +00:00
|
|
|
Key *key;
|
2000-09-10 09:35:38 +00:00
|
|
|
|
|
|
|
datafellows = 0;
|
2001-05-04 04:14:23 +00:00
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
blob = buffer_get_string(&e->request, &blen);
|
|
|
|
data = buffer_get_string(&e->request, &dlen);
|
2000-12-05 02:55:12 +00:00
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
flags = buffer_get_int(&e->request);
|
2008-07-23 09:33:08 +00:00
|
|
|
odatafellows = datafellows;
|
2000-12-05 02:55:12 +00:00
|
|
|
if (flags & SSH_AGENT_OLD_SIGNATURE)
|
|
|
|
datafellows = SSH_BUG_SIGBLOB;
|
2000-09-10 09:35:38 +00:00
|
|
|
|
2001-05-04 04:14:23 +00:00
|
|
|
key = key_from_blob(blob, blen);
|
2000-09-10 09:35:38 +00:00
|
|
|
if (key != NULL) {
|
2002-03-18 10:09:43 +00:00
|
|
|
Identity *id = lookup_identity(key, 2);
|
2003-04-23 17:13:13 +00:00
|
|
|
if (id != NULL && (!id->confirm || confirm_key(id) == 0))
|
2002-03-18 10:09:43 +00:00
|
|
|
ok = key_sign(id->key, &signature, &slen, data, dlen);
|
2006-09-30 13:38:06 +00:00
|
|
|
key_free(key);
|
2000-09-10 09:35:38 +00:00
|
|
|
}
|
|
|
|
buffer_init(&msg);
|
|
|
|
if (ok == 0) {
|
|
|
|
buffer_put_char(&msg, SSH2_AGENT_SIGN_RESPONSE);
|
|
|
|
buffer_put_string(&msg, signature, slen);
|
|
|
|
} else {
|
|
|
|
buffer_put_char(&msg, SSH_AGENT_FAILURE);
|
|
|
|
}
|
2000-02-24 14:29:47 +00:00
|
|
|
buffer_put_int(&e->output, buffer_len(&msg));
|
|
|
|
buffer_append(&e->output, buffer_ptr(&msg),
|
2000-09-10 09:35:38 +00:00
|
|
|
buffer_len(&msg));
|
2000-02-24 14:29:47 +00:00
|
|
|
buffer_free(&msg);
|
2000-09-10 09:35:38 +00:00
|
|
|
xfree(data);
|
|
|
|
xfree(blob);
|
|
|
|
if (signature != NULL)
|
|
|
|
xfree(signature);
|
2008-07-23 09:33:08 +00:00
|
|
|
datafellows = odatafellows;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2000-09-10 09:35:38 +00:00
|
|
|
/* shared */
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2000-09-10 09:35:38 +00:00
|
|
|
process_remove_identity(SocketEntry *e, int version)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2002-06-29 11:48:59 +00:00
|
|
|
u_int blen, bits;
|
|
|
|
int success = 0;
|
2002-03-18 10:09:43 +00:00
|
|
|
Key *key = NULL;
|
2001-05-04 04:14:23 +00:00
|
|
|
u_char *blob;
|
2000-09-10 09:35:38 +00:00
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
switch (version) {
|
2000-09-10 09:35:38 +00:00
|
|
|
case 1:
|
2001-05-04 04:14:23 +00:00
|
|
|
key = key_new(KEY_RSA1);
|
2002-06-23 16:09:08 +00:00
|
|
|
bits = buffer_get_int(&e->request);
|
|
|
|
buffer_get_bignum(&e->request, key->rsa->e);
|
|
|
|
buffer_get_bignum(&e->request, key->rsa->n);
|
2000-09-10 09:35:38 +00:00
|
|
|
|
|
|
|
if (bits != key_size(key))
|
2004-01-07 11:16:27 +00:00
|
|
|
logit("Warning: identity keysize mismatch: actual %u, announced %u",
|
2001-05-04 04:14:23 +00:00
|
|
|
key_size(key), bits);
|
2000-09-10 09:35:38 +00:00
|
|
|
break;
|
|
|
|
case 2:
|
2002-06-23 16:09:08 +00:00
|
|
|
blob = buffer_get_string(&e->request, &blen);
|
2001-05-04 04:14:23 +00:00
|
|
|
key = key_from_blob(blob, blen);
|
2000-09-10 09:35:38 +00:00
|
|
|
xfree(blob);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (key != NULL) {
|
2002-03-18 10:09:43 +00:00
|
|
|
Identity *id = lookup_identity(key, version);
|
|
|
|
if (id != NULL) {
|
2000-02-24 14:29:47 +00:00
|
|
|
/*
|
|
|
|
* We have this key. Free the old key. Since we
|
2006-03-22 20:41:37 +00:00
|
|
|
* don't want to leave empty slots in the middle of
|
2001-05-04 04:14:23 +00:00
|
|
|
* the array, we actually free the key there and move
|
|
|
|
* all the entries between the empty slot and the end
|
|
|
|
* of the array.
|
2000-02-24 14:29:47 +00:00
|
|
|
*/
|
2000-09-10 09:35:38 +00:00
|
|
|
Idtab *tab = idtab_lookup(version);
|
2001-05-04 04:14:23 +00:00
|
|
|
if (tab->nentries < 1)
|
|
|
|
fatal("process_remove_identity: "
|
|
|
|
"internal error: tab->nentries %d",
|
|
|
|
tab->nentries);
|
2002-03-18 10:09:43 +00:00
|
|
|
TAILQ_REMOVE(&tab->idlist, id, next);
|
|
|
|
free_identity(id);
|
2000-09-10 09:35:38 +00:00
|
|
|
tab->nentries--;
|
|
|
|
success = 1;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
2000-09-10 09:35:38 +00:00
|
|
|
key_free(key);
|
|
|
|
}
|
2000-02-24 14:29:47 +00:00
|
|
|
buffer_put_int(&e->output, 1);
|
2000-09-10 09:35:38 +00:00
|
|
|
buffer_put_char(&e->output,
|
|
|
|
success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2000-09-10 09:35:38 +00:00
|
|
|
process_remove_all_identities(SocketEntry *e, int version)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2000-09-10 09:35:38 +00:00
|
|
|
Idtab *tab = idtab_lookup(version);
|
2002-03-18 10:09:43 +00:00
|
|
|
Identity *id;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
|
|
|
/* Loop over all identities and clear the keys. */
|
2002-03-18 10:09:43 +00:00
|
|
|
for (id = TAILQ_FIRST(&tab->idlist); id;
|
|
|
|
id = TAILQ_FIRST(&tab->idlist)) {
|
|
|
|
TAILQ_REMOVE(&tab->idlist, id, next);
|
|
|
|
free_identity(id);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Mark that there are no identities. */
|
2000-09-10 09:35:38 +00:00
|
|
|
tab->nentries = 0;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
|
|
|
/* Send success. */
|
|
|
|
buffer_put_int(&e->output, 1);
|
|
|
|
buffer_put_char(&e->output, SSH_AGENT_SUCCESS);
|
2002-06-23 16:09:08 +00:00
|
|
|
}
|
|
|
|
|
2008-07-23 09:23:42 +00:00
|
|
|
/* removes expired keys and returns number of seconds until the next expiry */
|
|
|
|
static u_int
|
2002-06-23 16:09:08 +00:00
|
|
|
reaper(void)
|
|
|
|
{
|
2008-07-23 09:23:42 +00:00
|
|
|
u_int deadline = 0, now = time(NULL);
|
2002-06-23 16:09:08 +00:00
|
|
|
Identity *id, *nxt;
|
|
|
|
int version;
|
2002-06-29 11:48:59 +00:00
|
|
|
Idtab *tab;
|
2002-06-23 16:09:08 +00:00
|
|
|
|
|
|
|
for (version = 1; version < 3; version++) {
|
|
|
|
tab = idtab_lookup(version);
|
|
|
|
for (id = TAILQ_FIRST(&tab->idlist); id; id = nxt) {
|
|
|
|
nxt = TAILQ_NEXT(id, next);
|
2008-07-23 09:23:42 +00:00
|
|
|
if (id->death == 0)
|
|
|
|
continue;
|
|
|
|
if (now >= id->death) {
|
2008-07-23 09:15:38 +00:00
|
|
|
debug("expiring key '%s'", id->comment);
|
2002-06-23 16:09:08 +00:00
|
|
|
TAILQ_REMOVE(&tab->idlist, id, next);
|
|
|
|
free_identity(id);
|
|
|
|
tab->nentries--;
|
2008-07-23 09:23:42 +00:00
|
|
|
} else
|
|
|
|
deadline = (deadline == 0) ? id->death :
|
|
|
|
MIN(deadline, id->death);
|
2002-06-23 16:09:08 +00:00
|
|
|
}
|
|
|
|
}
|
2008-07-23 09:23:42 +00:00
|
|
|
if (deadline == 0 || deadline <= now)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return (deadline - now);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2000-09-10 09:35:38 +00:00
|
|
|
process_add_identity(SocketEntry *e, int version)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2000-09-10 09:35:38 +00:00
|
|
|
Idtab *tab = idtab_lookup(version);
|
2008-07-23 09:28:49 +00:00
|
|
|
Identity *id;
|
2003-04-23 17:13:13 +00:00
|
|
|
int type, success = 0, death = 0, confirm = 0;
|
2002-06-29 11:48:59 +00:00
|
|
|
char *type_name, *comment;
|
|
|
|
Key *k = NULL;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2000-09-10 09:35:38 +00:00
|
|
|
switch (version) {
|
|
|
|
case 1:
|
2001-05-04 04:14:23 +00:00
|
|
|
k = key_new_private(KEY_RSA1);
|
2002-06-29 11:48:59 +00:00
|
|
|
(void) buffer_get_int(&e->request); /* ignored */
|
2002-06-23 16:09:08 +00:00
|
|
|
buffer_get_bignum(&e->request, k->rsa->n);
|
|
|
|
buffer_get_bignum(&e->request, k->rsa->e);
|
|
|
|
buffer_get_bignum(&e->request, k->rsa->d);
|
|
|
|
buffer_get_bignum(&e->request, k->rsa->iqmp);
|
2000-09-10 09:35:38 +00:00
|
|
|
|
|
|
|
/* SSH and SSL have p and q swapped */
|
2002-06-23 16:09:08 +00:00
|
|
|
buffer_get_bignum(&e->request, k->rsa->q); /* p */
|
|
|
|
buffer_get_bignum(&e->request, k->rsa->p); /* q */
|
2000-09-10 09:35:38 +00:00
|
|
|
|
|
|
|
/* Generate additional parameters */
|
2002-03-18 10:09:43 +00:00
|
|
|
rsa_generate_additional_parameters(k->rsa);
|
2000-09-10 09:35:38 +00:00
|
|
|
break;
|
|
|
|
case 2:
|
2002-06-23 16:09:08 +00:00
|
|
|
type_name = buffer_get_string(&e->request, NULL);
|
2001-05-04 04:14:23 +00:00
|
|
|
type = key_type_from_name(type_name);
|
|
|
|
xfree(type_name);
|
2002-03-18 10:09:43 +00:00
|
|
|
switch (type) {
|
2001-05-04 04:14:23 +00:00
|
|
|
case KEY_DSA:
|
|
|
|
k = key_new_private(type);
|
2002-06-23 16:09:08 +00:00
|
|
|
buffer_get_bignum2(&e->request, k->dsa->p);
|
|
|
|
buffer_get_bignum2(&e->request, k->dsa->q);
|
|
|
|
buffer_get_bignum2(&e->request, k->dsa->g);
|
|
|
|
buffer_get_bignum2(&e->request, k->dsa->pub_key);
|
|
|
|
buffer_get_bignum2(&e->request, k->dsa->priv_key);
|
2001-05-04 04:14:23 +00:00
|
|
|
break;
|
|
|
|
case KEY_RSA:
|
|
|
|
k = key_new_private(type);
|
2002-06-23 16:09:08 +00:00
|
|
|
buffer_get_bignum2(&e->request, k->rsa->n);
|
|
|
|
buffer_get_bignum2(&e->request, k->rsa->e);
|
|
|
|
buffer_get_bignum2(&e->request, k->rsa->d);
|
|
|
|
buffer_get_bignum2(&e->request, k->rsa->iqmp);
|
|
|
|
buffer_get_bignum2(&e->request, k->rsa->p);
|
|
|
|
buffer_get_bignum2(&e->request, k->rsa->q);
|
2001-05-04 04:14:23 +00:00
|
|
|
|
|
|
|
/* Generate additional parameters */
|
2002-03-18 10:09:43 +00:00
|
|
|
rsa_generate_additional_parameters(k->rsa);
|
2001-05-04 04:14:23 +00:00
|
|
|
break;
|
|
|
|
default:
|
2002-06-23 16:09:08 +00:00
|
|
|
buffer_clear(&e->request);
|
2000-09-10 09:35:38 +00:00
|
|
|
goto send;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
2000-09-10 09:35:38 +00:00
|
|
|
break;
|
|
|
|
}
|
2003-04-23 17:13:13 +00:00
|
|
|
/* enable blinding */
|
|
|
|
switch (k->type) {
|
|
|
|
case KEY_RSA:
|
|
|
|
case KEY_RSA1:
|
|
|
|
if (RSA_blinding_on(k->rsa, NULL) != 1) {
|
|
|
|
error("process_add_identity: RSA_blinding_on failed");
|
|
|
|
key_free(k);
|
|
|
|
goto send;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2002-06-23 16:09:08 +00:00
|
|
|
comment = buffer_get_string(&e->request, NULL);
|
2000-09-10 09:35:38 +00:00
|
|
|
if (k == NULL) {
|
|
|
|
xfree(comment);
|
|
|
|
goto send;
|
|
|
|
}
|
2002-06-23 16:09:08 +00:00
|
|
|
while (buffer_len(&e->request)) {
|
2008-07-23 09:33:08 +00:00
|
|
|
switch ((type = buffer_get_char(&e->request))) {
|
2002-06-23 16:09:08 +00:00
|
|
|
case SSH_AGENT_CONSTRAIN_LIFETIME:
|
|
|
|
death = time(NULL) + buffer_get_int(&e->request);
|
|
|
|
break;
|
2003-04-23 17:13:13 +00:00
|
|
|
case SSH_AGENT_CONSTRAIN_CONFIRM:
|
|
|
|
confirm = 1;
|
|
|
|
break;
|
2002-06-23 16:09:08 +00:00
|
|
|
default:
|
2008-07-23 09:33:08 +00:00
|
|
|
error("process_add_identity: "
|
|
|
|
"Unknown constraint type %d", type);
|
|
|
|
xfree(comment);
|
|
|
|
key_free(k);
|
|
|
|
goto send;
|
2002-06-23 16:09:08 +00:00
|
|
|
}
|
|
|
|
}
|
2008-07-23 09:33:08 +00:00
|
|
|
success = 1;
|
2003-04-23 17:13:13 +00:00
|
|
|
if (lifetime && !death)
|
|
|
|
death = time(NULL) + lifetime;
|
2008-07-23 09:28:49 +00:00
|
|
|
if ((id = lookup_identity(k, version)) == NULL) {
|
|
|
|
id = xmalloc(sizeof(Identity));
|
2002-03-18 10:09:43 +00:00
|
|
|
id->key = k;
|
|
|
|
TAILQ_INSERT_TAIL(&tab->idlist, id, next);
|
2000-09-10 09:35:38 +00:00
|
|
|
/* Increment the number of identities. */
|
|
|
|
tab->nentries++;
|
|
|
|
} else {
|
|
|
|
key_free(k);
|
2008-07-23 09:28:49 +00:00
|
|
|
xfree(id->comment);
|
2000-09-10 09:35:38 +00:00
|
|
|
}
|
2008-07-23 09:28:49 +00:00
|
|
|
id->comment = comment;
|
|
|
|
id->death = death;
|
|
|
|
id->confirm = confirm;
|
2000-09-10 09:35:38 +00:00
|
|
|
send:
|
2000-02-24 14:29:47 +00:00
|
|
|
buffer_put_int(&e->output, 1);
|
2000-09-10 09:35:38 +00:00
|
|
|
buffer_put_char(&e->output,
|
|
|
|
success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
/* XXX todo: encrypt sensitive data with passphrase */
|
|
|
|
static void
|
|
|
|
process_lock_agent(SocketEntry *e, int lock)
|
|
|
|
{
|
|
|
|
int success = 0;
|
2002-06-29 11:48:59 +00:00
|
|
|
char *passwd;
|
2002-06-23 16:09:08 +00:00
|
|
|
|
|
|
|
passwd = buffer_get_string(&e->request, NULL);
|
|
|
|
if (locked && !lock && strcmp(passwd, lock_passwd) == 0) {
|
|
|
|
locked = 0;
|
|
|
|
memset(lock_passwd, 0, strlen(lock_passwd));
|
|
|
|
xfree(lock_passwd);
|
|
|
|
lock_passwd = NULL;
|
|
|
|
success = 1;
|
|
|
|
} else if (!locked && lock) {
|
|
|
|
locked = 1;
|
|
|
|
lock_passwd = xstrdup(passwd);
|
|
|
|
success = 1;
|
|
|
|
}
|
|
|
|
memset(passwd, 0, strlen(passwd));
|
|
|
|
xfree(passwd);
|
|
|
|
|
|
|
|
buffer_put_int(&e->output, 1);
|
|
|
|
buffer_put_char(&e->output,
|
|
|
|
success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
no_identities(SocketEntry *e, u_int type)
|
|
|
|
{
|
|
|
|
Buffer msg;
|
|
|
|
|
|
|
|
buffer_init(&msg);
|
|
|
|
buffer_put_char(&msg,
|
|
|
|
(type == SSH_AGENTC_REQUEST_RSA_IDENTITIES) ?
|
|
|
|
SSH_AGENT_RSA_IDENTITIES_ANSWER : SSH2_AGENT_IDENTITIES_ANSWER);
|
|
|
|
buffer_put_int(&msg, 0);
|
|
|
|
buffer_put_int(&e->output, buffer_len(&msg));
|
|
|
|
buffer_append(&e->output, buffer_ptr(&msg), buffer_len(&msg));
|
|
|
|
buffer_free(&msg);
|
|
|
|
}
|
2002-03-18 10:09:43 +00:00
|
|
|
|
|
|
|
#ifdef SMARTCARD
|
|
|
|
static void
|
2008-07-23 09:33:08 +00:00
|
|
|
process_add_smartcard_key(SocketEntry *e)
|
2002-03-18 10:09:43 +00:00
|
|
|
{
|
2002-06-23 16:09:08 +00:00
|
|
|
char *sc_reader_id = NULL, *pin;
|
2008-07-23 09:33:08 +00:00
|
|
|
int i, type, version, success = 0, death = 0, confirm = 0;
|
2002-06-29 11:48:59 +00:00
|
|
|
Key **keys, *k;
|
|
|
|
Identity *id;
|
|
|
|
Idtab *tab;
|
2002-03-18 10:09:43 +00:00
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
sc_reader_id = buffer_get_string(&e->request, NULL);
|
|
|
|
pin = buffer_get_string(&e->request, NULL);
|
2004-01-07 11:16:27 +00:00
|
|
|
|
|
|
|
while (buffer_len(&e->request)) {
|
2008-07-23 09:33:08 +00:00
|
|
|
switch ((type = buffer_get_char(&e->request))) {
|
2004-01-07 11:16:27 +00:00
|
|
|
case SSH_AGENT_CONSTRAIN_LIFETIME:
|
|
|
|
death = time(NULL) + buffer_get_int(&e->request);
|
|
|
|
break;
|
|
|
|
case SSH_AGENT_CONSTRAIN_CONFIRM:
|
|
|
|
confirm = 1;
|
|
|
|
break;
|
|
|
|
default:
|
2008-07-23 09:33:08 +00:00
|
|
|
error("process_add_smartcard_key: "
|
|
|
|
"Unknown constraint type %d", type);
|
|
|
|
xfree(sc_reader_id);
|
|
|
|
xfree(pin);
|
|
|
|
goto send;
|
2004-01-07 11:16:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (lifetime && !death)
|
|
|
|
death = time(NULL) + lifetime;
|
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
keys = sc_get_keys(sc_reader_id, pin);
|
2002-03-18 10:09:43 +00:00
|
|
|
xfree(sc_reader_id);
|
2002-06-23 16:09:08 +00:00
|
|
|
xfree(pin);
|
2002-03-18 10:09:43 +00:00
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
if (keys == NULL || keys[0] == NULL) {
|
|
|
|
error("sc_get_keys failed");
|
2002-03-18 10:09:43 +00:00
|
|
|
goto send;
|
|
|
|
}
|
2002-06-23 16:09:08 +00:00
|
|
|
for (i = 0; keys[i] != NULL; i++) {
|
|
|
|
k = keys[i];
|
|
|
|
version = k->type == KEY_RSA1 ? 1 : 2;
|
|
|
|
tab = idtab_lookup(version);
|
|
|
|
if (lookup_identity(k, version) == NULL) {
|
|
|
|
id = xmalloc(sizeof(Identity));
|
|
|
|
id->key = k;
|
2004-01-07 11:16:27 +00:00
|
|
|
id->comment = sc_get_key_label(k);
|
|
|
|
id->death = death;
|
|
|
|
id->confirm = confirm;
|
2002-06-23 16:09:08 +00:00
|
|
|
TAILQ_INSERT_TAIL(&tab->idlist, id, next);
|
|
|
|
tab->nentries++;
|
|
|
|
success = 1;
|
|
|
|
} else {
|
|
|
|
key_free(k);
|
|
|
|
}
|
|
|
|
keys[i] = NULL;
|
2002-03-18 10:09:43 +00:00
|
|
|
}
|
2002-06-23 16:09:08 +00:00
|
|
|
xfree(keys);
|
2002-03-18 10:09:43 +00:00
|
|
|
send:
|
|
|
|
buffer_put_int(&e->output, 1);
|
|
|
|
buffer_put_char(&e->output,
|
|
|
|
success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
process_remove_smartcard_key(SocketEntry *e)
|
|
|
|
{
|
2002-06-23 16:09:08 +00:00
|
|
|
char *sc_reader_id = NULL, *pin;
|
|
|
|
int i, version, success = 0;
|
2002-06-29 11:48:59 +00:00
|
|
|
Key **keys, *k = NULL;
|
|
|
|
Identity *id;
|
|
|
|
Idtab *tab;
|
2002-03-18 10:09:43 +00:00
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
sc_reader_id = buffer_get_string(&e->request, NULL);
|
|
|
|
pin = buffer_get_string(&e->request, NULL);
|
|
|
|
keys = sc_get_keys(sc_reader_id, pin);
|
2002-03-18 10:09:43 +00:00
|
|
|
xfree(sc_reader_id);
|
2002-06-23 16:09:08 +00:00
|
|
|
xfree(pin);
|
2002-03-18 10:09:43 +00:00
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
if (keys == NULL || keys[0] == NULL) {
|
|
|
|
error("sc_get_keys failed");
|
|
|
|
goto send;
|
|
|
|
}
|
|
|
|
for (i = 0; keys[i] != NULL; i++) {
|
|
|
|
k = keys[i];
|
|
|
|
version = k->type == KEY_RSA1 ? 1 : 2;
|
|
|
|
if ((id = lookup_identity(k, version)) != NULL) {
|
|
|
|
tab = idtab_lookup(version);
|
2002-03-18 10:09:43 +00:00
|
|
|
TAILQ_REMOVE(&tab->idlist, id, next);
|
|
|
|
tab->nentries--;
|
|
|
|
free_identity(id);
|
|
|
|
success = 1;
|
|
|
|
}
|
|
|
|
key_free(k);
|
2002-06-23 16:09:08 +00:00
|
|
|
keys[i] = NULL;
|
2002-03-18 10:09:43 +00:00
|
|
|
}
|
2002-06-23 16:09:08 +00:00
|
|
|
xfree(keys);
|
|
|
|
send:
|
2002-03-18 10:09:43 +00:00
|
|
|
buffer_put_int(&e->output, 1);
|
|
|
|
buffer_put_char(&e->output,
|
|
|
|
success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
|
|
|
|
}
|
|
|
|
#endif /* SMARTCARD */
|
|
|
|
|
2000-09-10 09:35:38 +00:00
|
|
|
/* dispatch incoming messages */
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2000-02-24 14:29:47 +00:00
|
|
|
process_message(SocketEntry *e)
|
|
|
|
{
|
2002-06-29 11:48:59 +00:00
|
|
|
u_int msg_len, type;
|
2001-05-04 04:14:23 +00:00
|
|
|
u_char *cp;
|
2002-06-23 16:09:08 +00:00
|
|
|
|
2000-02-24 14:29:47 +00:00
|
|
|
if (buffer_len(&e->input) < 5)
|
|
|
|
return; /* Incomplete message. */
|
2002-03-18 10:09:43 +00:00
|
|
|
cp = buffer_ptr(&e->input);
|
2006-09-30 13:38:06 +00:00
|
|
|
msg_len = get_u32(cp);
|
2000-02-24 14:29:47 +00:00
|
|
|
if (msg_len > 256 * 1024) {
|
2002-10-29 10:16:02 +00:00
|
|
|
close_socket(e);
|
2000-02-24 14:29:47 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (buffer_len(&e->input) < msg_len + 4)
|
|
|
|
return;
|
2002-06-23 16:09:08 +00:00
|
|
|
|
|
|
|
/* move the current input to e->request */
|
2000-02-24 14:29:47 +00:00
|
|
|
buffer_consume(&e->input, 4);
|
2002-06-23 16:09:08 +00:00
|
|
|
buffer_clear(&e->request);
|
|
|
|
buffer_append(&e->request, buffer_ptr(&e->input), msg_len);
|
|
|
|
buffer_consume(&e->input, msg_len);
|
|
|
|
type = buffer_get_char(&e->request);
|
|
|
|
|
|
|
|
/* check wheter agent is locked */
|
|
|
|
if (locked && type != SSH_AGENTC_UNLOCK) {
|
|
|
|
buffer_clear(&e->request);
|
|
|
|
switch (type) {
|
|
|
|
case SSH_AGENTC_REQUEST_RSA_IDENTITIES:
|
|
|
|
case SSH2_AGENTC_REQUEST_IDENTITIES:
|
|
|
|
/* send empty lists */
|
|
|
|
no_identities(e, type);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* send a fail message for all other request types */
|
|
|
|
buffer_put_int(&e->output, 1);
|
|
|
|
buffer_put_char(&e->output, SSH_AGENT_FAILURE);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
debug("type %d", type);
|
2000-02-24 14:29:47 +00:00
|
|
|
switch (type) {
|
2002-06-23 16:09:08 +00:00
|
|
|
case SSH_AGENTC_LOCK:
|
|
|
|
case SSH_AGENTC_UNLOCK:
|
|
|
|
process_lock_agent(e, type == SSH_AGENTC_LOCK);
|
|
|
|
break;
|
2000-09-10 09:35:38 +00:00
|
|
|
/* ssh1 */
|
2000-02-24 14:29:47 +00:00
|
|
|
case SSH_AGENTC_RSA_CHALLENGE:
|
2000-09-10 09:35:38 +00:00
|
|
|
process_authentication_challenge1(e);
|
|
|
|
break;
|
|
|
|
case SSH_AGENTC_REQUEST_RSA_IDENTITIES:
|
|
|
|
process_request_identities(e, 1);
|
2000-02-24 14:29:47 +00:00
|
|
|
break;
|
|
|
|
case SSH_AGENTC_ADD_RSA_IDENTITY:
|
2002-06-23 16:09:08 +00:00
|
|
|
case SSH_AGENTC_ADD_RSA_ID_CONSTRAINED:
|
2000-09-10 09:35:38 +00:00
|
|
|
process_add_identity(e, 1);
|
2000-02-24 14:29:47 +00:00
|
|
|
break;
|
|
|
|
case SSH_AGENTC_REMOVE_RSA_IDENTITY:
|
2000-09-10 09:35:38 +00:00
|
|
|
process_remove_identity(e, 1);
|
2000-02-24 14:29:47 +00:00
|
|
|
break;
|
|
|
|
case SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES:
|
2000-09-10 09:35:38 +00:00
|
|
|
process_remove_all_identities(e, 1);
|
|
|
|
break;
|
|
|
|
/* ssh2 */
|
|
|
|
case SSH2_AGENTC_SIGN_REQUEST:
|
|
|
|
process_sign_request2(e);
|
|
|
|
break;
|
|
|
|
case SSH2_AGENTC_REQUEST_IDENTITIES:
|
|
|
|
process_request_identities(e, 2);
|
|
|
|
break;
|
|
|
|
case SSH2_AGENTC_ADD_IDENTITY:
|
2002-06-23 16:09:08 +00:00
|
|
|
case SSH2_AGENTC_ADD_ID_CONSTRAINED:
|
2000-09-10 09:35:38 +00:00
|
|
|
process_add_identity(e, 2);
|
|
|
|
break;
|
|
|
|
case SSH2_AGENTC_REMOVE_IDENTITY:
|
|
|
|
process_remove_identity(e, 2);
|
|
|
|
break;
|
|
|
|
case SSH2_AGENTC_REMOVE_ALL_IDENTITIES:
|
|
|
|
process_remove_all_identities(e, 2);
|
2000-02-24 14:29:47 +00:00
|
|
|
break;
|
2002-03-18 10:09:43 +00:00
|
|
|
#ifdef SMARTCARD
|
|
|
|
case SSH_AGENTC_ADD_SMARTCARD_KEY:
|
2004-01-07 11:16:27 +00:00
|
|
|
case SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED:
|
2002-03-18 10:09:43 +00:00
|
|
|
process_add_smartcard_key(e);
|
|
|
|
break;
|
|
|
|
case SSH_AGENTC_REMOVE_SMARTCARD_KEY:
|
|
|
|
process_remove_smartcard_key(e);
|
|
|
|
break;
|
|
|
|
#endif /* SMARTCARD */
|
2000-02-24 14:29:47 +00:00
|
|
|
default:
|
|
|
|
/* Unknown message. Respond with failure. */
|
|
|
|
error("Unknown message %d", type);
|
2002-06-23 16:09:08 +00:00
|
|
|
buffer_clear(&e->request);
|
2000-02-24 14:29:47 +00:00
|
|
|
buffer_put_int(&e->output, 1);
|
|
|
|
buffer_put_char(&e->output, SSH_AGENT_FAILURE);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
|
|
|
new_socket(sock_type type, int fd)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2003-09-17 14:36:14 +00:00
|
|
|
u_int i, old_alloc, new_alloc;
|
2002-06-29 11:48:59 +00:00
|
|
|
|
2004-10-28 16:11:31 +00:00
|
|
|
set_nonblock(fd);
|
2000-02-24 14:29:47 +00:00
|
|
|
|
|
|
|
if (fd > max_fd)
|
|
|
|
max_fd = fd;
|
|
|
|
|
|
|
|
for (i = 0; i < sockets_alloc; i++)
|
|
|
|
if (sockets[i].type == AUTH_UNUSED) {
|
|
|
|
sockets[i].fd = fd;
|
|
|
|
buffer_init(&sockets[i].input);
|
|
|
|
buffer_init(&sockets[i].output);
|
2002-06-23 16:09:08 +00:00
|
|
|
buffer_init(&sockets[i].request);
|
2003-09-17 14:36:14 +00:00
|
|
|
sockets[i].type = type;
|
2000-02-24 14:29:47 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
old_alloc = sockets_alloc;
|
2003-09-17 14:36:14 +00:00
|
|
|
new_alloc = sockets_alloc + 10;
|
2006-09-30 13:38:06 +00:00
|
|
|
sockets = xrealloc(sockets, new_alloc, sizeof(sockets[0]));
|
2003-09-17 14:36:14 +00:00
|
|
|
for (i = old_alloc; i < new_alloc; i++)
|
2000-02-24 14:29:47 +00:00
|
|
|
sockets[i].type = AUTH_UNUSED;
|
2003-09-17 14:36:14 +00:00
|
|
|
sockets_alloc = new_alloc;
|
2000-02-24 14:29:47 +00:00
|
|
|
sockets[old_alloc].fd = fd;
|
|
|
|
buffer_init(&sockets[old_alloc].input);
|
|
|
|
buffer_init(&sockets[old_alloc].output);
|
2002-06-23 16:09:08 +00:00
|
|
|
buffer_init(&sockets[old_alloc].request);
|
2003-09-17 14:36:14 +00:00
|
|
|
sockets[old_alloc].type = type;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
static int
|
2008-07-23 09:23:42 +00:00
|
|
|
prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, u_int *nallocp,
|
|
|
|
struct timeval **tvpp)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2008-07-23 09:23:42 +00:00
|
|
|
u_int i, sz, deadline;
|
2001-05-04 04:14:23 +00:00
|
|
|
int n = 0;
|
2008-07-23 09:23:42 +00:00
|
|
|
static struct timeval tv;
|
2001-05-04 04:14:23 +00:00
|
|
|
|
|
|
|
for (i = 0; i < sockets_alloc; i++) {
|
2000-02-24 14:29:47 +00:00
|
|
|
switch (sockets[i].type) {
|
|
|
|
case AUTH_SOCKET:
|
|
|
|
case AUTH_CONNECTION:
|
2001-05-04 04:14:23 +00:00
|
|
|
n = MAX(n, sockets[i].fd);
|
2000-02-24 14:29:47 +00:00
|
|
|
break;
|
|
|
|
case AUTH_UNUSED:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fatal("Unknown socket type %d", sockets[i].type);
|
|
|
|
break;
|
|
|
|
}
|
2001-05-04 04:14:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sz = howmany(n+1, NFDBITS) * sizeof(fd_mask);
|
2002-03-18 10:09:43 +00:00
|
|
|
if (*fdrp == NULL || sz > *nallocp) {
|
2001-05-04 04:14:23 +00:00
|
|
|
if (*fdrp)
|
|
|
|
xfree(*fdrp);
|
|
|
|
if (*fdwp)
|
|
|
|
xfree(*fdwp);
|
|
|
|
*fdrp = xmalloc(sz);
|
|
|
|
*fdwp = xmalloc(sz);
|
2002-03-18 10:09:43 +00:00
|
|
|
*nallocp = sz;
|
2001-05-04 04:14:23 +00:00
|
|
|
}
|
2002-03-18 10:09:43 +00:00
|
|
|
if (n < *fdl)
|
|
|
|
debug("XXX shrink: %d < %d", n, *fdl);
|
|
|
|
*fdl = n;
|
2001-05-04 04:14:23 +00:00
|
|
|
memset(*fdrp, 0, sz);
|
|
|
|
memset(*fdwp, 0, sz);
|
|
|
|
|
|
|
|
for (i = 0; i < sockets_alloc; i++) {
|
|
|
|
switch (sockets[i].type) {
|
|
|
|
case AUTH_SOCKET:
|
|
|
|
case AUTH_CONNECTION:
|
|
|
|
FD_SET(sockets[i].fd, *fdrp);
|
|
|
|
if (buffer_len(&sockets[i].output) > 0)
|
|
|
|
FD_SET(sockets[i].fd, *fdwp);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2008-07-23 09:23:42 +00:00
|
|
|
deadline = reaper();
|
|
|
|
if (parent_alive_interval != 0)
|
|
|
|
deadline = (deadline == 0) ? parent_alive_interval :
|
|
|
|
MIN(deadline, parent_alive_interval);
|
|
|
|
if (deadline == 0) {
|
|
|
|
*tvpp = NULL;
|
|
|
|
} else {
|
|
|
|
tv.tv_sec = deadline;
|
|
|
|
tv.tv_usec = 0;
|
|
|
|
*tvpp = &tv;
|
|
|
|
}
|
2001-05-04 04:14:23 +00:00
|
|
|
return (1);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2000-02-24 14:29:47 +00:00
|
|
|
after_select(fd_set *readset, fd_set *writeset)
|
|
|
|
{
|
2002-06-29 11:48:59 +00:00
|
|
|
struct sockaddr_un sunaddr;
|
2000-03-26 07:37:48 +00:00
|
|
|
socklen_t slen;
|
2000-02-24 14:29:47 +00:00
|
|
|
char buf[1024];
|
2002-06-29 11:48:59 +00:00
|
|
|
int len, sock;
|
|
|
|
u_int i;
|
2002-10-29 10:16:02 +00:00
|
|
|
uid_t euid;
|
|
|
|
gid_t egid;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
|
|
|
for (i = 0; i < sockets_alloc; i++)
|
|
|
|
switch (sockets[i].type) {
|
|
|
|
case AUTH_UNUSED:
|
|
|
|
break;
|
|
|
|
case AUTH_SOCKET:
|
|
|
|
if (FD_ISSET(sockets[i].fd, readset)) {
|
2000-03-26 07:37:48 +00:00
|
|
|
slen = sizeof(sunaddr);
|
2001-05-04 04:14:23 +00:00
|
|
|
sock = accept(sockets[i].fd,
|
2006-09-30 13:38:06 +00:00
|
|
|
(struct sockaddr *)&sunaddr, &slen);
|
2000-02-24 14:29:47 +00:00
|
|
|
if (sock < 0) {
|
2002-03-18 10:09:43 +00:00
|
|
|
error("accept from AUTH_SOCKET: %s",
|
|
|
|
strerror(errno));
|
2000-02-24 14:29:47 +00:00
|
|
|
break;
|
|
|
|
}
|
2002-10-29 10:16:02 +00:00
|
|
|
if (getpeereid(sock, &euid, &egid) < 0) {
|
|
|
|
error("getpeereid %d failed: %s",
|
|
|
|
sock, strerror(errno));
|
|
|
|
close(sock);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if ((euid != 0) && (getuid() != euid)) {
|
|
|
|
error("uid mismatch: "
|
|
|
|
"peer euid %u != uid %u",
|
|
|
|
(u_int) euid, (u_int) getuid());
|
|
|
|
close(sock);
|
|
|
|
break;
|
|
|
|
}
|
2000-02-24 14:29:47 +00:00
|
|
|
new_socket(AUTH_CONNECTION, sock);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case AUTH_CONNECTION:
|
|
|
|
if (buffer_len(&sockets[i].output) > 0 &&
|
|
|
|
FD_ISSET(sockets[i].fd, writeset)) {
|
2001-05-04 04:14:23 +00:00
|
|
|
do {
|
|
|
|
len = write(sockets[i].fd,
|
|
|
|
buffer_ptr(&sockets[i].output),
|
|
|
|
buffer_len(&sockets[i].output));
|
|
|
|
if (len == -1 && (errno == EAGAIN ||
|
2008-07-23 09:33:08 +00:00
|
|
|
errno == EINTR ||
|
|
|
|
errno == EWOULDBLOCK))
|
2001-05-04 04:14:23 +00:00
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
} while (1);
|
2000-02-24 14:29:47 +00:00
|
|
|
if (len <= 0) {
|
2002-10-29 10:16:02 +00:00
|
|
|
close_socket(&sockets[i]);
|
2000-02-24 14:29:47 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
buffer_consume(&sockets[i].output, len);
|
|
|
|
}
|
|
|
|
if (FD_ISSET(sockets[i].fd, readset)) {
|
2001-05-04 04:14:23 +00:00
|
|
|
do {
|
|
|
|
len = read(sockets[i].fd, buf, sizeof(buf));
|
|
|
|
if (len == -1 && (errno == EAGAIN ||
|
2008-07-23 09:33:08 +00:00
|
|
|
errno == EINTR ||
|
|
|
|
errno == EWOULDBLOCK))
|
2001-05-04 04:14:23 +00:00
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
} while (1);
|
2000-02-24 14:29:47 +00:00
|
|
|
if (len <= 0) {
|
2002-10-29 10:16:02 +00:00
|
|
|
close_socket(&sockets[i]);
|
2000-02-24 14:29:47 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
buffer_append(&sockets[i].input, buf, len);
|
|
|
|
process_message(&sockets[i]);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fatal("Unknown type %d", sockets[i].type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2004-02-26 10:52:33 +00:00
|
|
|
cleanup_socket(void)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2001-05-04 04:14:23 +00:00
|
|
|
if (socket_name[0])
|
|
|
|
unlink(socket_name);
|
|
|
|
if (socket_dir[0])
|
|
|
|
rmdir(socket_dir);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2004-02-26 10:52:33 +00:00
|
|
|
void
|
2000-02-24 14:29:47 +00:00
|
|
|
cleanup_exit(int i)
|
|
|
|
{
|
2004-02-26 10:52:33 +00:00
|
|
|
cleanup_socket();
|
|
|
|
_exit(i);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2006-09-30 13:38:06 +00:00
|
|
|
/*ARGSUSED*/
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2001-05-04 04:14:23 +00:00
|
|
|
cleanup_handler(int sig)
|
|
|
|
{
|
2004-02-26 10:52:33 +00:00
|
|
|
cleanup_socket();
|
2001-05-04 04:14:23 +00:00
|
|
|
_exit(2);
|
|
|
|
}
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
static void
|
2008-07-23 09:23:42 +00:00
|
|
|
check_parent_exists(void)
|
2002-03-18 10:09:43 +00:00
|
|
|
{
|
|
|
|
if (parent_pid != -1 && kill(parent_pid, 0) < 0) {
|
|
|
|
/* printf("Parent has died - Authentication agent exiting.\n"); */
|
2008-07-23 09:23:42 +00:00
|
|
|
cleanup_socket();
|
|
|
|
_exit(2);
|
2002-03-18 10:09:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-05-04 04:14:23 +00:00
|
|
|
usage(void)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2008-07-23 09:28:49 +00:00
|
|
|
fprintf(stderr, "usage: %s [options] [command [arg ...]]\n",
|
2001-05-04 04:14:23 +00:00
|
|
|
__progname);
|
2002-03-18 10:09:43 +00:00
|
|
|
fprintf(stderr, "Options:\n");
|
|
|
|
fprintf(stderr, " -c Generate C-shell commands on stdout.\n");
|
|
|
|
fprintf(stderr, " -s Generate Bourne shell commands on stdout.\n");
|
|
|
|
fprintf(stderr, " -k Kill the current agent.\n");
|
|
|
|
fprintf(stderr, " -d Debug mode.\n");
|
2002-06-23 16:09:08 +00:00
|
|
|
fprintf(stderr, " -a socket Bind agent socket to given name.\n");
|
2003-04-23 17:13:13 +00:00
|
|
|
fprintf(stderr, " -t life Default identity lifetime (seconds).\n");
|
2000-02-24 14:29:47 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
main(int ac, char **av)
|
|
|
|
{
|
2003-04-23 17:13:13 +00:00
|
|
|
int c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0;
|
2008-07-23 09:15:38 +00:00
|
|
|
int sock, fd, ch, result, saved_errno;
|
2004-10-28 16:11:31 +00:00
|
|
|
u_int nalloc;
|
2002-06-29 11:48:59 +00:00
|
|
|
char *shell, *format, *pidstr, *agentsocket = NULL;
|
|
|
|
fd_set *readsetp = NULL, *writesetp = NULL;
|
2000-02-24 14:29:47 +00:00
|
|
|
struct sockaddr_un sunaddr;
|
2002-06-27 22:42:11 +00:00
|
|
|
#ifdef HAVE_SETRLIMIT
|
2001-05-04 04:14:23 +00:00
|
|
|
struct rlimit rlim;
|
2002-06-27 22:42:11 +00:00
|
|
|
#endif
|
|
|
|
int prev_mask;
|
2001-05-04 04:14:23 +00:00
|
|
|
extern int optind;
|
2002-06-29 11:48:59 +00:00
|
|
|
extern char *optarg;
|
|
|
|
pid_t pid;
|
|
|
|
char pidstrbuf[1 + 3 * sizeof pid];
|
2008-07-23 09:23:42 +00:00
|
|
|
struct timeval *tvp = NULL;
|
2001-05-04 04:14:23 +00:00
|
|
|
|
2006-03-22 20:41:37 +00:00
|
|
|
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
|
|
|
|
sanitise_stdfd();
|
|
|
|
|
2002-10-29 10:16:02 +00:00
|
|
|
/* drop */
|
|
|
|
setegid(getgid());
|
|
|
|
setgid(getgid());
|
2003-02-07 15:48:27 +00:00
|
|
|
setuid(geteuid());
|
2002-10-29 10:16:02 +00:00
|
|
|
|
2004-04-20 09:46:41 +00:00
|
|
|
#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
|
|
|
|
/* Disable ptrace on Linux without sgid bit */
|
|
|
|
prctl(PR_SET_DUMPABLE, 0);
|
|
|
|
#endif
|
|
|
|
|
2001-05-04 04:14:23 +00:00
|
|
|
SSLeay_add_all_algorithms();
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2004-01-07 11:16:27 +00:00
|
|
|
__progname = ssh_get_progname(av[0]);
|
2002-06-27 22:42:11 +00:00
|
|
|
init_rng();
|
|
|
|
seed_rng();
|
|
|
|
|
2003-04-23 17:13:13 +00:00
|
|
|
while ((ch = getopt(ac, av, "cdksa:t:")) != -1) {
|
2000-02-24 14:29:47 +00:00
|
|
|
switch (ch) {
|
|
|
|
case 'c':
|
|
|
|
if (s_flag)
|
|
|
|
usage();
|
|
|
|
c_flag++;
|
|
|
|
break;
|
|
|
|
case 'k':
|
|
|
|
k_flag++;
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
if (c_flag)
|
|
|
|
usage();
|
|
|
|
s_flag++;
|
|
|
|
break;
|
2002-03-18 10:09:43 +00:00
|
|
|
case 'd':
|
|
|
|
if (d_flag)
|
|
|
|
usage();
|
|
|
|
d_flag++;
|
|
|
|
break;
|
2002-06-23 16:09:08 +00:00
|
|
|
case 'a':
|
|
|
|
agentsocket = optarg;
|
|
|
|
break;
|
2003-04-23 17:13:13 +00:00
|
|
|
case 't':
|
|
|
|
if ((lifetime = convtime(optarg)) == -1) {
|
|
|
|
fprintf(stderr, "Invalid lifetime\n");
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
break;
|
2000-02-24 14:29:47 +00:00
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ac -= optind;
|
|
|
|
av += optind;
|
|
|
|
|
2002-03-18 10:09:43 +00:00
|
|
|
if (ac > 0 && (c_flag || k_flag || s_flag || d_flag))
|
2000-02-24 14:29:47 +00:00
|
|
|
usage();
|
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
if (ac == 0 && !c_flag && !s_flag) {
|
2000-02-24 14:29:47 +00:00
|
|
|
shell = getenv("SHELL");
|
2006-09-30 13:38:06 +00:00
|
|
|
if (shell != NULL &&
|
|
|
|
strncmp(shell + strlen(shell) - 3, "csh", 3) == 0)
|
2000-02-24 14:29:47 +00:00
|
|
|
c_flag = 1;
|
|
|
|
}
|
|
|
|
if (k_flag) {
|
2006-09-30 13:38:06 +00:00
|
|
|
const char *errstr = NULL;
|
|
|
|
|
2000-02-24 14:29:47 +00:00
|
|
|
pidstr = getenv(SSH_AGENTPID_ENV_NAME);
|
|
|
|
if (pidstr == NULL) {
|
|
|
|
fprintf(stderr, "%s not set, cannot kill agent\n",
|
2001-05-04 04:14:23 +00:00
|
|
|
SSH_AGENTPID_ENV_NAME);
|
2000-02-24 14:29:47 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
2006-09-30 13:38:06 +00:00
|
|
|
pid = (int)strtonum(pidstr, 2, INT_MAX, &errstr);
|
|
|
|
if (errstr) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s=\"%s\", which is not a good PID: %s\n",
|
|
|
|
SSH_AGENTPID_ENV_NAME, pidstr, errstr);
|
2000-02-24 14:29:47 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (kill(pid, SIGTERM) == -1) {
|
|
|
|
perror("kill");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
format = c_flag ? "unsetenv %s;\n" : "unset %s;\n";
|
|
|
|
printf(format, SSH_AUTHSOCKET_ENV_NAME);
|
|
|
|
printf(format, SSH_AGENTPID_ENV_NAME);
|
2002-06-23 16:09:08 +00:00
|
|
|
printf("echo Agent pid %ld killed;\n", (long)pid);
|
2000-02-24 14:29:47 +00:00
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
parent_pid = getpid();
|
|
|
|
|
2002-06-23 16:09:08 +00:00
|
|
|
if (agentsocket == NULL) {
|
|
|
|
/* Create private directory for agent socket */
|
2004-02-26 10:52:33 +00:00
|
|
|
strlcpy(socket_dir, "/tmp/ssh-XXXXXXXXXX", sizeof socket_dir);
|
2002-06-23 16:09:08 +00:00
|
|
|
if (mkdtemp(socket_dir) == NULL) {
|
|
|
|
perror("mkdtemp: private socket dir");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
snprintf(socket_name, sizeof socket_name, "%s/agent.%ld", socket_dir,
|
|
|
|
(long)parent_pid);
|
|
|
|
} else {
|
|
|
|
/* Try to use specified agent socket */
|
|
|
|
socket_dir[0] = '\0';
|
|
|
|
strlcpy(socket_name, agentsocket, sizeof socket_name);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create socket early so it will exist before command gets run from
|
|
|
|
* the parent.
|
|
|
|
*/
|
|
|
|
sock = socket(AF_UNIX, SOCK_STREAM, 0);
|
|
|
|
if (sock < 0) {
|
|
|
|
perror("socket");
|
2005-06-05 15:46:09 +00:00
|
|
|
*socket_name = '\0'; /* Don't unlink any existing file */
|
2000-02-24 14:29:47 +00:00
|
|
|
cleanup_exit(1);
|
|
|
|
}
|
|
|
|
memset(&sunaddr, 0, sizeof(sunaddr));
|
|
|
|
sunaddr.sun_family = AF_UNIX;
|
|
|
|
strlcpy(sunaddr.sun_path, socket_name, sizeof(sunaddr.sun_path));
|
2002-06-27 22:42:11 +00:00
|
|
|
prev_mask = umask(0177);
|
2006-09-30 13:38:06 +00:00
|
|
|
if (bind(sock, (struct sockaddr *) &sunaddr, sizeof(sunaddr)) < 0) {
|
2000-02-24 14:29:47 +00:00
|
|
|
perror("bind");
|
2005-06-05 15:46:09 +00:00
|
|
|
*socket_name = '\0'; /* Don't unlink any existing file */
|
2002-06-27 22:42:11 +00:00
|
|
|
umask(prev_mask);
|
2000-02-24 14:29:47 +00:00
|
|
|
cleanup_exit(1);
|
|
|
|
}
|
2002-06-27 22:42:11 +00:00
|
|
|
umask(prev_mask);
|
2004-02-26 10:52:33 +00:00
|
|
|
if (listen(sock, SSH_LISTEN_BACKLOG) < 0) {
|
2000-02-24 14:29:47 +00:00
|
|
|
perror("listen");
|
|
|
|
cleanup_exit(1);
|
|
|
|
}
|
2001-05-04 04:14:23 +00:00
|
|
|
|
2000-02-24 14:29:47 +00:00
|
|
|
/*
|
|
|
|
* Fork, and have the parent execute the command, if any, or present
|
|
|
|
* the socket data. The child continues as the authentication agent.
|
|
|
|
*/
|
2002-03-18 10:09:43 +00:00
|
|
|
if (d_flag) {
|
|
|
|
log_init(__progname, SYSLOG_LEVEL_DEBUG1, SYSLOG_FACILITY_AUTH, 1);
|
|
|
|
format = c_flag ? "setenv %s %s;\n" : "%s=%s; export %s;\n";
|
|
|
|
printf(format, SSH_AUTHSOCKET_ENV_NAME, socket_name,
|
|
|
|
SSH_AUTHSOCKET_ENV_NAME);
|
2002-06-23 16:09:08 +00:00
|
|
|
printf("echo Agent pid %ld;\n", (long)parent_pid);
|
2002-03-18 10:09:43 +00:00
|
|
|
goto skip;
|
|
|
|
}
|
2000-02-24 14:29:47 +00:00
|
|
|
pid = fork();
|
|
|
|
if (pid == -1) {
|
|
|
|
perror("fork");
|
2002-03-18 10:09:43 +00:00
|
|
|
cleanup_exit(1);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
if (pid != 0) { /* Parent - execute the given command. */
|
|
|
|
close(sock);
|
2002-06-23 16:09:08 +00:00
|
|
|
snprintf(pidstrbuf, sizeof pidstrbuf, "%ld", (long)pid);
|
2000-02-24 14:29:47 +00:00
|
|
|
if (ac == 0) {
|
|
|
|
format = c_flag ? "setenv %s %s;\n" : "%s=%s; export %s;\n";
|
|
|
|
printf(format, SSH_AUTHSOCKET_ENV_NAME, socket_name,
|
2001-05-04 04:14:23 +00:00
|
|
|
SSH_AUTHSOCKET_ENV_NAME);
|
2000-02-24 14:29:47 +00:00
|
|
|
printf(format, SSH_AGENTPID_ENV_NAME, pidstrbuf,
|
2001-05-04 04:14:23 +00:00
|
|
|
SSH_AGENTPID_ENV_NAME);
|
2002-06-23 16:09:08 +00:00
|
|
|
printf("echo Agent pid %ld;\n", (long)pid);
|
2000-02-24 14:29:47 +00:00
|
|
|
exit(0);
|
|
|
|
}
|
2000-12-05 02:55:12 +00:00
|
|
|
if (setenv(SSH_AUTHSOCKET_ENV_NAME, socket_name, 1) == -1 ||
|
|
|
|
setenv(SSH_AGENTPID_ENV_NAME, pidstrbuf, 1) == -1) {
|
|
|
|
perror("setenv");
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-02-24 14:29:47 +00:00
|
|
|
execvp(av[0], av);
|
|
|
|
perror(av[0]);
|
|
|
|
exit(1);
|
|
|
|
}
|
2002-03-18 10:09:43 +00:00
|
|
|
/* child */
|
|
|
|
log_init(__progname, SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_AUTH, 0);
|
|
|
|
|
|
|
|
if (setsid() == -1) {
|
|
|
|
error("setsid: %s", strerror(errno));
|
|
|
|
cleanup_exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
(void)chdir("/");
|
2003-04-23 17:13:13 +00:00
|
|
|
if ((fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) {
|
|
|
|
/* XXX might close listen socket */
|
|
|
|
(void)dup2(fd, STDIN_FILENO);
|
|
|
|
(void)dup2(fd, STDOUT_FILENO);
|
|
|
|
(void)dup2(fd, STDERR_FILENO);
|
|
|
|
if (fd > 2)
|
|
|
|
close(fd);
|
|
|
|
}
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2002-06-27 22:42:11 +00:00
|
|
|
#ifdef HAVE_SETRLIMIT
|
2001-05-04 04:14:23 +00:00
|
|
|
/* deny core dumps, since memory contains unencrypted private keys */
|
|
|
|
rlim.rlim_cur = rlim.rlim_max = 0;
|
|
|
|
if (setrlimit(RLIMIT_CORE, &rlim) < 0) {
|
2002-03-18 10:09:43 +00:00
|
|
|
error("setrlimit RLIMIT_CORE: %s", strerror(errno));
|
2000-02-24 14:29:47 +00:00
|
|
|
cleanup_exit(1);
|
|
|
|
}
|
2002-06-27 22:42:11 +00:00
|
|
|
#endif
|
2002-03-18 10:09:43 +00:00
|
|
|
|
|
|
|
skip:
|
2000-02-24 14:29:47 +00:00
|
|
|
new_socket(AUTH_SOCKET, sock);
|
2008-07-23 09:23:42 +00:00
|
|
|
if (ac > 0)
|
|
|
|
parent_alive_interval = 10;
|
2000-09-10 09:35:38 +00:00
|
|
|
idtab_init();
|
2002-03-18 10:09:43 +00:00
|
|
|
if (!d_flag)
|
|
|
|
signal(SIGINT, SIG_IGN);
|
2000-02-24 14:29:47 +00:00
|
|
|
signal(SIGPIPE, SIG_IGN);
|
2001-05-04 04:14:23 +00:00
|
|
|
signal(SIGHUP, cleanup_handler);
|
|
|
|
signal(SIGTERM, cleanup_handler);
|
2002-03-18 10:09:43 +00:00
|
|
|
nalloc = 0;
|
|
|
|
|
2000-02-24 14:29:47 +00:00
|
|
|
while (1) {
|
2008-07-23 09:23:42 +00:00
|
|
|
prepare_select(&readsetp, &writesetp, &max_fd, &nalloc, &tvp);
|
|
|
|
result = select(max_fd + 1, readsetp, writesetp, NULL, tvp);
|
2008-07-23 09:15:38 +00:00
|
|
|
saved_errno = errno;
|
2008-07-23 09:23:42 +00:00
|
|
|
if (parent_alive_interval != 0)
|
|
|
|
check_parent_exists();
|
|
|
|
(void) reaper(); /* remove expired keys */
|
2008-07-23 09:15:38 +00:00
|
|
|
if (result < 0) {
|
|
|
|
if (saved_errno == EINTR)
|
2000-02-24 14:29:47 +00:00
|
|
|
continue;
|
2008-07-23 09:15:38 +00:00
|
|
|
fatal("select: %s", strerror(saved_errno));
|
|
|
|
} else if (result > 0)
|
|
|
|
after_select(readsetp, writesetp);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
/* NOTREACHED */
|
|
|
|
}
|