- stevesk@cvs.openbsd.org 2006/07/22 20:48:23

[openssh.git] / auth-options.c

diff --git a/auth-options.c b/auth-options.c
index 2787d2948b5062e5c0dac0bf1742d9ca3451a8da..33c62641b0e2edc464558a4c62515bf3d8bb8ffd 100644 (file)
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-options.c,v 1.39 2006/07/22 20:48:22 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -10,9 +11,15 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-options.c,v 1.24 2002/05/13 20:44:58 markus Exp $");
 
-#include "packet.h"
+#include <sys/types.h>
+
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
+#include <pwd.h>
+#include <string.h>
+
 #include "xmalloc.h"
 #include "match.h"
 #include "log.h"
@@ -20,7 +27,6 @@ RCSID("$OpenBSD: auth-options.c,v 1.24 2002/05/13 20:44:58 markus Exp $");
 #include "channels.h"
 #include "auth-options.h"
 #include "servconf.h"
-#include "bufaux.h"
 #include "misc.h"
 #include "monitor_wrap.h"
 #include "auth.h"
@@ -37,6 +43,9 @@ char *forced_command = NULL;
 /* "environment=" options. */
 struct envstring *custom_environment = NULL;
 
+/* "tunnel=" option. */
+int forced_tun_device = -1;
+
 extern ServerOptions options;
 
 void
@@ -56,6 +65,7 @@ auth_clear_options(void)
                xfree(forced_command);
                forced_command = NULL;
        }
+       forced_tun_device = -1;
        channel_clear_permitted_opens();
        auth_debug_reset();
 }
@@ -129,13 +139,14 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                forced_command = NULL;
                                goto bad_option;
                        }
-                       forced_command[i] = 0;
+                       forced_command[i] = '\0';
                        auth_debug_add("Forced command: %.900s", forced_command);
                        opts++;
                        goto next_option;
                }
                cp = "environment=\"";
-               if (strncasecmp(opts, cp, strlen(cp)) == 0) {
+               if (options.permit_user_env &&
+                   strncasecmp(opts, cp, strlen(cp)) == 0) {
                        char *s;
                        struct envstring *new_envstring;
 
@@ -160,7 +171,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                xfree(s);
                                goto bad_option;
                        }
-                       s[i] = 0;
+                       s[i] = '\0';
                        auth_debug_add("Adding to environment: %.900s", s);
                        debug("Adding to environment: %.900s", s);
                        opts++;
@@ -174,7 +185,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                if (strncasecmp(opts, cp, strlen(cp)) == 0) {
                        const char *remote_ip = get_remote_ipaddr();
                        const char *remote_host = get_canonical_hostname(
-                           options.verify_reverse_mapping);
+                           options.use_dns);
                        char *patterns = xmalloc(strlen(opts) + 1);
 
                        opts += strlen(cp);
@@ -197,12 +208,12 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                xfree(patterns);
                                goto bad_option;
                        }
-                       patterns[i] = 0;
+                       patterns[i] = '\0';
                        opts++;
                        if (match_host_and_ip(remote_host, remote_ip,
                            patterns) != 1) {
                                xfree(patterns);
-                               log("Authentication tried for %.100s with "
+                               logit("Authentication tried for %.100s with "
                                    "correct key but not from a permitted "
                                    "host (host=%.200s, ip=%.200s).",
                                    pw->pw_name, remote_host, remote_ip);
@@ -218,7 +229,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                }
                cp = "permitopen=\"";
                if (strncasecmp(opts, cp, strlen(cp)) == 0) {
-                       char host[256], sport[6];
+                       char *host, *p;
                        u_short port;
                        char *patterns = xmalloc(strlen(opts) + 1);
 
@@ -237,25 +248,29 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                        if (!*opts) {
                                debug("%.100s, line %lu: missing end quote",
                                    file, linenum);
-                               auth_debug_add("%.100s, line %lu: missing end quote",
-                                   file, linenum);
+                               auth_debug_add("%.100s, line %lu: missing "
+                                   "end quote", file, linenum);
                                xfree(patterns);
                                goto bad_option;
                        }
-                       patterns[i] = 0;
+                       patterns[i] = '\0';
                        opts++;
-                       if (sscanf(patterns, "%255[^:]:%5[0-9]", host, sport) != 2 &&
-                           sscanf(patterns, "%255[^/]/%5[0-9]", host, sport) != 2) {
-                               debug("%.100s, line %lu: Bad permitopen specification "
-                                   "<%.100s>", file, linenum, patterns);
+                       p = patterns;
+                       host = hpdelim(&p);
+                       if (host == NULL || strlen(host) >= NI_MAXHOST) {
+                               debug("%.100s, line %lu: Bad permitopen "
+                                   "specification <%.100s>", file, linenum,
+                                   patterns);
                                auth_debug_add("%.100s, line %lu: "
-                                   "Bad permitopen specification", file, linenum);
+                                   "Bad permitopen specification", file,
+                                   linenum);
                                xfree(patterns);
                                goto bad_option;
                        }
-                       if ((port = a2port(sport)) == 0) {
-                               debug("%.100s, line %lu: Bad permitopen port <%.100s>",
-                                   file, linenum, sport);
+                       host = cleanhostname(host);
+                       if (p == NULL || (port = a2port(p)) == 0) {
+                               debug("%.100s, line %lu: Bad permitopen port "
+                                   "<%.100s>", file, linenum, p ? p : "");
                                auth_debug_add("%.100s, line %lu: "
                                    "Bad permitopen port", file, linenum);
                                xfree(patterns);
@@ -266,6 +281,41 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                        xfree(patterns);
                        goto next_option;
                }
+               cp = "tunnel=\"";
+               if (strncasecmp(opts, cp, strlen(cp)) == 0) {
+                       char *tun = NULL;
+                       opts += strlen(cp);
+                       tun = xmalloc(strlen(opts) + 1);
+                       i = 0;
+                       while (*opts) {
+                               if (*opts == '"')
+                                       break;
+                               tun[i++] = *opts++;
+                       }
+                       if (!*opts) {
+                               debug("%.100s, line %lu: missing end quote",
+                                   file, linenum);
+                               auth_debug_add("%.100s, line %lu: missing end quote",
+                                   file, linenum);
+                               xfree(tun);
+                               forced_tun_device = -1;
+                               goto bad_option;
+                       }
+                       tun[i] = '\0';
+                       forced_tun_device = a2tun(tun, NULL);
+                       xfree(tun);
+                       if (forced_tun_device == SSH_TUNID_ERR) {
+                               debug("%.100s, line %lu: invalid tun device",
+                                   file, linenum);
+                               auth_debug_add("%.100s, line %lu: invalid tun device",
+                                   file, linenum);
+                               forced_tun_device = -1;
+                               goto bad_option;
+                       }
+                       auth_debug_add("Forced tun device: %d", forced_tun_device);
+                       opts++;
+                       goto next_option;
+               }
 next_option:
                /*
                 * Skip the comma, and move to the next option
@@ -288,7 +338,7 @@ next_option:
        return 1;
 
 bad_option:
-       log("Bad options in %.100s file, line %lu: %.50s",
+       logit("Bad options in %.100s file, line %lu: %.50s",
            file, linenum, opts);
        auth_debug_add("Bad options in %.100s file, line %lu: %.50s",
            file, linenum, opts);