nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-05-30 00:04:49 -05:00
Code Issues Projects Releases Wiki Activity

Arrgh; yet again I make my security checking too draconian to

Browse Source 
actually get things done. I'm sure this is the second time I've
checked in this mistake :-/ Still, this time I've got right to the
bottom of the cause, and commented it clearly. Phew.

[originally from svn r1207]
This commit is contained in:
Simon Tatham 2001-08-26 15:45:55 +00:00
parent ebde798f13
commit 605fa91201
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scp.c
View File

@ -1124,6 +1124,17 @@ static void sink(char *targ, char *src)
* distinguish this case because `src' will be non-NULL * distinguish this case because `src' will be non-NULL
* and the last component of that will fail to match * and the last component of that will fail to match
* (the last component of) the name sent. * (the last component of) the name sent.
*
* (Well, not always; if `src' is a wildcard, we do
* expect to get back filenames that don't correspond
* exactly to it. So we skip this check if `src'
* contains a *, a ? or a []. This is non-ideal - we
* would like to ensure that the returned filename
* actually matches the wildcard pattern - but one of
* SCP's protocol infelicities is that wildcard
* matching is done at the server end _by the server's
* rules_ and so in general this is infeasible. Live
* with it, or upgrade to SFTP.)
*/ */
char *striptarget, *stripsrc; char *striptarget, *stripsrc;
@ -1145,12 +1156,13 @@ static void sink(char *targ, char *src)
if (src) { if (src) {
stripsrc = stripslashes(src); stripsrc = stripslashes(src);
if (strcmp(striptarget, stripsrc)) { if (!stripsrc[strcspn(stripsrc, "*?[]")] &&
strcmp(striptarget, stripsrc)) {
tell_user(stderr, "warning: remote host attempted to" tell_user(stderr, "warning: remote host attempted to"
" write to a different filename: disallowing"); " write to a different filename: disallowing");
/* Override the name the server provided with our own. */
striptarget = stripsrc;
} }
/* Override the name the server provided with our own. */
striptarget = stripsrc;
} }
if (targ[0] != '\0') if (targ[0] != '\0')