Attachment 2869 Details for Bug 2468 – Include server side (with same semantics as client)

[patch] Include server side (with same semantics as client)

include_with_regress (text/plain), 12.48 KB, created by Jakub Jelen on 2016-09-06 01:54:06 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelen

Created: 2016-09-06 01:54:06 AEST

Size: 12.48 KB

patch

obsolete

>diff --git a/regress/Makefile b/regress/Makefile
>index 2910f13..d51a204 100644
>--- a/regress/Makefile
>+++ b/regress/Makefile
>@@ -77,7 +77,8 @@ LTESTS= 	connect \
> 		hostkey-rotate \
> 		principals-command \
> 		cert-file \
>-		cfginclude
>+		cfginclude \
>+		servcfginclude
> 
> 
> #		dhgex \
>@@ -105,6 +106,7 @@ CLEANFILES=	*.core actual agent-key.* authorized_keys_${USER} \
> 		scp-ssh-wrapper.scp setuid-allowed sftp-server.log \
> 		sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \
> 		ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
>+		sshd_config sshd_config.* \
> 		ssh_proxy_envpass sshd.log sshd_config sshd_config.orig \
> 		sshd_proxy sshd_proxy.* sshd_proxy_bak sshd_proxy_orig \
> 		t10.out t10.out.pub t12.out t12.out.pub t2.out t3.out \
>diff --git a/regress/servcfginclude.sh b/regress/servcfginclude.sh
>new file mode 100644
>index 0000000..89c95ec
>--- /dev/null
>+++ b/regress/servcfginclude.sh
>@@ -0,0 +1,148 @@
>+#	Placed in the Public Domain.
>+
>+tid="server config include"
>+
>+cat > $OBJ/sshd_config.i << _EOF
>+Match host a
>+	Banner /aa
>+
>+Match host b
>+	Banner /bb
>+	Include $OBJ/sshd_config.i.*
>+
>+Match host c
>+	Include $OBJ/sshd_config.i.*
>+	Banner /cc
>+
>+Match host m
>+	Include $OBJ/sshd_config.i.*
>+
>+Match Host d
>+	Banner /dd
>+
>+Match Host e
>+	Banner /ee
>+	Include $OBJ/sshd_config.i.*
>+
>+Match Host f
>+	Include $OBJ/sshd_config.i.*
>+	Banner /ff
>+
>+Match Host n
>+	Include $OBJ/sshd_config.i.*
>+_EOF
>+
>+cat > $OBJ/sshd_config.i.0 << _EOF
>+Match host xxxxxx
>+_EOF
>+
>+cat > $OBJ/sshd_config.i.1 << _EOF
>+Match host a
>+	Banner /aaa
>+
>+Match host b
>+	Banner /bbb
>+
>+Match host c
>+	Banner /ccc
>+
>+Match Host d
>+	Banner /ddd
>+
>+Match Host e
>+	Banner /eee
>+
>+Match Host f
>+	Banner /fff
>+_EOF
>+
>+cat > $OBJ/sshd_config.i.2 << _EOF
>+Match host a
>+	Banner /aaaa
>+
>+Match host b
>+	Banner /bbbb
>+
>+Match host c
>+	Banner /cccc
>+
>+Match Host d
>+	Banner /dddd
>+
>+Match Host e
>+	Banner /eeee
>+
>+Match Host f
>+	Banner /ffff
>+
>+Match all
>+	Banner /xxxx
>+_EOF
>+
>+trial() {
>+	_host="$1"
>+	_exp="$2"
>+	${REAL_SSHD} -f $OBJ/sshd_config.i -T -C "host=$_host,user=test,addr=127.0.0.1" > $OBJ/sshd_config.out ||
>+		fatal "ssh config parse failed"
>+	_got=`grep -i '^banner ' $OBJ/sshd_config.out | awk '{print $2}'`
>+	if test "x$_exp" != "x$_got" ; then
>+		fail "host $_host include fail: expected $_exp got $_got"
>+	fi
>+}
>+
>+trial a /aa
>+trial b /bb
>+trial c /ccc
>+trial d /dd
>+trial e /ee
>+trial f /fff
>+trial m /xxxx
>+trial n /xxxx
>+trial x none
>+
>+# Prepare an included config with an error.
>+
>+cat > $OBJ/sshd_config.i.3 << _EOF
>+Banner xxxx
>+	Junk
>+_EOF
>+
>+${REAL_SSHD} -f $OBJ/sshd_config.i -C "host=a,user=test,addr=127.0.0.1" 2>/dev/null && \
>+	fail "sshd include allowed invalid config"
>+
>+${REAL_SSHD} -f $OBJ/sshd_config.i -C "host=x,user=test,addr=127.0.0.1" 2>/dev/null && \
>+	fail "sshd include allowed invalid config"
>+
>+rm -f $OBJ/sshd_config.i.*
>+
>+# Ensure that a missing include is not fatal.
>+cat > $OBJ/sshd_config.i << _EOF
>+Include $OBJ/sshd_config.i.*
>+Banner /aa
>+_EOF
>+
>+trial a /aa
>+
>+# Ensure that Match/Host in an included config does not affect parent.
>+cat > $OBJ/sshd_config.i.x << _EOF
>+Match host x
>+_EOF
>+
>+trial a /aa
>+
>+cat > $OBJ/sshd_config.i.x << _EOF
>+Match Host x
>+_EOF
>+
>+trial a /aa
>+
>+# Ensure the empty include directive is not accepted
>+cat > $OBJ/sshd_config.i.x << _EOF
>+Include
>+_EOF
>+
>+${REAL_SSHD} -f $OBJ/sshd_config.i.x -C "host=x,user=test,addr=127.0.0.1" 2>/dev/null && \
>+	fail "sshd allowed empty Include option"
>+
>+# cleanup
>+rm -f $OBJ/sshd_config.i $OBJ/sshd_config.i.* $OBJ/sshd_config.out
>diff --git a/regress/test-exec.sh b/regress/test-exec.sh
>index 7a456bb..4fd6e8c 100644
>--- a/regress/test-exec.sh
>+++ b/regress/test-exec.sh
>@@ -223,6 +223,7 @@ echo "exec ${SSH} -E${TEST_SSH_LOGFILE} "'"$@"' >>$SSHLOGWRAP
> 
> chmod a+rx $OBJ/ssh-log-wrapper.sh
> REAL_SSH="$SSH"
>+REAL_SSHD="$SSHD"
> SSH="$SSHLOGWRAP"
> 
> # Some test data.  We make a copy because some tests will overwrite it.
>diff --git a/servconf.c b/servconf.c
>index acd903a..d4329c4 100644
>--- a/servconf.c
>+++ b/servconf.c
>@@ -34,6 +34,11 @@
> #ifdef HAVE_UTIL_H
> #include <util.h>
> #endif
>+#ifdef USE_SYSTEM_GLOB
>+# include <glob.h>
>+#else
>+# include "openbsd-compat/glob.h"
>+#endif
> 
> #include "openbsd-compat/sys-queue.h"
> #include "xmalloc.h"
>@@ -64,6 +69,15 @@ static void add_one_listen_addr(ServerOptions *, char *, int);
> /* Use of privilege separation or not */
> extern int use_privsep;
> extern Buffer cfg;
>+struct include_item *include_list = NULL, *include_last = NULL;
>+
>+#define INCLUDE_LIST_APPEND(item) \
>+	(item)->next = NULL; \
>+	if (include_list == NULL) { \
>+		include_list = (item); \
>+	} else \
>+		include_last->next = (item); \
>+	include_last = (item);
> 
> /* Initializes the server options to their default values. */
> 
>@@ -377,6 +391,13 @@ fill_default_server_options(ServerOptions *options)
> 
> }
> 
>+int process_server_config_line_depth(ServerOptions *options, char *line,
>+    const char *filename, int linenum, int *activep,
>+    struct connection_info *connectinfo, int inc_flags, int depth);
>+void parse_server_config_depth(ServerOptions *options, const char *filename,
>+    Buffer *conf, struct connection_info *connectinfo,
>+    int flags, int *activep, int depth);
>+
> /* Keyword tokens. */
> typedef enum {
> 	sBadOption,		/* == unknown option */
>@@ -407,7 +428,7 @@ typedef enum {
> 	sAcceptEnv, sPermitTunnel,
> 	sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
> 	sUsePrivilegeSeparation, sAllowAgentForwarding,
>-	sHostCertificate,
>+	sHostCertificate, sInclude,
> 	sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,
> 	sAuthorizedPrincipalsCommand, sAuthorizedPrincipalsCommandUser,
> 	sKexAlgorithms, sIPQoS, sVersionAddendum,
>@@ -422,6 +443,8 @@ typedef enum {
> #define SSHCFG_MATCH	0x02	/* allowed inside a Match section */
> #define SSHCFG_ALL	(SSHCFG_GLOBAL|SSHCFG_MATCH)
> 
>+#define SSHCFG_NEVERMATCH 0x04  /* Match/Host never matches; internal only */
>+
> /* Textual representation of the tokens. */
> static struct {
> 	const char *name;
>@@ -546,6 +569,7 @@ static struct {
> 	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
> 	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
> 	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
>+	{ "include", sInclude, SSHCFG_ALL },
> 	{ "ipqos", sIPQoS, SSHCFG_ALL },
> 	{ "authorizedkeyscommand", sAuthorizedKeysCommand, SSHCFG_ALL },
> 	{ "authorizedkeyscommanduser", sAuthorizedKeysCommandUser, SSHCFG_ALL },
>@@ -952,8 +976,18 @@ process_server_config_line(ServerOptions *options, char *line,
>     const char *filename, int linenum, int *activep,
>     struct connection_info *connectinfo)
> {
>-	char *cp, **charptr, *arg, *p;
>-	int cmdline = 0, *intptr, value, value2, n, port;
>+	process_server_config_line_depth(options, line, filename, linenum,
>+	    activep, connectinfo, 0, 0);
>+
>+}
>+
>+int
>+process_server_config_line_depth(ServerOptions *options, char *line,
>+    const char *filename, int linenum, int *activep,
>+    struct connection_info *connectinfo, int inc_flags, int depth)
>+{
>+	char *cp, **charptr, *arg, *arg2, *p;
>+	int cmdline = 0, *intptr, value, value2, n, port, oactive;
> 	SyslogFacility *log_facility_ptr;
> 	LogLevel *log_level_ptr;
> 	ServerOpCodes opcode;
>@@ -961,6 +995,9 @@ process_server_config_line(ServerOptions *options, char *line,
> 	size_t len;
> 	long long val64;
> 	const struct multistate *multistate_ptr;
>+	struct include_item *item;
>+	int found = 0;
>+	glob_t gbuf;
> 
> 	cp = line;
> 	if ((arg = strdelim(&cp)) == NULL)
>@@ -978,7 +1015,7 @@ process_server_config_line(ServerOptions *options, char *line,
> 		cmdline = 1;
> 		activep = &cmdline;
> 	}
>-	if (*activep && opcode != sMatch)
>+	if (*activep && opcode != sMatch && opcode != sInclude)
> 		debug3("%s:%d setting %s %s", filename, linenum, arg, cp);
> 	if (*activep == 0 && !(flags & SSHCFG_MATCH)) {
> 		if (connectinfo == NULL) {
>@@ -1592,6 +1629,80 @@ process_server_config_line(ServerOptions *options, char *line,
> 			*intptr = value;
> 		break;
> 
>+	case sInclude:
>+		if (cmdline)
>+			fatal("Include directive not supported as a command-line "
>+			   "option");
>+
>+		value = 0;
>+		while ((arg = strdelim(&cp)) != NULL && *arg != '\0') {
>+			value++;
>+			found = 0;
>+			if (*arg != '/' && *arg != '~') {
>+				xasprintf(&arg2, "%s/%s",
>+				    SSHDIR, arg);
>+			} else
>+				arg2 = xstrdup(arg);
>+
>+			/*
>+			 * don't let the Match in Included clobber
>+			 * the containing file's Match state.
>+			 */
>+			oactive = *activep;
>+			/* browse cached list of files */
>+			for (item = include_list; item != NULL; item = item->next) {
>+				if (strcmp(item->selector, arg2) == 0) {
>+					if (item->filename != NULL)
>+						parse_server_config_depth(options, item->filename,
>+							&(item->buffer), connectinfo,
>+						    (oactive ? 0 : SSHCFG_NEVERMATCH),
>+						    activep, depth + 1);
>+					found = 1;
>+					*activep = oactive;
>+				}
>+			}
>+			if (found != 0) {
>+				free(arg2);
>+				continue;
>+			}
>+
>+			/* not in cache, a new glob */
>+			debug3("Glob configuration file to include %s", arg2);
>+			if (glob(arg2, 0, NULL, &gbuf) == 0) {
>+				for (i = 0; i < gbuf.gl_pathc; i++) {
>+					debug3("Including configuration file %s",
>+						gbuf.gl_pathv[i]);
>+					item = malloc(sizeof(struct include_item));
>+					item->selector = strdup(arg2);
>+					item->filename = strdup(gbuf.gl_pathv[i]);
>+					buffer_init(&(item->buffer));
>+					load_server_config(item->filename, &(item->buffer));
>+					parse_server_config_depth(options, item->filename,
>+						&(item->buffer), connectinfo,
>+					    (oactive ? 0 : SSHCFG_NEVERMATCH),
>+					    activep, depth + 1);
>+
>+					// append item to the end of the list
>+					INCLUDE_LIST_APPEND(item)
>+					*activep = oactive;
>+				}
>+			} else { /* no match or other error */
>+				// store placeholder to avoid aditional empty globs
>+				item = malloc(sizeof(struct include_item));
>+				item->selector = strdup(arg2);
>+				item->filename = NULL;
>+				buffer_init(&(item->buffer));
>+				// append item to the end of the list
>+				INCLUDE_LIST_APPEND(item)
>+			}
>+			globfree(&gbuf);
>+			free(arg2);
>+		}
>+		if (value == 0)
>+			fatal("%s line %d: missing argument - file to include",
>+			    filename, linenum);
>+		break;
>+
> 	case sMatch:
> 		if (cmdline)
> 			fatal("Match directive not supported as a command-line "
>@@ -1600,7 +1711,7 @@ process_server_config_line(ServerOptions *options, char *line,
> 		if (value < 0)
> 			fatal("%s line %d: Bad Match condition", filename,
> 			    linenum);
>-		*activep = value;
>+		*activep = (inc_flags & SSHCFG_NEVERMATCH) ? 0 : value;
> 		break;
> 
> 	case sPermitOpen:
>@@ -2033,18 +2144,32 @@ void
> parse_server_config(ServerOptions *options, const char *filename, Buffer *conf,
>     struct connection_info *connectinfo)
> {
>-	int active, linenum, bad_options = 0;
>+	int active = connectinfo ? 0 : 1;
>+	parse_server_config_depth(options, filename, conf, connectinfo,
>+	    0, &active, 0);
>+}
>+
>+#define SERVCONF_MAX_DEPTH	16
>+
>+void
>+parse_server_config_depth(ServerOptions *options, const char *filename,
>+    Buffer *conf, struct connection_info *connectinfo,
>+    int flags, int *activep, int depth)
>+{
>+	int linenum, bad_options = 0;
> 	char *cp, *obuf, *cbuf;
> 
>+	if (depth < 0 || depth > SERVCONF_MAX_DEPTH)
>+		fatal("Too many recursive configuration includes");
>+
> 	debug2("%s: config %s len %d", __func__, filename, buffer_len(conf));
> 
> 	if ((obuf = cbuf = sshbuf_dup_string(conf)) == NULL)
> 		fatal("%s: sshbuf_dup_string failed", __func__);
>-	active = connectinfo ? 0 : 1;
> 	linenum = 1;
> 	while ((cp = strsep(&cbuf, "\n")) != NULL) {
>-		if (process_server_config_line(options, cp, filename,
>-		    linenum++, &active, connectinfo) != 0)
>+		if (process_server_config_line_depth(options, cp, filename,
>+		    linenum++, activep, connectinfo, flags, depth) != 0)
> 			bad_options++;
> 	}
> 	free(obuf);
>diff --git a/servconf.h b/servconf.h
>index 8af460f..0cf943c 100644
>--- a/servconf.h
>+++ b/servconf.h
>@@ -199,6 +199,13 @@ struct connection_info {
> 	int lport;		/* local port */
> };
> 
>+struct include_item {
>+	const char *selector;
>+	const char *filename;
>+	Buffer buffer;
>+	struct include_item *next;
>+};
>+
> 
> /*
>  * These are string config options that must be copied between the
>diff --git a/sshd_config.5 b/sshd_config.5
>index fe3b23d..0740c28 100644
>--- a/sshd_config.5
>+++ b/sshd_config.5
>@@ -778,6 +778,18 @@ during
> .Cm HostbasedAuthentication .
> The default is
> .Dq no .
>+.It Cm Include
>+Include the specified configuration file(s).
>+Multiple path names may be specified and each pathname may contain
>+.Xr glob 3
>+wildcards.
>+Files without absolute paths are assumed to be in
>+.Pa /etc/ssh .
>+.Cm Include
>+directive may appear inside a
>+.Cm Match
>+block
>+to perform conditional inclusion.
> .It Cm IPQoS
> Specifies the IPv4 type-of-service or DSCP class for the connection.
> Accepted values are

Actions: View | Diff

Attachments on bug 2468: 2706 | 2869 | 3223 | 3250 | 3333 | 3350 | 3351