RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-03-22 03:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Add %-token and environment variable expansion to SetEnv.

Browse Source 
feedback deraadt@ jmc@, nits and ok djm@

OpenBSD-Commit-ID: 2f6e5070481cb73e6f35fd1c6608c1eeff88a5c1
This commit is contained in:
dtucker@openbsd.org 2025-03-03 06:53:09 +00:00 committed by Darren Tucker
parent b6bba67e6c
commit b49875428c
No known key found for this signature in database
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.608 2025/03/02 11:03:13 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.609 2025/03/03 06:53:09 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1563,6 +1563,28 @@ main(int ac, char **av)
options.user_hostfiles[j] = p; options.user_hostfiles[j] = p;
} }
for (j = 0; j < options.num_setenv; j++) {
char *name = options.setenv[j], *value;
if (name == NULL)
continue;
/* Expand only the value portion, not the variable name. */
if ((value = strchr(name, '=')) == NULL) {
/* shouldn't happen; vars are checked in readconf.c */
fatal("Invalid config SetEnv: %s", name);
}
*value++ = '\0';
cp = default_client_percent_dollar_expand(value, cinfo);
xasprintf(&p, "%s=%s", name, cp);
if (strcmp(value, p) != 0) {
debug3("expanded SetEnv '%s' '%s' -> '%s'",
name, value, cp);
}
free(options.setenv[j]);
free(cp);
options.setenv[j] = p;
}
for (i = 0; i < options.num_local_forwards; i++) { for (i = 0; i < options.num_local_forwards; i++) {
if (options.local_forwards[i].listen_path != NULL) { if (options.local_forwards[i].listen_path != NULL) {
cp = options.local_forwards[i].listen_path; cp = options.local_forwards[i].listen_path;

15
ssh_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.412 2025/03/01 06:11:26 dtucker Exp $ .\" $OpenBSD: ssh_config.5,v 1.413 2025/03/03 06:53:09 dtucker Exp $
.Dd $Mdocdate: March 1 2025 $ .Dd $Mdocdate: March 3 2025 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -1943,12 +1943,21 @@ option) or
(shell or command execution). (shell or command execution).
.It Cm SetEnv .It Cm SetEnv
Directly specify one or more environment variables and their contents to Directly specify one or more environment variables and their contents to
be sent to the server. be sent to the server in the form
.Dq NAME=VALUE .
Similarly to Similarly to
.Cm SendEnv , .Cm SendEnv ,
with the exception of the with the exception of the
.Ev TERM .Ev TERM
variable, the server must be prepared to accept the environment variable. variable, the server must be prepared to accept the environment variable.
.Pp
The
.Dq VALUE
may use the tokens described in the
.Sx TOKENS
section and environment variables as described in the
.Sx ENVIRONMENT VARIABLES
section.
.It Cm StdinNull .It Cm StdinNull
Redirects stdin from Redirects stdin from
.Pa /dev/null .Pa /dev/null