src/usr.bin/ssh/ssh.c - diff

Return to ssh.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh.c between version 1.249.2.3 and 1.250

version 1.249.2.3, 2006/11/08 00:44:05

version 1.250, 2005/09/13 23:40:07

Line 1

/* $OpenBSD$ */

* Author: Tatu Ylonen <ylo@cs.hut.fi>

Line 40

Line 39

* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include <sys/types.h>

#include "includes.h"

#include <sys/time.h>

RCSID("$OpenBSD$");

#include <sys/resource.h>

#include <sys/ioctl.h>

#include <sys/types.h>

#include <sys/socket.h>

#include <sys/un.h>

#include <sys/stat.h>

#include <ctype.h>

#include <errno.h>

#include <fcntl.h>

#include <netdb.h>

#include <paths.h>

#include <pwd.h>

#include <signal.h>

#include <stddef.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>

#include <openssl/evp.h>

#include <openssl/err.h>

#include "xmalloc.h"

#include "ssh.h"

#include "ssh1.h"

#include "ssh2.h"

#include "compat.h"

#include "cipher.h"

#include "xmalloc.h"

#include "packet.h"

#include "buffer.h"

#include "bufaux.h"

#include "channels.h"

#include "key.h"

#include "authfd.h"

Line 91

Line 72

#include "msg.h"

#include "monitor_fdpass.h"

#include "uidswap.h"

#include "version.h"

#ifdef SMARTCARD

#include "scard.h"

Line 178

Line 158

{

fprintf(stderr,

"usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"

" [-D [bind_address:]port] [-e escape_char] [-F configfile]\n"

" [-D port] [-e escape_char] [-F configfile]\n"

" [-i identity_file] [-L [bind_address:]port:host:hostport]\n"

" [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"

" [-R [bind_address:]port:host:hostport] [-S ctl_path]\n"

" [-w local_tun[:remote_tun]] [user@]hostname [command]\n"

" [user@]hostname [command]\n"

);

exit(255);

exit(1);

}

static int ssh_session(void);

Line 238

Line 218

pw = getpwuid(original_real_uid);

if (!pw) {

logit("You don't exist, go away!");

exit(255);

exit(1);

}

/* Take a copy of the returned structure. */

pw = pwcopy(pw);

Line 257

Line 237

/* Parse command-line arguments. */

host = NULL;

again:

while ((opt = getopt(ac, av,

"1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {

"1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVXY")) != -1) {

switch (opt) {

case '1':

options.protocol = SSH_PROTO_1;

Line 355

Line 335

if (opt == 'V')

exit(0);

break;

case 'w':

if (options.tun_open == -1)

options.tun_open = SSH_TUNMODE_DEFAULT;

options.tun_local = a2tun(optarg, &options.tun_remote);

if (options.tun_local == SSH_TUNID_ERR) {

fprintf(stderr, "Bad tun device '%s'\n", optarg);

exit(255);

}

break;

case 'q':

options.log_level = SYSLOG_LEVEL_QUIET;

break;

Line 379

Line 350

else {

fprintf(stderr, "Bad escape character '%s'.\n",

optarg);

exit(255);

exit(1);

}

break;

case 'c':

Line 394

Line 365

fprintf(stderr,

"Unknown cipher type '%s'\n",

optarg);

exit(255);

exit(1);

}

if (options.cipher == SSH_CIPHER_3DES)

options.ciphers = "3des-cbc";

Line 410

Line 381

else {

fprintf(stderr, "Unknown mac type '%s'\n",

optarg);

exit(255);

exit(1);

}

break;

case 'M':

Line 423

Line 394

options.port = a2port(optarg);

if (options.port == 0) {

fprintf(stderr, "Bad port '%s'\n", optarg);

exit(255);

exit(1);

}

break;

case 'l':

Line 437

Line 408

fprintf(stderr,

"Bad local forwarding specification '%s'\n",

optarg);

exit(255);

exit(1);

}

break;

Line 448

Line 419

fprintf(stderr,

"Bad remote forwarding specification "

"'%s'\n", optarg);

exit(255);

exit(1);

}

break;

Line 459

Line 430

if ((fwd.listen_host = hpdelim(&cp)) == NULL) {

fprintf(stderr, "Bad dynamic forwarding "

"specification '%.100s'\n", optarg);

exit(255);

exit(1);

}

if (cp != NULL) {

fwd.listen_port = a2port(cp);

Line 472

Line 443

if (fwd.listen_port == 0) {

fprintf(stderr, "Bad dynamic port '%s'\n",

optarg);

exit(255);

exit(1);

}

add_local_forward(&options, &fwd);

xfree(p);

Line 493

Line 464

line = xstrdup(optarg);

if (process_config_line(&options, host ? host : "",

line, "command-line", 0, &dummy) != 0)

exit(255);

exit(1);

xfree(line);

break;

case 's':

Line 629

Line 600

if (options.host_key_alias != NULL) {

for (p = options.host_key_alias; *p; p++)

if (isupper(*p))

*p = (char)tolower(*p);

*p = tolower(*p);

}

/* Get default port if port has not been set. */

Line 646

Line 617

options.control_path = NULL;

if (options.control_path != NULL) {

char thishost[NI_MAXHOST];

if (gethostname(thishost, sizeof(thishost)) == -1)

fatal("gethostname: %s", strerror(errno));

snprintf(buf, sizeof(buf), "%d", options.port);

cp = tilde_expand_filename(options.control_path,

original_real_uid);

options.control_path = percent_expand(cp, "p", buf, "h", host,

"r", options.user, "l", thishost, (char *)NULL);

"r", options.user, (char *)NULL);

xfree(cp);

}

if (mux_command != 0 && options.control_path == NULL)

Line 667

Line 634

options.address_family, options.connection_attempts,

original_effective_uid == 0 && options.use_privileged_port,

options.proxy_command) != 0)

exit(255);

exit(1);

* If we successfully made the connection, load the host private key

Line 683

Line 650

if (options.rhosts_rsa_authentication ||

options.hostbased_authentication) {

sensitive_data.nkeys = 3;

sensitive_data.keys = xcalloc(sensitive_data.nkeys,

sensitive_data.keys = xmalloc(sensitive_data.nkeys *

sizeof(Key));

PRIV_START;

sensitive_data.keys[0] = key_load_private_type(KEY_RSA1,

_PATH_HOST_KEY_FILE, "", NULL, NULL);

_PATH_HOST_KEY_FILE, "", NULL);

sensitive_data.keys[1] = key_load_private_type(KEY_DSA,

_PATH_HOST_DSA_KEY_FILE, "", NULL, NULL);

_PATH_HOST_DSA_KEY_FILE, "", NULL);

sensitive_data.keys[2] = key_load_private_type(KEY_RSA,

_PATH_HOST_RSA_KEY_FILE, "", NULL, NULL);

_PATH_HOST_RSA_KEY_FILE, "", NULL);

PRIV_END;

if (options.hostbased_authentication == 1 &&

Line 720

Line 687

* Now that we are back to our own permissions, create ~/.ssh

* directory if it doesn't already exist.

* directory if it doesn\'t already exist.

snprintf(buf, sizeof buf, "%.100s%s%.100s", pw->pw_dir, strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR);

if (stat(buf, &st) < 0)

Line 808

Line 775

options.local_forwards[i].connect_port,

options.gateway_ports);

}

if (i > 0 && success != i && options.exit_on_forward_failure)

fatal("Could not request local forwarding.");

if (i > 0 && success == 0)

error("Could not request local forwarding.");

Line 818

Line 783

debug("Remote connections from %.200s:%d forwarded to "

"local address %.200s:%d",

(options.remote_forwards[i].listen_host == NULL) ?

"LOCALHOST" : options.remote_forwards[i].listen_host,

(options.gateway_ports ? "*" : "LOCALHOST") :

options.remote_forwards[i].listen_host,

options.remote_forwards[i].listen_port,

options.remote_forwards[i].connect_host,

options.remote_forwards[i].connect_port);

if (channel_request_remote_forwarding(

channel_request_remote_forwarding(

options.remote_forwards[i].listen_host,

options.remote_forwards[i].listen_port,

options.remote_forwards[i].connect_host,

options.remote_forwards[i].connect_port) < 0) {

options.remote_forwards[i].connect_port);

if (options.exit_on_forward_failure)

fatal("Could not request remote forwarding.");

else

logit("Warning: Could not request remote "

"forwarding.");

}

Line 840

Line 800

check_agent_present(void)

{

if (options.forward_agent) {

/* Clear agent forwarding if we don't have an agent. */

/* Clear agent forwarding if we don\'t have an agent. */

if (!ssh_agent_present())

options.forward_agent = 0;

}

Line 893

Line 853

/* Store window size in the packet. */

if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) < 0)

memset(&ws, 0, sizeof(ws));

packet_put_int((u_int)ws.ws_row);

packet_put_int(ws.ws_row);

packet_put_int((u_int)ws.ws_col);

packet_put_int(ws.ws_col);

packet_put_int((u_int)ws.ws_xpixel);

packet_put_int(ws.ws_xpixel);

packet_put_int((u_int)ws.ws_ypixel);

packet_put_int(ws.ws_ypixel);

/* Store tty modes in the packet. */

tty_make_modes(fileno(stdin), NULL);

Line 1014

Line 974

options.remote_forwards[i].listen_port,

options.remote_forwards[i].connect_host,

options.remote_forwards[i].connect_port);

if (type == SSH2_MSG_REQUEST_FAILURE) {

if (type == SSH2_MSG_REQUEST_FAILURE)

if (options.exit_on_forward_failure)

logit("Warning: remote port forwarding failed for listen "

fatal("Error: remote port forwarding failed for "

"port %d", options.remote_forwards[i].listen_port);

"listen port %d",

options.remote_forwards[i].listen_port);

else

logit("Warning: remote port forwarding failed for "

"listen port %d",

options.remote_forwards[i].listen_port);

}

static void

Line 1048

Line 1001

fatal("ControlPath too long");

if ((control_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)

fatal("%s socket(): %s", __func__, strerror(errno));

fatal("%s socket(): %s\n", __func__, strerror(errno));

old_umask = umask(0177);

if (bind(control_fd, (struct sockaddr *)&addr, addr.sun_len) == -1) {

if (bind(control_fd, (struct sockaddr*)&addr, addr.sun_len) == -1) {

control_fd = -1;

if (errno == EINVAL || errno == EADDRINUSE)

fatal("ControlSocket %s already exists",

options.control_path);

else

fatal("%s bind(): %s", __func__, strerror(errno));

fatal("%s bind(): %s\n", __func__, strerror(errno));

}

umask(old_umask);

if (listen(control_fd, 64) == -1)

fatal("%s listen(): %s", __func__, strerror(errno));

fatal("%s listen(): %s\n", __func__, strerror(errno));

set_nonblock(control_fd);

}

Line 1095

Line 1048

packet_send();

}

if (options.tun_open != SSH_TUNMODE_NO) {

Channel *c;

int fd;

debug("Requesting tun.");

if ((fd = tun_open(options.tun_local,

options.tun_open)) >= 0) {

c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1,

CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT,

0, "tun", 1);

c->datagram = 1;

packet_start(SSH2_MSG_CHANNEL_OPEN);

packet_put_cstring("tun@openssh.com");

packet_put_int(c->self);

packet_put_int(c->local_window_max);

packet_put_int(c->local_maxpacket);

packet_put_int(options.tun_open);

packet_put_int(options.tun_remote);

packet_send();

}

client_session2_setup(id, tty_flag, subsystem_flag, getenv("TERM"),

NULL, fileno(stdin), &command, environ, &ssh_subsystem_reply);

Line 1181

Line 1112

if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN))

id = ssh_session2_open();

/* Execute a local command */

if (options.local_command != NULL &&

options.permit_local_command)

ssh_local_cmd(options.local_command);

/* If requested, let ssh continue in the background. */

if (fork_after_authentication_flag)

if (daemon(1, 1) < 0)

Line 1198

Line 1124

static void

load_public_identity_files(void)

{

char *filename, *cp, thishost[NI_MAXHOST];

char *filename;

int i = 0;

Key *public;

struct passwd *pw;

#ifdef SMARTCARD

Key **keys;

if (options.smartcard_device != NULL &&

options.num_identity_files < SSH_MAX_IDENTITY_FILES &&

(keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {

(keys = sc_get_keys(options.smartcard_device, NULL)) != NULL ) {

int count = 0;

for (i = 0; keys[i] != NULL; i++) {

count++;

Line 1225

Line 1150

xfree(keys);

}

#endif /* SMARTCARD */

if ((pw = getpwuid(original_real_uid)) == NULL)

fatal("load_public_identity_files: getpwuid failed");

if (gethostname(thishost, sizeof(thishost)) == -1)

fatal("load_public_identity_files: gethostname: %s",

strerror(errno));

for (; i < options.num_identity_files; i++) {

cp = tilde_expand_filename(options.identity_files[i],

filename = tilde_expand_filename(options.identity_files[i],

original_real_uid);

filename = percent_expand(cp, "d", pw->pw_dir,

"u", pw->pw_name, "l", thishost, "h", host,

"r", options.user, (char *)NULL);

xfree(cp);

public = key_load_public(filename, NULL);

debug("identity file %s type %d", filename,

public ? public->type : -1);

Line 1262

Line 1178

static int

env_permitted(char *env)

{

int i, ret;

int i;

char name[1024], *cp;

if ((cp = strchr(env, '=')) == NULL || cp == env)

strlcpy(name, env, sizeof(name));

if ((cp = strchr(name, '=')) == NULL)

return (0);

ret = snprintf(name, sizeof(name), "%.*s", (int)(cp - env), env);

if (ret <= 0 || (size_t)ret >= sizeof(name))

fatal("env_permitted: name '%.100s...' too long", env);

*cp = '\0';

for (i = 0; i < options.num_send_env; i++)

if (match_pattern(name, options.send_env[i]))

return (1);

Line 1314

Line 1230

if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)

fatal("%s socket(): %s", __func__, strerror(errno));

if (connect(sock, (struct sockaddr *)&addr, addr.sun_len) == -1) {

if (connect(sock, (struct sockaddr*)&addr, addr.sun_len) == -1) {

if (mux_command != SSHMUX_COMMAND_OPEN) {

fatal("Control socket connect(%.100s): %s", path,

strerror(errno));

}

if (errno == ENOENT)

debug("Control socket \"%.100s\" does not exist", path);

else {

error("Control socket connect(%.100s): %s", path,

strerror(errno));

}

close(sock);

return;

}

if (stdin_null_flag) {

if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1)

fatal("open(/dev/null): %s", strerror(errno));

if (dup2(fd, STDIN_FILENO) == -1)

fatal("dup2: %s", strerror(errno));

if (fd > STDERR_FILENO)

close(fd);

}

term = getenv("TERM");