1 files changed, 77 insertions, 125 deletions

diff --git a/readconf.c b/readconf.c
index 4d92d174b..41f36aa8d 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.270 2017/03/10 04:27:32 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.279 2017/09/21 19:16:53 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -152,7 +152,7 @@ typedef enum {
         oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
         oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
         oCompressionLevel, oTCPKeepAlive, oNumberOfPasswordPrompts,
-        oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs,
+        oUsePrivilegedPort, oLogFacility, oLogLevel, oCiphers, oMacs,
         oPubkeyAuthentication,
         oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
         oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
@@ -165,7 +165,8 @@ typedef enum {
         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
         oSendEnv, oControlPath, oControlMaster, oControlPersist,
         oHashKnownHosts,
-        oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
+        oTunnel, oTunnelDevice,
+        oLocalCommand, oPermitLocalCommand, oRemoteCommand,
         oVisualHostKey,
         oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
         oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
@@ -174,7 +175,7 @@ typedef enum {
         oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
         oPubkeyAcceptedKeyTypes, oProxyJump,
         oProtocolKeepAlives, oSetupTimeOut,
-        oIgnoredUnknownOption, oDeprecated, oUnsupported
+        oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported
 } OpCodes;
 
 /* Textual representations of the tokens. */
@@ -184,6 +185,8 @@ static struct {
         OpCodes opcode;
 } keywords[] = {
         /* Deprecated options */
+        { "protocol", oIgnore }, /* NB. silently ignored */
+        { "cipher", oDeprecated },
         { "fallbacktorsh", oDeprecated },
         { "globalknownhostsfile2", oDeprecated },
         { "rhostsauthentication", oDeprecated },
@@ -222,15 +225,9 @@ static struct {
         { "smartcarddevice", oUnsupported },
         { "pkcs11provider", oUnsupported },
 #endif
-#ifdef WITH_SSH1
-        { "rsaauthentication", oRSAAuthentication },
-        { "rhostsrsaauthentication", oRhostsRSAAuthentication },
-        { "compressionlevel", oCompressionLevel },
-# else
         { "rsaauthentication", oUnsupported },
         { "rhostsrsaauthentication", oUnsupported },
         { "compressionlevel", oUnsupported },
-#endif
 
         { "forwardagent", oForwardAgent },
         { "forwardx11", oForwardX11 },
@@ -259,10 +256,8 @@ static struct {
         { "hostkeyalias", oHostKeyAlias },
         { "proxycommand", oProxyCommand },
         { "port", oPort },
-        { "cipher", oCipher },
         { "ciphers", oCiphers },
         { "macs", oMacs },
-        { "protocol", oProtocol },
         { "remoteforward", oRemoteForward },
         { "localforward", oLocalForward },
         { "user", oUser },
@@ -279,6 +274,7 @@ static struct {
         { "tcpkeepalive", oTCPKeepAlive },
         { "keepalive", oTCPKeepAlive },                         /* obsolete */
         { "numberofpasswordprompts", oNumberOfPasswordPrompts },
+        { "syslogfacility", oLogFacility },
         { "loglevel", oLogLevel },
         { "dynamicforward", oDynamicForward },
         { "preferredauthentications", oPreferredAuthentications },
@@ -303,6 +299,7 @@ static struct {
         { "tunneldevice", oTunnelDevice },
         { "localcommand", oLocalCommand },
         { "permitlocalcommand", oPermitLocalCommand },
+        { "remotecommand", oRemoteCommand },
         { "visualhostkey", oVisualHostKey },
         { "kexalgorithms", oKexAlgorithms },
         { "ipqos", oIPQoS },
@@ -459,8 +456,8 @@ add_identity_file(Options *options, const char *dir, const char *filename,
 
         if (dir == NULL) /* no dir, filename is absolute */
                 path = xstrdup(filename);
-        else
-                (void)xasprintf(&path, "%.100s%.100s", dir, filename);
+        else if (xasprintf(&path, "%s%s", dir, filename) >= PATH_MAX)
+                fatal("Identity file path %s too long", path);
 
         /* Avoid registering duplicates */
         for (i = 0; i < options->num_identity_files; i++) {
@@ -770,6 +767,16 @@ static const struct multistate multistate_yesnoask[] = {
         { "ask",                        2 },
         { NULL, -1 }
 };
+static const struct multistate multistate_strict_hostkey[] = {
+        { "true",                       SSH_STRICT_HOSTKEY_YES },
+        { "false",                      SSH_STRICT_HOSTKEY_OFF },
+        { "yes",                        SSH_STRICT_HOSTKEY_YES },
+        { "no",                         SSH_STRICT_HOSTKEY_OFF },
+        { "ask",                        SSH_STRICT_HOSTKEY_ASK },
+        { "off",                        SSH_STRICT_HOSTKEY_OFF },
+        { "accept-new",                 SSH_STRICT_HOSTKEY_NEW },
+        { NULL, -1 }
+};
 static const struct multistate multistate_yesnoaskconfirm[] = {
         { "true",                       1 },
         { "false",                      0 },
@@ -845,7 +852,9 @@ process_config_line_depth(Options *options, struct passwd *pw, const char *host,
         char **cpptr, fwdarg[256];
         u_int i, *uintptr, max_entries = 0;
         int r, oactive, negated, opcode, *intptr, value, value2, cmdline = 0;
+        int remotefwd, dynamicfwd;
         LogLevel *log_level_ptr;
+        SyslogFacility *log_facility_ptr;
         long long val64;
         size_t len;
         struct Forward fwd;
@@ -886,6 +895,8 @@ process_config_line_depth(Options *options, struct passwd *pw, const char *host,
         case oBadOption:
                 /* don't panic, but count bad options */
                 return -1;
+        case oIgnore:
+                return 0;
         case oIgnoredUnknownOption:
                 debug("%s line %d: Ignored unknown option \"%s\"",
                     filename, linenum, keyword);
@@ -969,14 +980,6 @@ parse_time:
                 intptr = &options->pubkey_authentication;
                 goto parse_flag;
 
-        case oRSAAuthentication:
-                intptr = &options->rsa_authentication;
-                goto parse_flag;
-
-        case oRhostsRSAAuthentication:
-                intptr = &options->rhosts_rsa_authentication;
-                goto parse_flag;
-
         case oHostbasedAuthentication:
                 intptr = &options->hostbased_authentication;
                 goto parse_flag;
@@ -1028,7 +1031,7 @@ parse_time:
 
         case oStrictHostKeyChecking:
                 intptr = &options->strict_host_key_checking;
-                multistate_ptr = multistate_yesnoask;
+                multistate_ptr = multistate_strict_hostkey;
                 goto parse_multistate;
 
         case oCompression:
@@ -1047,10 +1050,6 @@ parse_time:
                 intptr = &options->number_of_password_prompts;
                 goto parse_int;
 
-        case oCompressionLevel:
-                intptr = &options->compression_level;
-                goto parse_int;
-
         case oRekeyLimit:
                 arg = strdelim(&s);
                 if (!arg || *arg == '\0')
@@ -1213,19 +1212,6 @@ parse_int:
                 intptr = &options->connection_attempts;
                 goto parse_int;
 
-        case oCipher:
-                intptr = &options->cipher;
-                arg = strdelim(&s);
-                if (!arg || *arg == '\0')
-                        fatal("%.200s line %d: Missing argument.", filename, linenum);
-                value = cipher_number(arg);
-                if (value == -1)
-                        fatal("%.200s line %d: Bad cipher '%s'.",
-                            filename, linenum, arg ? arg : "<NONE>");
-                if (*activep && *intptr == -1)
-                        *intptr = value;
-                break;
-
         case oCiphers:
                 arg = strdelim(&s);
                 if (!arg || *arg == '\0')
@@ -1276,19 +1262,6 @@ parse_keytypes:
                         *charptr = xstrdup(arg);
                 break;
 
-        case oProtocol:
-                intptr = &options->protocol;
-                arg = strdelim(&s);
-                if (!arg || *arg == '\0')
-                        fatal("%.200s line %d: Missing argument.", filename, linenum);
-                value = proto_spec(arg);
-                if (value == SSH_PROTO_UNKNOWN)
-                        fatal("%.200s line %d: Bad protocol spec '%s'.",
-                            filename, linenum, arg ? arg : "<NONE>");
-                if (*activep && *intptr == SSH_PROTO_UNKNOWN)
-                        *intptr = value;
-                break;
-
         case oLogLevel:
                 log_level_ptr = &options->log_level;
                 arg = strdelim(&s);
@@ -1300,6 +1273,17 @@ parse_keytypes:
                         *log_level_ptr = (LogLevel) value;
                 break;
 
+        case oLogFacility:
+                log_facility_ptr = &options->log_facility;
+                arg = strdelim(&s);
+                value = log_facility_number(arg);
+                if (value == SYSLOG_FACILITY_NOT_SET)
+                        fatal("%.200s line %d: unsupported log facility '%s'",
+                            filename, linenum, arg ? arg : "<NONE>");
+                if (*log_facility_ptr == -1)
+                        *log_facility_ptr = (SyslogFacility) value;
+                break;
+
         case oLocalForward:
         case oRemoteForward:
         case oDynamicForward:
@@ -1308,31 +1292,36 @@ parse_keytypes:
                         fatal("%.200s line %d: Missing port argument.",
                             filename, linenum);
 
-                if (opcode == oLocalForward ||
-                    opcode == oRemoteForward) {
-                        arg2 = strdelim(&s);
-                        if (arg2 == NULL || *arg2 == '\0')
-                                fatal("%.200s line %d: Missing target argument.",
-                                    filename, linenum);
+                remotefwd = (opcode == oRemoteForward);
+                dynamicfwd = (opcode == oDynamicForward);
 
-                        /* construct a string for parse_forward */
-                        snprintf(fwdarg, sizeof(fwdarg), "%s:%s", arg, arg2);
-                } else if (opcode == oDynamicForward) {
-                        strlcpy(fwdarg, arg, sizeof(fwdarg));
+                if (!dynamicfwd) {
+                        arg2 = strdelim(&s);
+                        if (arg2 == NULL || *arg2 == '\0') {
+                                if (remotefwd)
+                                        dynamicfwd = 1;
+                                else
+                                        fatal("%.200s line %d: Missing target "
+                                            "argument.", filename, linenum);
+                        } else {
+                                /* construct a string for parse_forward */
+                                snprintf(fwdarg, sizeof(fwdarg), "%s:%s", arg,
+                                    arg2);
+                        }
                 }
+                if (dynamicfwd)
+                        strlcpy(fwdarg, arg, sizeof(fwdarg));
 
-                if (parse_forward(&fwd, fwdarg,
-                    opcode == oDynamicForward ? 1 : 0,
-                    opcode == oRemoteForward ? 1 : 0) == 0)
+                if (parse_forward(&fwd, fwdarg, dynamicfwd, remotefwd) == 0)
                         fatal("%.200s line %d: Bad forwarding specification.",
                             filename, linenum);
 
                 if (*activep) {
-                        if (opcode == oLocalForward ||
-                            opcode == oDynamicForward)
-                                add_local_forward(options, &fwd);
-                        else if (opcode == oRemoteForward)
+                        if (remotefwd) {
                                 add_remote_forward(options, &fwd);
+                        } else {
+                                add_local_forward(options, &fwd);
+                        }
                 }
                 break;
 
@@ -1507,6 +1496,10 @@ parse_keytypes:
                 intptr = &options->permit_local_command;
                 goto parse_flag;
 
+        case oRemoteCommand:
+                charptr = &options->remote_command;
+                goto parse_command;
+
         case oVisualHostKey:
                 intptr = &options->visual_host_key;
                 goto parse_flag;
@@ -1831,7 +1824,6 @@ initialize_options(Options * options)
         options->fwd_opts.streamlocal_bind_mask = (mode_t)-1;
         options->fwd_opts.streamlocal_bind_unlink = -1;
         options->use_privileged_port = -1;
-        options->rsa_authentication = -1;
         options->pubkey_authentication = -1;
         options->challenge_response_authentication = -1;
         options->gss_authentication = -1;
@@ -1844,25 +1836,21 @@ initialize_options(Options * options)
         options->password_authentication = -1;
         options->kbd_interactive_authentication = -1;
         options->kbd_interactive_devices = NULL;
-        options->rhosts_rsa_authentication = -1;
         options->hostbased_authentication = -1;
         options->batch_mode = -1;
         options->check_host_ip = -1;
         options->strict_host_key_checking = -1;
         options->compression = -1;
         options->tcp_keep_alive = -1;
-        options->compression_level = -1;
         options->port = -1;
         options->address_family = -1;
         options->connection_attempts = -1;
         options->connection_timeout = -1;
         options->number_of_password_prompts = -1;
-        options->cipher = -1;
         options->ciphers = NULL;
         options->macs = NULL;
         options->kex_algorithms = NULL;
         options->hostkeyalgorithms = NULL;
-        options->protocol = SSH_PROTO_UNKNOWN;
         options->num_identity_files = 0;
         options->num_certificate_files = 0;
         options->hostname = NULL;
@@ -1880,6 +1868,7 @@ initialize_options(Options * options)
         options->num_local_forwards = 0;
         options->remote_forwards = NULL;
         options->num_remote_forwards = 0;
+        options->log_facility = SYSLOG_FACILITY_NOT_SET;
         options->log_level = SYSLOG_LEVEL_NOT_SET;
         options->preferred_authentications = NULL;
         options->bind_address = NULL;
@@ -1903,6 +1892,7 @@ initialize_options(Options * options)
         options->tun_remote = -1;
         options->local_command = NULL;
         options->permit_local_command = -1;
+        options->remote_command = NULL;
         options->add_keys_to_agent = -1;
         options->identity_agent = NULL;
         options->visual_host_key = -1;
@@ -1976,8 +1966,6 @@ fill_default_options(Options * options)
                 options->fwd_opts.streamlocal_bind_unlink = 0;
         if (options->use_privileged_port == -1)
                 options->use_privileged_port = 0;
-        if (options->rsa_authentication == -1)
-                options->rsa_authentication = 1;
         if (options->pubkey_authentication == -1)
                 options->pubkey_authentication = 1;
         if (options->challenge_response_authentication == -1)
@@ -1996,8 +1984,6 @@ fill_default_options(Options * options)
                 options->password_authentication = 1;
         if (options->kbd_interactive_authentication == -1)
                 options->kbd_interactive_authentication = 1;
-        if (options->rhosts_rsa_authentication == -1)
-                options->rhosts_rsa_authentication = 0;
         if (options->hostbased_authentication == -1)
                 options->hostbased_authentication = 0;
         if (options->batch_mode == -1)
@@ -2005,13 +1991,11 @@ fill_default_options(Options * options)
         if (options->check_host_ip == -1)
                 options->check_host_ip = 1;
         if (options->strict_host_key_checking == -1)
-                options->strict_host_key_checking = 2;  /* 2 is default */
+                options->strict_host_key_checking = SSH_STRICT_HOSTKEY_ASK;
         if (options->compression == -1)
                 options->compression = 0;
         if (options->tcp_keep_alive == -1)
                 options->tcp_keep_alive = 1;
-        if (options->compression_level == -1)
-                options->compression_level = 6;
         if (options->port == -1)
                 options->port = 0;      /* Filled in ssh_connect. */
         if (options->address_family == -1)
@@ -2020,31 +2004,17 @@ fill_default_options(Options * options)
                 options->connection_attempts = 1;
         if (options->number_of_password_prompts == -1)
                 options->number_of_password_prompts = 3;
-        /* Selected in ssh_login(). */
-        if (options->cipher == -1)
-                options->cipher = SSH_CIPHER_NOT_SET;
         /* options->hostkeyalgorithms, default set in myproposals.h */
-        if (options->protocol == SSH_PROTO_UNKNOWN)
-                options->protocol = SSH_PROTO_2;
         if (options->add_keys_to_agent == -1)
                 options->add_keys_to_agent = 0;
         if (options->num_identity_files == 0) {
-                if (options->protocol & SSH_PROTO_1) {
-                        add_identity_file(options, "~/",
-                            _PATH_SSH_CLIENT_IDENTITY, 0);
-                }
-                if (options->protocol & SSH_PROTO_2) {
-                        add_identity_file(options, "~/",
-                            _PATH_SSH_CLIENT_ID_RSA, 0);
-                        add_identity_file(options, "~/",
-                            _PATH_SSH_CLIENT_ID_DSA, 0);
+                add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA, 0);
+                add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_DSA, 0);
 #ifdef OPENSSL_HAS_ECC
-                        add_identity_file(options, "~/",
-                            _PATH_SSH_CLIENT_ID_ECDSA, 0);
+                add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA, 0);
 #endif
-                        add_identity_file(options, "~/",
-                            _PATH_SSH_CLIENT_ID_ED25519, 0);
-                }
+                add_identity_file(options, "~/",
+                    _PATH_SSH_CLIENT_ID_ED25519, 0);
         }
         if (options->escape_char == -1)
                 options->escape_char = '~';
@@ -2062,6 +2032,8 @@ fill_default_options(Options * options)
         }
         if (options->log_level == SYSLOG_LEVEL_NOT_SET)
                 options->log_level = SYSLOG_LEVEL_INFO;
+        if (options->log_facility == SYSLOG_FACILITY_NOT_SET)
+                options->log_facility = SYSLOG_FACILITY_USER;
         if (options->no_host_authentication_for_localhost == - 1)
                 options->no_host_authentication_for_localhost = 0;
         if (options->identities_only == -1)
@@ -2136,6 +2108,7 @@ fill_default_options(Options * options)
                 } \
         } while(0)
         CLEAR_ON_NONE(options->local_command);
+        CLEAR_ON_NONE(options->remote_command);
         CLEAR_ON_NONE(options->proxy_command);
         CLEAR_ON_NONE(options->control_path);
         CLEAR_ON_NONE(options->revoked_host_keys);
@@ -2425,9 +2398,10 @@ fmt_intarg(OpCodes code, int val)
         case oAddressFamily:
                 return fmt_multistate_int(val, multistate_addressfamily);
         case oVerifyHostKeyDNS:
-        case oStrictHostKeyChecking:
         case oUpdateHostkeys:
                 return fmt_multistate_int(val, multistate_yesnoask);
+        case oStrictHostKeyChecking:
+                return fmt_multistate_int(val, multistate_strict_hostkey);
         case oControlMaster:
                 return fmt_multistate_int(val, multistate_controlmaster);
         case oTunnel:
@@ -2438,17 +2412,6 @@ fmt_intarg(OpCodes code, int val)
                 return fmt_multistate_int(val, multistate_canonicalizehostname);
         case oFingerprintHash:
                 return ssh_digest_alg_name(val);
-        case oProtocol:
-                switch (val) {
-                case SSH_PROTO_1:
-                        return "1";
-                case SSH_PROTO_2:
-                        return "2";
-                case (SSH_PROTO_1|SSH_PROTO_2):
-                        return "2,1";
-                default:
-                        return "UNKNOWN";
-                }
         default:
                 switch (val) {
                 case 0:
@@ -2593,14 +2556,9 @@ dump_client_config(Options *o, const char *host)
         dump_cfg_fmtint(oNoHostAuthenticationForLocalhost, o->no_host_authentication_for_localhost);
         dump_cfg_fmtint(oPasswordAuthentication, o->password_authentication);
         dump_cfg_fmtint(oPermitLocalCommand, o->permit_local_command);
-        dump_cfg_fmtint(oProtocol, o->protocol);
         dump_cfg_fmtint(oProxyUseFdpass, o->proxy_use_fdpass);
         dump_cfg_fmtint(oPubkeyAuthentication, o->pubkey_authentication);
         dump_cfg_fmtint(oRequestTTY, o->request_tty);
-#ifdef WITH_RSA1
-        dump_cfg_fmtint(oRhostsRSAAuthentication, o->rhosts_rsa_authentication);
-        dump_cfg_fmtint(oRSAAuthentication, o->rsa_authentication);
-#endif
         dump_cfg_fmtint(oStreamLocalBindUnlink, o->fwd_opts.streamlocal_bind_unlink);
         dump_cfg_fmtint(oStrictHostKeyChecking, o->strict_host_key_checking);
         dump_cfg_fmtint(oTCPKeepAlive, o->tcp_keep_alive);
@@ -2612,9 +2570,6 @@ dump_client_config(Options *o, const char *host)
 
         /* Integer options */
         dump_cfg_int(oCanonicalizeMaxDots, o->canonicalize_max_dots);
-#ifdef WITH_SSH1
-        dump_cfg_int(oCompressionLevel, o->compression_level);
-#endif
         dump_cfg_int(oConnectionAttempts, o->connection_attempts);
         dump_cfg_int(oForwardX11Timeout, o->forward_x11_timeout);
         dump_cfg_int(oNumberOfPasswordPrompts, o->number_of_password_prompts);
@@ -2632,6 +2587,7 @@ dump_client_config(Options *o, const char *host)
         dump_cfg_string(oKbdInteractiveDevices, o->kbd_interactive_devices);
         dump_cfg_string(oKexAlgorithms, o->kex_algorithms ? o->kex_algorithms : KEX_CLIENT_KEX);
         dump_cfg_string(oLocalCommand, o->local_command);
+        dump_cfg_string(oRemoteCommand, o->remote_command);
         dump_cfg_string(oLogLevel, log_level_name(o->log_level));
         dump_cfg_string(oMacs, o->macs ? o->macs : KEX_CLIENT_MAC);
 #ifdef ENABLE_PKCS11
@@ -2684,10 +2640,6 @@ dump_client_config(Options *o, const char *host)
                 printf("\n");
         }
 
-        /* oCipher */
-        if (o->cipher != SSH_CIPHER_NOT_SET)
-                printf("Cipher %s\n", cipher_name(o->cipher));
-
         /* oControlPersist */
         if (o->control_persist == 0 || o->control_persist_timeout == 0)
                 dump_cfg_fmtint(oControlPersist, o->control_persist);