2002-02-08 11:05:41 +00:00
|
|
|
/* $OpenBSD: ssh-agent.c,v 1.81 2002/02/05 15:50:12 stevesk Exp $ */
|
1999-10-28 23:47:09 +00:00
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
/*
|
1999-11-24 13:26:21 +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-08-23 00:46:23 +00:00
|
|
|
*
|
2000-09-16 02:29:08 +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".
|
|
|
|
*
|
2001-07-04 03:32:30 +00:00
|
|
|
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
|
2000-09-16 02:29:08 +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.
|
1999-11-24 13:26:21 +00:00
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "includes.h"
|
2002-02-08 11:05:41 +00:00
|
|
|
RCSID("$OpenBSD: ssh-agent.c,v 1.81 2002/02/05 15:50:12 stevesk Exp $");
|
2001-01-22 05:34:40 +00:00
|
|
|
|
2002-01-22 12:52:17 +00:00
|
|
|
#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
|
|
|
|
#include <sys/queue.h>
|
|
|
|
#else
|
|
|
|
#include "openbsd-compat/fake-queue.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2001-01-22 05:34:40 +00:00
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/md5.h>
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "ssh.h"
|
|
|
|
#include "rsa.h"
|
|
|
|
#include "buffer.h"
|
|
|
|
#include "bufaux.h"
|
|
|
|
#include "xmalloc.h"
|
|
|
|
#include "getput.h"
|
2000-07-21 00:19:44 +00:00
|
|
|
#include "key.h"
|
|
|
|
#include "authfd.h"
|
2000-09-23 06:15:56 +00:00
|
|
|
#include "compat.h"
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "log.h"
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2001-07-04 03:53:15 +00:00
|
|
|
#ifdef SMARTCARD
|
|
|
|
#include <openssl/engine.h>
|
|
|
|
#include "scard.h"
|
2001-08-06 21:59:25 +00:00
|
|
|
#endif
|
2001-07-04 03:53:15 +00:00
|
|
|
|
2001-12-06 16:32:47 +00:00
|
|
|
typedef enum {
|
|
|
|
AUTH_UNUSED,
|
|
|
|
AUTH_SOCKET,
|
|
|
|
AUTH_CONNECTION
|
|
|
|
} sock_type;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
typedef struct {
|
|
|
|
int fd;
|
2001-12-06 16:32:47 +00:00
|
|
|
sock_type type;
|
1999-11-24 13:26:21 +00:00
|
|
|
Buffer input;
|
|
|
|
Buffer output;
|
1999-10-27 03:42:43 +00:00
|
|
|
} SocketEntry;
|
|
|
|
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int sockets_alloc = 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
SocketEntry *sockets = NULL;
|
|
|
|
|
2002-01-22 12:26:13 +00:00
|
|
|
typedef struct identity {
|
|
|
|
TAILQ_ENTRY(identity) next;
|
2000-08-23 00:46:23 +00:00
|
|
|
Key *key;
|
1999-11-24 13:26:21 +00:00
|
|
|
char *comment;
|
1999-10-27 03:42:43 +00:00
|
|
|
} Identity;
|
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
typedef struct {
|
|
|
|
int nentries;
|
2002-01-22 12:26:13 +00:00
|
|
|
TAILQ_HEAD(idqueue, identity) idlist;
|
2000-08-23 00:46:23 +00:00
|
|
|
} Idtab;
|
|
|
|
|
|
|
|
/* private key table, one per protocol version */
|
|
|
|
Idtab idtable[3];
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
int max_fd = 0;
|
|
|
|
|
|
|
|
/* pid of shell == parent of agent */
|
2000-04-19 21:42:21 +00:00
|
|
|
pid_t parent_pid = -1;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
/* pathname and directory for AUTH_SOCKET */
|
|
|
|
char socket_name[1024];
|
|
|
|
char socket_dir[1024];
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
#ifdef HAVE___PROGNAME
|
|
|
|
extern char *__progname;
|
2000-11-17 03:47:20 +00:00
|
|
|
#else
|
|
|
|
char *__progname;
|
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2000-08-23 00:46:23 +00:00
|
|
|
idtab_init(void)
|
|
|
|
{
|
|
|
|
int i;
|
2001-12-06 18:00:18 +00:00
|
|
|
for (i = 0; i <=2; i++) {
|
2002-01-22 12:26:13 +00:00
|
|
|
TAILQ_INIT(&idtable[i].idlist);
|
2000-08-23 00:46:23 +00:00
|
|
|
idtable[i].nentries = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* return private key table for requested protocol version */
|
2001-06-25 05:01:22 +00:00
|
|
|
static Idtab *
|
2000-08-23 00:46:23 +00:00
|
|
|
idtab_lookup(int version)
|
|
|
|
{
|
|
|
|
if (version < 1 || version > 2)
|
|
|
|
fatal("internal error, bad protocol version %d", version);
|
|
|
|
return &idtable[version];
|
|
|
|
}
|
|
|
|
|
|
|
|
/* return matching private key for given public key */
|
2002-01-22 12:26:13 +00:00
|
|
|
static Identity *
|
|
|
|
lookup_identity(Key *key, int version)
|
2000-08-23 00:46:23 +00:00
|
|
|
{
|
2002-01-22 12:26:13 +00:00
|
|
|
Identity *id;
|
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
Idtab *tab = idtab_lookup(version);
|
2002-01-22 12:26:13 +00:00
|
|
|
TAILQ_FOREACH(id, &tab->idlist, next) {
|
|
|
|
if (key_equal(key, id->key))
|
|
|
|
return (id);
|
2000-08-23 00:46:23 +00:00
|
|
|
}
|
2002-01-22 12:26:13 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
free_identity(Identity *id)
|
|
|
|
{
|
|
|
|
key_free(id->key);
|
|
|
|
xfree(id->comment);
|
|
|
|
xfree(id);
|
2000-08-23 00:46:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* send list of supported public keys to 'client' */
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2000-08-23 00:46:23 +00:00
|
|
|
process_request_identities(SocketEntry *e, int version)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2000-08-23 00:46:23 +00:00
|
|
|
Idtab *tab = idtab_lookup(version);
|
1999-11-24 13:26:21 +00:00
|
|
|
Buffer msg;
|
2002-01-22 12:26:13 +00:00
|
|
|
Identity *id;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
buffer_init(&msg);
|
2000-08-23 00:46:23 +00:00
|
|
|
buffer_put_char(&msg, (version == 1) ?
|
|
|
|
SSH_AGENT_RSA_IDENTITIES_ANSWER : SSH2_AGENT_IDENTITIES_ANSWER);
|
|
|
|
buffer_put_int(&msg, tab->nentries);
|
2002-01-22 12:26:13 +00:00
|
|
|
TAILQ_FOREACH(id, &tab->idlist, next) {
|
2000-11-13 11:57:25 +00:00
|
|
|
if (id->key->type == KEY_RSA1) {
|
2000-08-23 00:46:23 +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 {
|
2000-12-22 01:43:59 +00:00
|
|
|
u_char *blob;
|
|
|
|
u_int blen;
|
2000-11-13 11:57:25 +00:00
|
|
|
key_to_blob(id->key, &blob, &blen);
|
2000-08-23 00:46:23 +00:00
|
|
|
buffer_put_string(&msg, blob, blen);
|
|
|
|
xfree(blob);
|
|
|
|
}
|
|
|
|
buffer_put_cstring(&msg, id->comment);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
buffer_put_int(&e->output, buffer_len(&msg));
|
|
|
|
buffer_append(&e->output, buffer_ptr(&msg), buffer_len(&msg));
|
|
|
|
buffer_free(&msg);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
/* ssh1 only */
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2000-08-23 00:46:23 +00:00
|
|
|
process_authentication_challenge1(SocketEntry *e)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2002-01-22 12:26:13 +00:00
|
|
|
Identity *id;
|
|
|
|
Key *key;
|
2000-08-23 00:46:23 +00:00
|
|
|
BIGNUM *challenge;
|
|
|
|
int i, len;
|
1999-11-24 13:26:21 +00:00
|
|
|
Buffer msg;
|
|
|
|
MD5_CTX md;
|
2000-12-22 01:43:59 +00:00
|
|
|
u_char buf[32], mdbuf[16], session_id[16];
|
|
|
|
u_int response_type;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
buffer_init(&msg);
|
2000-11-13 11:57:25 +00:00
|
|
|
key = key_new(KEY_RSA1);
|
2002-01-22 12:09:22 +00:00
|
|
|
if ((challenge = BN_new()) == NULL)
|
|
|
|
fatal("process_authentication_challenge1: BN_new failed");
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
buffer_get_int(&e->input); /* ignored */
|
|
|
|
buffer_get_bignum(&e->input, key->rsa->e);
|
|
|
|
buffer_get_bignum(&e->input, key->rsa->n);
|
|
|
|
buffer_get_bignum(&e->input, challenge);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
/* Only protocol 1.1 is supported */
|
|
|
|
if (buffer_len(&e->input) == 0)
|
|
|
|
goto failure;
|
2002-01-22 12:33:31 +00:00
|
|
|
buffer_get(&e->input, session_id, 16);
|
2000-08-23 00:46:23 +00:00
|
|
|
response_type = buffer_get_int(&e->input);
|
|
|
|
if (response_type != 1)
|
|
|
|
goto failure;
|
|
|
|
|
2002-01-22 12:26:13 +00:00
|
|
|
id = lookup_identity(key, 1);
|
|
|
|
if (id != NULL) {
|
|
|
|
Key *private = id->key;
|
2000-08-23 00:46:23 +00:00
|
|
|
/* Decrypt the challenge using the private key. */
|
2001-01-29 22:27:26 +00:00
|
|
|
if (rsa_private_decrypt(challenge, challenge, private->rsa) <= 0)
|
|
|
|
goto failure;
|
2000-08-23 00:46:23 +00:00
|
|
|
|
|
|
|
/* The response is MD5 of decrypted challenge plus session id. */
|
|
|
|
len = BN_num_bytes(challenge);
|
|
|
|
if (len <= 0 || len > 32) {
|
|
|
|
log("process_authentication_challenge: bad challenge length %d", len);
|
|
|
|
goto failure;
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2000-08-23 00:46:23 +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. */
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_put_char(&msg, SSH_AGENT_FAILURE);
|
|
|
|
send:
|
2000-08-23 00:46:23 +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 */
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2000-08-23 00:46:23 +00:00
|
|
|
process_sign_request2(SocketEntry *e)
|
|
|
|
{
|
|
|
|
extern int datafellows;
|
2002-01-22 12:26:13 +00:00
|
|
|
Key *key;
|
2000-12-22 01:43:59 +00:00
|
|
|
u_char *blob, *data, *signature = NULL;
|
|
|
|
u_int blen, dlen, slen = 0;
|
2000-09-23 06:15:56 +00:00
|
|
|
int flags;
|
2000-08-23 00:46:23 +00:00
|
|
|
Buffer msg;
|
|
|
|
int ok = -1;
|
|
|
|
|
|
|
|
datafellows = 0;
|
2000-12-15 18:39:12 +00:00
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
blob = buffer_get_string(&e->input, &blen);
|
|
|
|
data = buffer_get_string(&e->input, &dlen);
|
2000-09-23 06:15:56 +00:00
|
|
|
|
|
|
|
flags = buffer_get_int(&e->input);
|
|
|
|
if (flags & SSH_AGENT_OLD_SIGNATURE)
|
|
|
|
datafellows = SSH_BUG_SIGBLOB;
|
2000-08-23 00:46:23 +00:00
|
|
|
|
2000-11-13 11:57:25 +00:00
|
|
|
key = key_from_blob(blob, blen);
|
2000-08-23 00:46:23 +00:00
|
|
|
if (key != NULL) {
|
2002-01-22 12:26:13 +00:00
|
|
|
Identity *id = lookup_identity(key, 2);
|
|
|
|
if (id != NULL)
|
|
|
|
ok = key_sign(id->key, &signature, &slen, data, dlen);
|
2000-08-23 00:46:23 +00:00
|
|
|
}
|
|
|
|
key_free(key);
|
|
|
|
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);
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_put_int(&e->output, buffer_len(&msg));
|
|
|
|
buffer_append(&e->output, buffer_ptr(&msg),
|
2000-08-23 00:46:23 +00:00
|
|
|
buffer_len(&msg));
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_free(&msg);
|
2000-08-23 00:46:23 +00:00
|
|
|
xfree(data);
|
|
|
|
xfree(blob);
|
|
|
|
if (signature != NULL)
|
|
|
|
xfree(signature);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
/* shared */
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2000-08-23 00:46:23 +00:00
|
|
|
process_remove_identity(SocketEntry *e, int version)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2002-01-22 12:26:13 +00:00
|
|
|
Key *key = NULL;
|
2000-12-22 01:43:59 +00:00
|
|
|
u_char *blob;
|
|
|
|
u_int blen;
|
|
|
|
u_int bits;
|
2000-08-23 00:46:23 +00:00
|
|
|
int success = 0;
|
|
|
|
|
2001-12-06 18:00:18 +00:00
|
|
|
switch (version) {
|
2000-08-23 00:46:23 +00:00
|
|
|
case 1:
|
2000-11-13 11:57:25 +00:00
|
|
|
key = key_new(KEY_RSA1);
|
2000-08-23 00:46:23 +00:00
|
|
|
bits = buffer_get_int(&e->input);
|
|
|
|
buffer_get_bignum(&e->input, key->rsa->e);
|
|
|
|
buffer_get_bignum(&e->input, key->rsa->n);
|
|
|
|
|
|
|
|
if (bits != key_size(key))
|
|
|
|
log("Warning: identity keysize mismatch: actual %d, announced %d",
|
2001-01-22 05:34:40 +00:00
|
|
|
key_size(key), bits);
|
2000-08-23 00:46:23 +00:00
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
blob = buffer_get_string(&e->input, &blen);
|
2000-11-13 11:57:25 +00:00
|
|
|
key = key_from_blob(blob, blen);
|
2000-08-23 00:46:23 +00:00
|
|
|
xfree(blob);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (key != NULL) {
|
2002-01-22 12:26:13 +00:00
|
|
|
Identity *id = lookup_identity(key, version);
|
|
|
|
if (id != NULL) {
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* We have this key. Free the old key. Since we
|
|
|
|
* don\'t want to leave empty slots in the middle of
|
2000-11-21 21:24:55 +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.
|
1999-11-25 00:54:57 +00:00
|
|
|
*/
|
2000-08-23 00:46:23 +00:00
|
|
|
Idtab *tab = idtab_lookup(version);
|
2000-11-13 11:57:25 +00:00
|
|
|
if (tab->nentries < 1)
|
|
|
|
fatal("process_remove_identity: "
|
|
|
|
"internal error: tab->nentries %d",
|
|
|
|
tab->nentries);
|
2002-01-22 12:26:13 +00:00
|
|
|
TAILQ_REMOVE(&tab->idlist, id, next);
|
|
|
|
free_identity(id);
|
2000-08-23 00:46:23 +00:00
|
|
|
tab->nentries--;
|
|
|
|
success = 1;
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2000-08-23 00:46:23 +00:00
|
|
|
key_free(key);
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
buffer_put_int(&e->output, 1);
|
2000-08-23 00:46:23 +00:00
|
|
|
buffer_put_char(&e->output,
|
|
|
|
success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2000-08-23 00:46:23 +00:00
|
|
|
process_remove_all_identities(SocketEntry *e, int version)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2000-08-23 00:46:23 +00:00
|
|
|
Idtab *tab = idtab_lookup(version);
|
2002-01-22 12:26:13 +00:00
|
|
|
Identity *id;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Loop over all identities and clear the keys. */
|
2002-01-22 12:26:13 +00:00
|
|
|
for (id = TAILQ_FIRST(&tab->idlist); id;
|
|
|
|
id = TAILQ_FIRST(&tab->idlist)) {
|
|
|
|
TAILQ_REMOVE(&tab->idlist, id, next);
|
|
|
|
free_identity(id);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Mark that there are no identities. */
|
2000-08-23 00:46:23 +00:00
|
|
|
tab->nentries = 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
/* Send success. */
|
|
|
|
buffer_put_int(&e->output, 1);
|
|
|
|
buffer_put_char(&e->output, SSH_AGENT_SUCCESS);
|
|
|
|
return;
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2000-11-13 11:57:25 +00:00
|
|
|
process_add_identity(SocketEntry *e, int version)
|
|
|
|
{
|
|
|
|
Key *k = NULL;
|
|
|
|
char *type_name;
|
2000-08-23 00:46:23 +00:00
|
|
|
char *comment;
|
2000-11-13 11:57:25 +00:00
|
|
|
int type, success = 0;
|
2000-08-23 00:46:23 +00:00
|
|
|
Idtab *tab = idtab_lookup(version);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
switch (version) {
|
|
|
|
case 1:
|
2000-11-13 11:57:25 +00:00
|
|
|
k = key_new_private(KEY_RSA1);
|
2001-01-22 05:34:40 +00:00
|
|
|
buffer_get_int(&e->input); /* ignored */
|
2000-11-13 11:57:25 +00:00
|
|
|
buffer_get_bignum(&e->input, k->rsa->n);
|
|
|
|
buffer_get_bignum(&e->input, k->rsa->e);
|
|
|
|
buffer_get_bignum(&e->input, k->rsa->d);
|
|
|
|
buffer_get_bignum(&e->input, k->rsa->iqmp);
|
2000-08-23 00:46:23 +00:00
|
|
|
|
|
|
|
/* SSH and SSL have p and q swapped */
|
2000-11-13 11:57:25 +00:00
|
|
|
buffer_get_bignum(&e->input, k->rsa->q); /* p */
|
|
|
|
buffer_get_bignum(&e->input, k->rsa->p); /* q */
|
2000-08-23 00:46:23 +00:00
|
|
|
|
|
|
|
/* Generate additional parameters */
|
2001-07-04 05:02:23 +00:00
|
|
|
rsa_generate_additional_parameters(k->rsa);
|
2000-08-23 00:46:23 +00:00
|
|
|
break;
|
|
|
|
case 2:
|
2000-11-13 11:57:25 +00:00
|
|
|
type_name = buffer_get_string(&e->input, NULL);
|
2001-01-22 05:34:40 +00:00
|
|
|
type = key_type_from_name(type_name);
|
2000-11-13 11:57:25 +00:00
|
|
|
xfree(type_name);
|
2001-12-06 18:00:18 +00:00
|
|
|
switch (type) {
|
2000-11-13 11:57:25 +00:00
|
|
|
case KEY_DSA:
|
|
|
|
k = key_new_private(type);
|
|
|
|
buffer_get_bignum2(&e->input, k->dsa->p);
|
|
|
|
buffer_get_bignum2(&e->input, k->dsa->q);
|
|
|
|
buffer_get_bignum2(&e->input, k->dsa->g);
|
|
|
|
buffer_get_bignum2(&e->input, k->dsa->pub_key);
|
|
|
|
buffer_get_bignum2(&e->input, k->dsa->priv_key);
|
|
|
|
break;
|
|
|
|
case KEY_RSA:
|
|
|
|
k = key_new_private(type);
|
|
|
|
buffer_get_bignum2(&e->input, k->rsa->n);
|
|
|
|
buffer_get_bignum2(&e->input, k->rsa->e);
|
|
|
|
buffer_get_bignum2(&e->input, k->rsa->d);
|
|
|
|
buffer_get_bignum2(&e->input, k->rsa->iqmp);
|
|
|
|
buffer_get_bignum2(&e->input, k->rsa->p);
|
|
|
|
buffer_get_bignum2(&e->input, k->rsa->q);
|
|
|
|
|
|
|
|
/* Generate additional parameters */
|
2001-07-04 05:02:23 +00:00
|
|
|
rsa_generate_additional_parameters(k->rsa);
|
2000-11-13 11:57:25 +00:00
|
|
|
break;
|
|
|
|
default:
|
2000-08-23 00:46:23 +00:00
|
|
|
buffer_clear(&e->input);
|
|
|
|
goto send;
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2000-08-23 00:46:23 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
comment = buffer_get_string(&e->input, NULL);
|
|
|
|
if (k == NULL) {
|
|
|
|
xfree(comment);
|
|
|
|
goto send;
|
|
|
|
}
|
|
|
|
success = 1;
|
2002-01-22 12:26:13 +00:00
|
|
|
if (lookup_identity(k, version) == NULL) {
|
|
|
|
Identity *id = xmalloc(sizeof(Identity));
|
|
|
|
id->key = k;
|
|
|
|
id->comment = comment;
|
|
|
|
TAILQ_INSERT_TAIL(&tab->idlist, id, next);
|
2000-08-23 00:46:23 +00:00
|
|
|
/* Increment the number of identities. */
|
|
|
|
tab->nentries++;
|
|
|
|
} else {
|
|
|
|
key_free(k);
|
|
|
|
xfree(comment);
|
|
|
|
}
|
|
|
|
send:
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_put_int(&e->output, 1);
|
2000-08-23 00:46:23 +00:00
|
|
|
buffer_put_char(&e->output,
|
|
|
|
success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-07-04 03:53:15 +00:00
|
|
|
|
|
|
|
#ifdef SMARTCARD
|
|
|
|
static void
|
|
|
|
process_add_smartcard_key (SocketEntry *e)
|
|
|
|
{
|
|
|
|
Idtab *tab;
|
|
|
|
Key *n = NULL, *k = NULL;
|
2001-08-06 21:35:51 +00:00
|
|
|
char *sc_reader_id = NULL;
|
2001-07-04 03:53:15 +00:00
|
|
|
int success = 0;
|
2001-12-21 03:45:46 +00:00
|
|
|
|
2001-08-06 21:35:51 +00:00
|
|
|
sc_reader_id = buffer_get_string(&e->input, NULL);
|
|
|
|
k = sc_get_key(sc_reader_id);
|
|
|
|
xfree(sc_reader_id);
|
2001-07-04 03:53:15 +00:00
|
|
|
|
|
|
|
if (k == NULL) {
|
|
|
|
error("sc_get_pubkey failed");
|
|
|
|
goto send;
|
|
|
|
}
|
|
|
|
success = 1;
|
|
|
|
|
|
|
|
tab = idtab_lookup(1);
|
2001-07-14 02:14:27 +00:00
|
|
|
k->type = KEY_RSA1;
|
2002-01-22 12:26:13 +00:00
|
|
|
if (lookup_identity(k, 1) == NULL) {
|
|
|
|
Identity *id = xmalloc(sizeof(Identity));
|
2001-07-04 03:53:15 +00:00
|
|
|
n = key_new(KEY_RSA1);
|
|
|
|
BN_copy(n->rsa->n, k->rsa->n);
|
|
|
|
BN_copy(n->rsa->e, k->rsa->e);
|
|
|
|
RSA_set_method(n->rsa, sc_get_engine());
|
2002-01-22 12:26:13 +00:00
|
|
|
id->key = n;
|
|
|
|
id->comment = xstrdup("rsa1 smartcard");
|
|
|
|
TAILQ_INSERT_TAIL(&tab->idlist, id, next);
|
2001-07-04 03:53:15 +00:00
|
|
|
tab->nentries++;
|
|
|
|
}
|
2001-07-14 02:14:27 +00:00
|
|
|
k->type = KEY_RSA;
|
2001-07-04 03:53:15 +00:00
|
|
|
tab = idtab_lookup(2);
|
2002-01-22 12:26:13 +00:00
|
|
|
if (lookup_identity(k, 2) == NULL) {
|
|
|
|
Identity *id = xmalloc(sizeof(Identity));
|
2001-07-04 03:53:15 +00:00
|
|
|
n = key_new(KEY_RSA);
|
|
|
|
BN_copy(n->rsa->n, k->rsa->n);
|
|
|
|
BN_copy(n->rsa->e, k->rsa->e);
|
|
|
|
RSA_set_method(n->rsa, sc_get_engine());
|
2002-01-22 12:26:13 +00:00
|
|
|
id->key = n;
|
|
|
|
id->comment = xstrdup("rsa smartcard");
|
|
|
|
TAILQ_INSERT_TAIL(&tab->idlist, id, next);
|
2001-07-04 03:53:15 +00:00
|
|
|
tab->nentries++;
|
|
|
|
}
|
|
|
|
key_free(k);
|
|
|
|
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-01-22 12:26:13 +00:00
|
|
|
Key *k = NULL;
|
2001-07-04 03:53:15 +00:00
|
|
|
int success = 0;
|
2001-08-06 21:35:51 +00:00
|
|
|
char *sc_reader_id = NULL;
|
2001-07-04 03:53:15 +00:00
|
|
|
|
2001-08-06 21:35:51 +00:00
|
|
|
sc_reader_id = buffer_get_string(&e->input, NULL);
|
|
|
|
k = sc_get_key(sc_reader_id);
|
|
|
|
xfree(sc_reader_id);
|
2001-07-04 03:53:15 +00:00
|
|
|
|
2001-08-06 21:35:51 +00:00
|
|
|
if (k == NULL) {
|
2001-07-04 03:53:15 +00:00
|
|
|
error("sc_get_pubkey failed");
|
|
|
|
} else {
|
2002-01-22 12:26:13 +00:00
|
|
|
Identity *id;
|
2001-07-14 02:13:49 +00:00
|
|
|
k->type = KEY_RSA1;
|
2002-01-22 12:26:13 +00:00
|
|
|
id = lookup_identity(k, 1);
|
|
|
|
if (id != NULL) {
|
2001-07-04 03:53:15 +00:00
|
|
|
Idtab *tab = idtab_lookup(1);
|
2002-01-22 12:26:13 +00:00
|
|
|
TAILQ_REMOVE(&tab->idlist, id, next);
|
|
|
|
free_identity(id);
|
2001-07-04 03:53:15 +00:00
|
|
|
tab->nentries--;
|
|
|
|
success = 1;
|
|
|
|
}
|
2001-07-14 02:13:49 +00:00
|
|
|
k->type = KEY_RSA;
|
2002-01-22 12:26:13 +00:00
|
|
|
id = lookup_identity(k, 2);
|
|
|
|
if (id != NULL) {
|
2001-07-04 03:53:15 +00:00
|
|
|
Idtab *tab = idtab_lookup(2);
|
2002-01-22 12:26:13 +00:00
|
|
|
TAILQ_REMOVE(&tab->idlist, id, next);
|
|
|
|
free_identity(id);
|
2001-07-04 03:53:15 +00:00
|
|
|
tab->nentries--;
|
|
|
|
success = 1;
|
|
|
|
}
|
|
|
|
key_free(k);
|
|
|
|
}
|
|
|
|
|
|
|
|
buffer_put_int(&e->output, 1);
|
|
|
|
buffer_put_char(&e->output,
|
|
|
|
success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
|
|
|
|
}
|
2001-08-06 21:57:31 +00:00
|
|
|
#endif /* SMARTCARD */
|
2001-07-04 03:53:15 +00:00
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
/* dispatch incoming messages */
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
1999-10-27 03:42:43 +00:00
|
|
|
process_message(SocketEntry *e)
|
|
|
|
{
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int msg_len;
|
|
|
|
u_int type;
|
|
|
|
u_char *cp;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (buffer_len(&e->input) < 5)
|
|
|
|
return; /* Incomplete message. */
|
2002-01-22 12:18:15 +00:00
|
|
|
cp = buffer_ptr(&e->input);
|
1999-11-24 13:26:21 +00:00
|
|
|
msg_len = GET_32BIT(cp);
|
|
|
|
if (msg_len > 256 * 1024) {
|
|
|
|
shutdown(e->fd, SHUT_RDWR);
|
|
|
|
close(e->fd);
|
|
|
|
e->type = AUTH_UNUSED;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (buffer_len(&e->input) < msg_len + 4)
|
|
|
|
return;
|
|
|
|
buffer_consume(&e->input, 4);
|
|
|
|
type = buffer_get_char(&e->input);
|
|
|
|
|
2001-07-04 03:53:15 +00:00
|
|
|
debug("type %d", type);
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (type) {
|
2000-08-23 00:46:23 +00:00
|
|
|
/* ssh1 */
|
1999-11-24 13:26:21 +00:00
|
|
|
case SSH_AGENTC_RSA_CHALLENGE:
|
2000-08-23 00:46:23 +00:00
|
|
|
process_authentication_challenge1(e);
|
|
|
|
break;
|
|
|
|
case SSH_AGENTC_REQUEST_RSA_IDENTITIES:
|
|
|
|
process_request_identities(e, 1);
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
|
|
|
case SSH_AGENTC_ADD_RSA_IDENTITY:
|
2000-08-23 00:46:23 +00:00
|
|
|
process_add_identity(e, 1);
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
|
|
|
case SSH_AGENTC_REMOVE_RSA_IDENTITY:
|
2000-08-23 00:46:23 +00:00
|
|
|
process_remove_identity(e, 1);
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
|
|
|
case SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES:
|
2000-08-23 00:46:23 +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:
|
|
|
|
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);
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
2001-07-04 03:53:15 +00:00
|
|
|
#ifdef SMARTCARD
|
|
|
|
case SSH_AGENTC_ADD_SMARTCARD_KEY:
|
|
|
|
process_add_smartcard_key(e);
|
2001-12-21 03:45:46 +00:00
|
|
|
break;
|
2001-07-04 03:53:15 +00:00
|
|
|
case SSH_AGENTC_REMOVE_SMARTCARD_KEY:
|
|
|
|
process_remove_smartcard_key(e);
|
2001-12-21 03:45:46 +00:00
|
|
|
break;
|
2001-08-06 21:57:31 +00:00
|
|
|
#endif /* SMARTCARD */
|
1999-11-24 13:26:21 +00:00
|
|
|
default:
|
|
|
|
/* Unknown message. Respond with failure. */
|
|
|
|
error("Unknown message %d", type);
|
|
|
|
buffer_clear(&e->input);
|
|
|
|
buffer_put_int(&e->output, 1);
|
|
|
|
buffer_put_char(&e->output, SSH_AGENT_FAILURE);
|
|
|
|
break;
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2001-12-06 16:32:47 +00:00
|
|
|
new_socket(sock_type type, int fd)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int i, old_alloc;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)
|
|
|
|
error("fcntl O_NONBLOCK: %s", strerror(errno));
|
|
|
|
|
|
|
|
if (fd > max_fd)
|
|
|
|
max_fd = fd;
|
|
|
|
|
|
|
|
for (i = 0; i < sockets_alloc; i++)
|
|
|
|
if (sockets[i].type == AUTH_UNUSED) {
|
|
|
|
sockets[i].fd = fd;
|
|
|
|
sockets[i].type = type;
|
|
|
|
buffer_init(&sockets[i].input);
|
|
|
|
buffer_init(&sockets[i].output);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
old_alloc = sockets_alloc;
|
|
|
|
sockets_alloc += 10;
|
|
|
|
if (sockets)
|
|
|
|
sockets = xrealloc(sockets, sockets_alloc * sizeof(sockets[0]));
|
|
|
|
else
|
|
|
|
sockets = xmalloc(sockets_alloc * sizeof(sockets[0]));
|
|
|
|
for (i = old_alloc; i < sockets_alloc; i++)
|
|
|
|
sockets[i].type = AUTH_UNUSED;
|
|
|
|
sockets[old_alloc].type = type;
|
|
|
|
sockets[old_alloc].fd = fd;
|
|
|
|
buffer_init(&sockets[old_alloc].input);
|
|
|
|
buffer_init(&sockets[old_alloc].output);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static int
|
2001-07-18 15:58:08 +00:00
|
|
|
prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, int *nallocp)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2001-01-22 05:34:40 +00:00
|
|
|
u_int i, sz;
|
|
|
|
int n = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < sockets_alloc; i++) {
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (sockets[i].type) {
|
|
|
|
case AUTH_SOCKET:
|
|
|
|
case AUTH_CONNECTION:
|
2001-01-22 05:34:40 +00:00
|
|
|
n = MAX(n, sockets[i].fd);
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
|
|
|
case AUTH_UNUSED:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fatal("Unknown socket type %d", sockets[i].type);
|
|
|
|
break;
|
|
|
|
}
|
2001-01-22 05:34:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sz = howmany(n+1, NFDBITS) * sizeof(fd_mask);
|
2001-07-18 15:58:08 +00:00
|
|
|
if (*fdrp == NULL || sz > *nallocp) {
|
2001-01-22 05:34:40 +00:00
|
|
|
if (*fdrp)
|
2001-04-04 01:53:20 +00:00
|
|
|
xfree(*fdrp);
|
2001-01-22 05:34:40 +00:00
|
|
|
if (*fdwp)
|
2001-04-04 01:53:20 +00:00
|
|
|
xfree(*fdwp);
|
2001-01-22 05:34:40 +00:00
|
|
|
*fdrp = xmalloc(sz);
|
|
|
|
*fdwp = xmalloc(sz);
|
2001-07-18 15:58:08 +00:00
|
|
|
*nallocp = sz;
|
2001-01-22 05:34:40 +00:00
|
|
|
}
|
2001-07-18 15:58:08 +00:00
|
|
|
if (n < *fdl)
|
|
|
|
debug("XXX shrink: %d < %d", n, *fdl);
|
|
|
|
*fdl = n;
|
2001-01-22 05:34:40 +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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (1);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
1999-11-24 13:26:21 +00:00
|
|
|
after_select(fd_set *readset, fd_set *writeset)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int i;
|
1999-11-24 13:26:21 +00:00
|
|
|
int len, sock;
|
2000-03-17 12:40:15 +00:00
|
|
|
socklen_t slen;
|
1999-11-24 13:26:21 +00:00
|
|
|
char buf[1024];
|
|
|
|
struct sockaddr_un sunaddr;
|
|
|
|
|
|
|
|
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-17 12:40:15 +00:00
|
|
|
slen = sizeof(sunaddr);
|
2001-01-22 05:34:40 +00:00
|
|
|
sock = accept(sockets[i].fd,
|
|
|
|
(struct sockaddr *) &sunaddr, &slen);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (sock < 0) {
|
2002-02-08 11:05:41 +00:00
|
|
|
error("accept from AUTH_SOCKET: %s",
|
|
|
|
strerror(errno));
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
new_socket(AUTH_CONNECTION, sock);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case AUTH_CONNECTION:
|
|
|
|
if (buffer_len(&sockets[i].output) > 0 &&
|
|
|
|
FD_ISSET(sockets[i].fd, writeset)) {
|
2001-03-06 03:31:34 +00:00
|
|
|
do {
|
|
|
|
len = write(sockets[i].fd,
|
|
|
|
buffer_ptr(&sockets[i].output),
|
|
|
|
buffer_len(&sockets[i].output));
|
|
|
|
if (len == -1 && (errno == EAGAIN ||
|
|
|
|
errno == EINTR))
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
} while (1);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (len <= 0) {
|
|
|
|
shutdown(sockets[i].fd, SHUT_RDWR);
|
|
|
|
close(sockets[i].fd);
|
|
|
|
sockets[i].type = AUTH_UNUSED;
|
2000-04-21 05:55:20 +00:00
|
|
|
buffer_free(&sockets[i].input);
|
|
|
|
buffer_free(&sockets[i].output);
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
buffer_consume(&sockets[i].output, len);
|
|
|
|
}
|
|
|
|
if (FD_ISSET(sockets[i].fd, readset)) {
|
2001-03-06 03:31:34 +00:00
|
|
|
do {
|
|
|
|
len = read(sockets[i].fd, buf, sizeof(buf));
|
|
|
|
if (len == -1 && (errno == EAGAIN ||
|
|
|
|
errno == EINTR))
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
} while (1);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (len <= 0) {
|
|
|
|
shutdown(sockets[i].fd, SHUT_RDWR);
|
|
|
|
close(sockets[i].fd);
|
|
|
|
sockets[i].type = AUTH_UNUSED;
|
2000-04-21 05:55:20 +00:00
|
|
|
buffer_free(&sockets[i].input);
|
|
|
|
buffer_free(&sockets[i].output);
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
buffer_append(&sockets[i].input, buf, len);
|
|
|
|
process_message(&sockets[i]);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fatal("Unknown type %d", sockets[i].type);
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2002-02-08 11:05:41 +00:00
|
|
|
cleanup_socket(void *p)
|
1999-10-28 23:47:09 +00:00
|
|
|
{
|
2001-01-26 05:10:34 +00:00
|
|
|
if (socket_name[0])
|
|
|
|
unlink(socket_name);
|
|
|
|
if (socket_dir[0])
|
|
|
|
rmdir(socket_dir);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
1999-10-28 23:47:09 +00:00
|
|
|
cleanup_exit(int i)
|
|
|
|
{
|
2002-02-08 11:05:41 +00:00
|
|
|
cleanup_socket(NULL);
|
1999-11-24 13:26:21 +00:00
|
|
|
exit(i);
|
1999-10-28 23:47:09 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2001-01-26 05:10:34 +00:00
|
|
|
cleanup_handler(int sig)
|
|
|
|
{
|
2002-02-08 11:05:41 +00:00
|
|
|
cleanup_socket(NULL);
|
2001-01-26 05:10:34 +00:00
|
|
|
_exit(2);
|
|
|
|
}
|
|
|
|
|
2001-07-22 20:44:00 +00:00
|
|
|
static void
|
|
|
|
check_parent_exists(int sig)
|
|
|
|
{
|
|
|
|
int save_errno = errno;
|
|
|
|
|
|
|
|
if (parent_pid != -1 && kill(parent_pid, 0) < 0) {
|
|
|
|
/* printf("Parent has died - Authentication agent exiting.\n"); */
|
|
|
|
cleanup_handler(sig); /* safe */
|
|
|
|
}
|
|
|
|
signal(SIGALRM, check_parent_exists);
|
|
|
|
alarm(10);
|
|
|
|
errno = save_errno;
|
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2001-02-10 23:13:41 +00:00
|
|
|
usage(void)
|
1999-10-28 23:47:09 +00:00
|
|
|
{
|
2001-08-06 22:06:35 +00:00
|
|
|
fprintf(stderr, "Usage: %s [options] [command [args ...]]\n",
|
2001-01-24 14:06:28 +00:00
|
|
|
__progname);
|
2001-08-06 22:06:35 +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");
|
1999-11-24 13:26:21 +00:00
|
|
|
exit(1);
|
1999-10-28 23:47:09 +00:00
|
|
|
}
|
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
int
|
|
|
|
main(int ac, char **av)
|
|
|
|
{
|
2001-07-18 15:58:08 +00:00
|
|
|
int sock, c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0, ch, nalloc;
|
1999-11-24 13:26:21 +00:00
|
|
|
struct sockaddr_un sunaddr;
|
2000-12-27 04:57:41 +00:00
|
|
|
#ifdef HAVE_SETRLIMIT
|
2000-12-02 19:03:54 +00:00
|
|
|
struct rlimit rlim;
|
2001-05-03 22:59:24 +00:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_CYGWIN
|
|
|
|
int prev_mask;
|
2000-12-27 04:57:41 +00:00
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
pid_t pid;
|
|
|
|
char *shell, *format, *pidstr, pidstrbuf[1 + 3 * sizeof pid];
|
2000-05-17 12:53:33 +00:00
|
|
|
extern int optind;
|
2001-01-22 05:34:40 +00:00
|
|
|
fd_set *readsetp = NULL, *writesetp = NULL;
|
2000-12-14 00:04:08 +00:00
|
|
|
|
2001-03-29 00:29:54 +00:00
|
|
|
SSLeay_add_all_algorithms();
|
|
|
|
|
2000-11-17 03:47:20 +00:00
|
|
|
__progname = get_progname(av[0]);
|
2000-07-09 12:42:32 +00:00
|
|
|
init_rng();
|
2001-03-18 22:38:15 +00:00
|
|
|
seed_rng();
|
2001-02-05 12:42:17 +00:00
|
|
|
|
2000-04-20 13:12:58 +00:00
|
|
|
#ifdef __GNU_LIBRARY__
|
2001-07-04 03:48:02 +00:00
|
|
|
while ((ch = getopt(ac, av, "+cdks")) != -1) {
|
2000-04-20 13:12:58 +00:00
|
|
|
#else /* __GNU_LIBRARY__ */
|
2001-07-04 03:48:02 +00:00
|
|
|
while ((ch = getopt(ac, av, "cdks")) != -1) {
|
2000-04-20 13:12:58 +00:00
|
|
|
#endif /* __GNU_LIBRARY__ */
|
1999-11-24 13:26:21 +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;
|
2001-07-04 03:48:02 +00:00
|
|
|
case 'd':
|
|
|
|
if (d_flag)
|
|
|
|
usage();
|
|
|
|
d_flag++;
|
|
|
|
break;
|
1999-11-24 13:26:21 +00:00
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
}
|
1999-10-28 23:47:09 +00:00
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
ac -= optind;
|
|
|
|
av += optind;
|
|
|
|
|
2001-07-04 03:48:02 +00:00
|
|
|
if (ac > 0 && (c_flag || k_flag || s_flag || d_flag))
|
1999-11-24 13:26:21 +00:00
|
|
|
usage();
|
|
|
|
|
2001-07-04 03:48:02 +00:00
|
|
|
if (ac == 0 && !c_flag && !k_flag && !s_flag && !d_flag) {
|
1999-11-24 13:26:21 +00:00
|
|
|
shell = getenv("SHELL");
|
|
|
|
if (shell != NULL && strncmp(shell + strlen(shell) - 3, "csh", 3) == 0)
|
|
|
|
c_flag = 1;
|
1999-10-28 23:47:09 +00:00
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
if (k_flag) {
|
|
|
|
pidstr = getenv(SSH_AGENTPID_ENV_NAME);
|
|
|
|
if (pidstr == NULL) {
|
|
|
|
fprintf(stderr, "%s not set, cannot kill agent\n",
|
2001-01-22 05:34:40 +00:00
|
|
|
SSH_AGENTPID_ENV_NAME);
|
1999-11-24 13:26:21 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
pid = atoi(pidstr);
|
2001-01-22 05:34:40 +00:00
|
|
|
if (pid < 1) {
|
1999-11-24 13:26:21 +00:00
|
|
|
fprintf(stderr, "%s=\"%s\", which is not a good PID\n",
|
2001-01-22 05:34:40 +00:00
|
|
|
SSH_AGENTPID_ENV_NAME, pidstr);
|
1999-11-24 13:26:21 +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);
|
|
|
|
printf("echo Agent pid %d killed;\n", pid);
|
|
|
|
exit(0);
|
1999-10-28 23:47:09 +00:00
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
parent_pid = getpid();
|
|
|
|
|
|
|
|
/* Create private directory for agent socket */
|
|
|
|
strlcpy(socket_dir, "/tmp/ssh-XXXXXXXX", sizeof socket_dir);
|
|
|
|
if (mkdtemp(socket_dir) == NULL) {
|
|
|
|
perror("mkdtemp: private socket dir");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
snprintf(socket_name, sizeof socket_name, "%s/agent.%d", socket_dir,
|
2001-01-22 05:34:40 +00:00
|
|
|
parent_pid);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Create socket early so it will exist before command gets run from
|
|
|
|
* the parent.
|
|
|
|
*/
|
1999-11-24 13:26:21 +00:00
|
|
|
sock = socket(AF_UNIX, SOCK_STREAM, 0);
|
|
|
|
if (sock < 0) {
|
|
|
|
perror("socket");
|
|
|
|
cleanup_exit(1);
|
|
|
|
}
|
|
|
|
memset(&sunaddr, 0, sizeof(sunaddr));
|
|
|
|
sunaddr.sun_family = AF_UNIX;
|
|
|
|
strlcpy(sunaddr.sun_path, socket_name, sizeof(sunaddr.sun_path));
|
2001-05-03 22:59:24 +00:00
|
|
|
#ifdef HAVE_CYGWIN
|
|
|
|
prev_mask = umask(0177);
|
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) {
|
|
|
|
perror("bind");
|
2001-05-03 22:59:24 +00:00
|
|
|
#ifdef HAVE_CYGWIN
|
|
|
|
umask(prev_mask);
|
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
cleanup_exit(1);
|
|
|
|
}
|
2001-05-03 22:59:24 +00:00
|
|
|
#ifdef HAVE_CYGWIN
|
|
|
|
umask(prev_mask);
|
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
if (listen(sock, 5) < 0) {
|
|
|
|
perror("listen");
|
|
|
|
cleanup_exit(1);
|
1999-10-28 23:47:09 +00:00
|
|
|
}
|
2001-01-22 05:34:40 +00:00
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Fork, and have the parent execute the command, if any, or present
|
|
|
|
* the socket data. The child continues as the authentication agent.
|
|
|
|
*/
|
2001-07-04 03:48:02 +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);
|
|
|
|
printf("echo Agent pid %d;\n", parent_pid);
|
|
|
|
goto skip;
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
pid = fork();
|
|
|
|
if (pid == -1) {
|
|
|
|
perror("fork");
|
2002-02-08 11:05:41 +00:00
|
|
|
cleanup_exit(1);
|
1999-10-28 23:47:09 +00:00
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
if (pid != 0) { /* Parent - execute the given command. */
|
|
|
|
close(sock);
|
|
|
|
snprintf(pidstrbuf, sizeof pidstrbuf, "%d", pid);
|
|
|
|
if (ac == 0) {
|
|
|
|
format = c_flag ? "setenv %s %s;\n" : "%s=%s; export %s;\n";
|
|
|
|
printf(format, SSH_AUTHSOCKET_ENV_NAME, socket_name,
|
2001-01-22 05:34:40 +00:00
|
|
|
SSH_AUTHSOCKET_ENV_NAME);
|
1999-11-24 13:26:21 +00:00
|
|
|
printf(format, SSH_AGENTPID_ENV_NAME, pidstrbuf,
|
2001-01-22 05:34:40 +00:00
|
|
|
SSH_AGENTPID_ENV_NAME);
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("echo Agent pid %d;\n", pid);
|
|
|
|
exit(0);
|
|
|
|
}
|
2000-09-16 02:29:08 +00:00
|
|
|
if (setenv(SSH_AUTHSOCKET_ENV_NAME, socket_name, 1) == -1 ||
|
|
|
|
setenv(SSH_AGENTPID_ENV_NAME, pidstrbuf, 1) == -1) {
|
|
|
|
perror("setenv");
|
|
|
|
exit(1);
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
execvp(av[0], av);
|
|
|
|
perror(av[0]);
|
|
|
|
exit(1);
|
|
|
|
}
|
2002-02-08 11:05:41 +00:00
|
|
|
/* child */
|
|
|
|
log_init(__progname, SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_AUTH, 0);
|
2001-07-22 20:40:24 +00:00
|
|
|
|
|
|
|
if (setsid() == -1) {
|
2002-02-08 11:05:41 +00:00
|
|
|
error("setsid: %s", strerror(errno));
|
2001-07-22 20:40:24 +00:00
|
|
|
cleanup_exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
(void)chdir("/");
|
1999-11-24 13:26:21 +00:00
|
|
|
close(0);
|
|
|
|
close(1);
|
|
|
|
close(2);
|
1999-10-28 23:47:09 +00:00
|
|
|
|
2000-12-27 04:57:41 +00:00
|
|
|
#ifdef HAVE_SETRLIMIT
|
2000-12-02 19:03:54 +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-02-08 11:05:41 +00:00
|
|
|
error("setrlimit RLIMIT_CORE: %s", strerror(errno));
|
2000-12-02 19:03:54 +00:00
|
|
|
cleanup_exit(1);
|
|
|
|
}
|
2000-12-27 04:57:41 +00:00
|
|
|
#endif
|
2001-07-04 03:48:02 +00:00
|
|
|
|
|
|
|
skip:
|
2002-02-08 11:05:41 +00:00
|
|
|
fatal_add_cleanup(cleanup_socket, NULL);
|
1999-11-24 13:26:21 +00:00
|
|
|
new_socket(AUTH_SOCKET, sock);
|
|
|
|
if (ac > 0) {
|
|
|
|
signal(SIGALRM, check_parent_exists);
|
|
|
|
alarm(10);
|
|
|
|
}
|
2000-08-23 00:46:23 +00:00
|
|
|
idtab_init();
|
2001-07-14 02:12:55 +00:00
|
|
|
if (!d_flag)
|
2001-07-04 03:48:02 +00:00
|
|
|
signal(SIGINT, SIG_IGN);
|
2001-07-14 02:12:55 +00:00
|
|
|
signal(SIGPIPE, SIG_IGN);
|
2001-01-26 05:10:34 +00:00
|
|
|
signal(SIGHUP, cleanup_handler);
|
|
|
|
signal(SIGTERM, cleanup_handler);
|
2001-07-18 15:58:08 +00:00
|
|
|
nalloc = 0;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
while (1) {
|
2001-07-18 15:58:08 +00:00
|
|
|
prepare_select(&readsetp, &writesetp, &max_fd, &nalloc);
|
2001-01-22 05:34:40 +00:00
|
|
|
if (select(max_fd + 1, readsetp, writesetp, NULL, NULL) < 0) {
|
1999-11-24 13:26:21 +00:00
|
|
|
if (errno == EINTR)
|
|
|
|
continue;
|
2002-02-08 11:05:41 +00:00
|
|
|
fatal("select: %s", strerror(errno));
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2001-01-22 05:34:40 +00:00
|
|
|
after_select(readsetp, writesetp);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
/* NOTREACHED */
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|