19261079b7
Some notable changes, from upstream's release notes: - sshd(8): Remove support for obsolete "host/port" syntax. - ssh(1): When prompting whether to record a new host key, accept the key fingerprint as a synonym for "yes". - ssh-keygen(1): when acting as a CA and signing certificates with an RSA key, default to using the rsa-sha2-512 signature algorithm. - ssh(1), sshd(8), ssh-keygen(1): this release removes the "ssh-rsa" (RSA/SHA1) algorithm from those accepted for certificate signatures. - ssh-sk-helper(8): this is a new binary. It is used by the FIDO/U2F support to provide address-space isolation for token middleware libraries (including the internal one). - ssh(1): this release enables UpdateHostkeys by default subject to some conservative preconditions. - scp(1): this release changes the behaviour of remote to remote copies (e.g. "scp host-a:/path host-b:") to transfer through the local host by default. - scp(1): experimental support for transfers using the SFTP protocol as a replacement for the venerable SCP/RCP protocol that it has traditionally used. Additional integration work is needed to support FIDO/U2F in the base system. Deprecation Notice ------------------ OpenSSH will disable the ssh-rsa signature scheme by default in the next release. Reviewed by: imp MFC after: 1 month Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29985
151 lines
3.4 KiB
C
151 lines
3.4 KiB
C
/* $OpenBSD: sftp-glob.c,v 1.29 2019/11/13 04:47:52 deraadt Exp $ */
|
|
/*
|
|
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
|
|
#include <sys/types.h>
|
|
#ifdef HAVE_SYS_STAT_H
|
|
# include <sys/stat.h>
|
|
#endif
|
|
|
|
#include <dirent.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdarg.h>
|
|
|
|
#include "xmalloc.h"
|
|
#include "sftp.h"
|
|
#include "sftp-common.h"
|
|
#include "sftp-client.h"
|
|
|
|
int remote_glob(struct sftp_conn *, const char *, int,
|
|
int (*)(const char *, int), glob_t *);
|
|
|
|
struct SFTP_OPENDIR {
|
|
SFTP_DIRENT **dir;
|
|
int offset;
|
|
};
|
|
|
|
static struct {
|
|
struct sftp_conn *conn;
|
|
} cur;
|
|
|
|
static void *
|
|
fudge_opendir(const char *path)
|
|
{
|
|
struct SFTP_OPENDIR *r;
|
|
|
|
r = xcalloc(1, sizeof(*r));
|
|
|
|
if (do_readdir(cur.conn, (char *)path, &r->dir)) {
|
|
free(r);
|
|
return(NULL);
|
|
}
|
|
|
|
r->offset = 0;
|
|
|
|
return((void *)r);
|
|
}
|
|
|
|
static struct dirent *
|
|
fudge_readdir(struct SFTP_OPENDIR *od)
|
|
{
|
|
/* Solaris needs sizeof(dirent) + path length (see below) */
|
|
static char buf[sizeof(struct dirent) + MAXPATHLEN];
|
|
struct dirent *ret = (struct dirent *)buf;
|
|
#ifdef __GNU_LIBRARY__
|
|
static int inum = 1;
|
|
#endif /* __GNU_LIBRARY__ */
|
|
|
|
if (od->dir[od->offset] == NULL)
|
|
return(NULL);
|
|
|
|
memset(buf, 0, sizeof(buf));
|
|
|
|
/*
|
|
* Solaris defines dirent->d_name as a one byte array and expects
|
|
* you to hack around it.
|
|
*/
|
|
#ifdef BROKEN_ONE_BYTE_DIRENT_D_NAME
|
|
strlcpy(ret->d_name, od->dir[od->offset++]->filename, MAXPATHLEN);
|
|
#else
|
|
strlcpy(ret->d_name, od->dir[od->offset++]->filename,
|
|
sizeof(ret->d_name));
|
|
#endif
|
|
#ifdef __GNU_LIBRARY__
|
|
/*
|
|
* Idiot glibc uses extensions to struct dirent for readdir with
|
|
* ALTDIRFUNCs. Not that this is documented anywhere but the
|
|
* source... Fake an inode number to appease it.
|
|
*/
|
|
ret->d_ino = inum++;
|
|
if (!inum)
|
|
inum = 1;
|
|
#endif /* __GNU_LIBRARY__ */
|
|
|
|
return(ret);
|
|
}
|
|
|
|
static void
|
|
fudge_closedir(struct SFTP_OPENDIR *od)
|
|
{
|
|
free_sftp_dirents(od->dir);
|
|
free(od);
|
|
}
|
|
|
|
static int
|
|
fudge_lstat(const char *path, struct stat *st)
|
|
{
|
|
Attrib *a;
|
|
|
|
if (!(a = do_lstat(cur.conn, (char *)path, 1)))
|
|
return(-1);
|
|
|
|
attrib_to_stat(a, st);
|
|
|
|
return(0);
|
|
}
|
|
|
|
static int
|
|
fudge_stat(const char *path, struct stat *st)
|
|
{
|
|
Attrib *a;
|
|
|
|
if (!(a = do_stat(cur.conn, (char *)path, 1)))
|
|
return(-1);
|
|
|
|
attrib_to_stat(a, st);
|
|
|
|
return(0);
|
|
}
|
|
|
|
int
|
|
remote_glob(struct sftp_conn *conn, const char *pattern, int flags,
|
|
int (*errfunc)(const char *, int), glob_t *pglob)
|
|
{
|
|
pglob->gl_opendir = fudge_opendir;
|
|
pglob->gl_readdir = (struct dirent *(*)(void *))fudge_readdir;
|
|
pglob->gl_closedir = (void (*)(void *))fudge_closedir;
|
|
pglob->gl_lstat = fudge_lstat;
|
|
pglob->gl_stat = fudge_stat;
|
|
|
|
memset(&cur, 0, sizeof(cur));
|
|
cur.conn = conn;
|
|
|
|
return(glob(pattern, flags | GLOB_ALTDIRFUNC, errfunc, pglob));
|
|
}
|