mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 01:48:00 +00:00
d20d3b20fd
The global 'int flags' has always been an ugly feature of this code base, and I suddenly thought that perhaps it's time to start throwing it out, one flag at a time, until it's totally unused. My first target is FLAG_VERBOSE. This was usually set by cmdline.c when it saw a -v option on the program's command line, except that GUI PuTTY itself sets it unconditionally on startup. And then various bits of the code would check it in order to decide whether to print a given message. In the current system of front-end abstraction traits, there's no _one_ place that I can move it to. But there are two: every place that checked FLAG_VERBOSE has access to either a Seat or a LogPolicy. So now each of those traits has a query method for 'do I want verbose messages?'. A good effect of this is that subsidiary Seats, like the ones used in Uppity for the main SSH server module itself and the server end of shell channels, now get to have their own verbosity setting instead of inheriting the one global one. In fact I don't expect any code using those Seats to be generating any messages at all, but if that changes later, we'll have a way to control it. (Who knows, perhaps logging in Uppity might become a thing.) As part of this cleanup, I've added a new flag to cmdline_tooltype, called TOOLTYPE_NO_VERBOSE_OPTION. The unconditionally-verbose tools now set that, and it has the effect of making cmdline.c disallow -v completely. So where 'putty -v' would previously have been silently ignored ("I was already verbose"), it's now an error, reminding you that that option doesn't actually do anything. Finally, the 'default_logpolicy' provided by uxcons.c and wincons.c (with identical definitions) has had to move into a new file of its own, because now it has to ask cmdline.c for the verbosity setting as well as asking console.c for the rest of its methods. So there's a new file clicons.c which can only be included by programs that link against both cmdline.c _and_ one of the *cons.c, and I've renamed the logpolicy to reflect that.
647 lines
14 KiB
C
647 lines
14 KiB
C
/*
|
|
* uxsftp.c: the Unix-specific parts of PSFTP and PSCP.
|
|
*/
|
|
|
|
#include <sys/time.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <stdlib.h>
|
|
#include <fcntl.h>
|
|
#include <dirent.h>
|
|
#include <unistd.h>
|
|
#include <utime.h>
|
|
#include <errno.h>
|
|
#include <assert.h>
|
|
|
|
#include "putty.h"
|
|
#include "ssh.h"
|
|
#include "psftp.h"
|
|
|
|
#if HAVE_GLOB_H
|
|
#include <glob.h>
|
|
#endif
|
|
|
|
/*
|
|
* In PSFTP our selects are synchronous, so these functions are
|
|
* empty stubs.
|
|
*/
|
|
uxsel_id *uxsel_input_add(int fd, int rwx) { return NULL; }
|
|
void uxsel_input_remove(uxsel_id *id) { }
|
|
|
|
char *x_get_default(const char *key)
|
|
{
|
|
return NULL; /* this is a stub */
|
|
}
|
|
|
|
void platform_get_x11_auth(struct X11Display *display, Conf *conf)
|
|
{
|
|
/* Do nothing, therefore no auth. */
|
|
}
|
|
const bool platform_uses_x11_unix_by_default = true;
|
|
|
|
/*
|
|
* Default settings that are specific to PSFTP.
|
|
*/
|
|
char *platform_default_s(const char *name)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
bool platform_default_b(const char *name, bool def)
|
|
{
|
|
return def;
|
|
}
|
|
|
|
int platform_default_i(const char *name, int def)
|
|
{
|
|
return def;
|
|
}
|
|
|
|
FontSpec *platform_default_fontspec(const char *name)
|
|
{
|
|
return fontspec_new("");
|
|
}
|
|
|
|
Filename *platform_default_filename(const char *name)
|
|
{
|
|
if (!strcmp(name, "LogFileName"))
|
|
return filename_from_str("putty.log");
|
|
else
|
|
return filename_from_str("");
|
|
}
|
|
|
|
int filexfer_get_userpass_input(Seat *seat, prompts_t *p, bufchain *input)
|
|
{
|
|
int ret;
|
|
ret = cmdline_get_passwd_input(p);
|
|
if (ret == -1)
|
|
ret = console_get_userpass_input(p);
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Set local current directory. Returns NULL on success, or else an
|
|
* error message which must be freed after printing.
|
|
*/
|
|
char *psftp_lcd(char *dir)
|
|
{
|
|
if (chdir(dir) < 0)
|
|
return dupprintf("%s: chdir: %s", dir, strerror(errno));
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Get local current directory. Returns a string which must be
|
|
* freed.
|
|
*/
|
|
char *psftp_getcwd(void)
|
|
{
|
|
char *buffer, *ret;
|
|
size_t size = 256;
|
|
|
|
buffer = snewn(size, char);
|
|
while (1) {
|
|
ret = getcwd(buffer, size);
|
|
if (ret != NULL)
|
|
return ret;
|
|
if (errno != ERANGE) {
|
|
sfree(buffer);
|
|
return dupprintf("[cwd unavailable: %s]", strerror(errno));
|
|
}
|
|
/*
|
|
* Otherwise, ERANGE was returned, meaning the buffer
|
|
* wasn't big enough.
|
|
*/
|
|
sgrowarray(buffer, size, size);
|
|
}
|
|
}
|
|
|
|
struct RFile {
|
|
int fd;
|
|
};
|
|
|
|
RFile *open_existing_file(const char *name, uint64_t *size,
|
|
unsigned long *mtime, unsigned long *atime,
|
|
long *perms)
|
|
{
|
|
int fd;
|
|
RFile *ret;
|
|
|
|
fd = open(name, O_RDONLY);
|
|
if (fd < 0)
|
|
return NULL;
|
|
|
|
ret = snew(RFile);
|
|
ret->fd = fd;
|
|
|
|
if (size || mtime || atime || perms) {
|
|
struct stat statbuf;
|
|
if (fstat(fd, &statbuf) < 0) {
|
|
fprintf(stderr, "%s: stat: %s\n", name, strerror(errno));
|
|
memset(&statbuf, 0, sizeof(statbuf));
|
|
}
|
|
|
|
if (size)
|
|
*size = statbuf.st_size;
|
|
|
|
if (mtime)
|
|
*mtime = statbuf.st_mtime;
|
|
|
|
if (atime)
|
|
*atime = statbuf.st_atime;
|
|
|
|
if (perms)
|
|
*perms = statbuf.st_mode;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int read_from_file(RFile *f, void *buffer, int length)
|
|
{
|
|
return read(f->fd, buffer, length);
|
|
}
|
|
|
|
void close_rfile(RFile *f)
|
|
{
|
|
close(f->fd);
|
|
sfree(f);
|
|
}
|
|
|
|
struct WFile {
|
|
int fd;
|
|
char *name;
|
|
};
|
|
|
|
WFile *open_new_file(const char *name, long perms)
|
|
{
|
|
int fd;
|
|
WFile *ret;
|
|
|
|
fd = open(name, O_CREAT | O_TRUNC | O_WRONLY,
|
|
(mode_t)(perms ? perms : 0666));
|
|
if (fd < 0)
|
|
return NULL;
|
|
|
|
ret = snew(WFile);
|
|
ret->fd = fd;
|
|
ret->name = dupstr(name);
|
|
|
|
return ret;
|
|
}
|
|
|
|
|
|
WFile *open_existing_wfile(const char *name, uint64_t *size)
|
|
{
|
|
int fd;
|
|
WFile *ret;
|
|
|
|
fd = open(name, O_APPEND | O_WRONLY);
|
|
if (fd < 0)
|
|
return NULL;
|
|
|
|
ret = snew(WFile);
|
|
ret->fd = fd;
|
|
ret->name = dupstr(name);
|
|
|
|
if (size) {
|
|
struct stat statbuf;
|
|
if (fstat(fd, &statbuf) < 0) {
|
|
fprintf(stderr, "%s: stat: %s\n", name, strerror(errno));
|
|
memset(&statbuf, 0, sizeof(statbuf));
|
|
}
|
|
|
|
*size = statbuf.st_size;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int write_to_file(WFile *f, void *buffer, int length)
|
|
{
|
|
char *p = (char *)buffer;
|
|
int so_far = 0;
|
|
|
|
/* Keep trying until we've really written as much as we can. */
|
|
while (length > 0) {
|
|
int ret = write(f->fd, p, length);
|
|
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
if (ret == 0)
|
|
break;
|
|
|
|
p += ret;
|
|
length -= ret;
|
|
so_far += ret;
|
|
}
|
|
|
|
return so_far;
|
|
}
|
|
|
|
void set_file_times(WFile *f, unsigned long mtime, unsigned long atime)
|
|
{
|
|
struct utimbuf ut;
|
|
|
|
ut.actime = atime;
|
|
ut.modtime = mtime;
|
|
|
|
utime(f->name, &ut);
|
|
}
|
|
|
|
/* Closes and frees the WFile */
|
|
void close_wfile(WFile *f)
|
|
{
|
|
close(f->fd);
|
|
sfree(f->name);
|
|
sfree(f);
|
|
}
|
|
|
|
/* Seek offset bytes through file, from whence, where whence is
|
|
FROM_START, FROM_CURRENT, or FROM_END */
|
|
int seek_file(WFile *f, uint64_t offset, int whence)
|
|
{
|
|
int lseek_whence;
|
|
|
|
switch (whence) {
|
|
case FROM_START:
|
|
lseek_whence = SEEK_SET;
|
|
break;
|
|
case FROM_CURRENT:
|
|
lseek_whence = SEEK_CUR;
|
|
break;
|
|
case FROM_END:
|
|
lseek_whence = SEEK_END;
|
|
break;
|
|
default:
|
|
return -1;
|
|
}
|
|
|
|
return lseek(f->fd, offset, lseek_whence) >= 0 ? 0 : -1;
|
|
}
|
|
|
|
uint64_t get_file_posn(WFile *f)
|
|
{
|
|
return lseek(f->fd, (off_t) 0, SEEK_CUR);
|
|
}
|
|
|
|
int file_type(const char *name)
|
|
{
|
|
struct stat statbuf;
|
|
|
|
if (stat(name, &statbuf) < 0) {
|
|
if (errno != ENOENT)
|
|
fprintf(stderr, "%s: stat: %s\n", name, strerror(errno));
|
|
return FILE_TYPE_NONEXISTENT;
|
|
}
|
|
|
|
if (S_ISREG(statbuf.st_mode))
|
|
return FILE_TYPE_FILE;
|
|
|
|
if (S_ISDIR(statbuf.st_mode))
|
|
return FILE_TYPE_DIRECTORY;
|
|
|
|
return FILE_TYPE_WEIRD;
|
|
}
|
|
|
|
struct DirHandle {
|
|
DIR *dir;
|
|
};
|
|
|
|
DirHandle *open_directory(const char *name, const char **errmsg)
|
|
{
|
|
DIR *dir;
|
|
DirHandle *ret;
|
|
|
|
dir = opendir(name);
|
|
if (!dir) {
|
|
*errmsg = strerror(errno);
|
|
return NULL;
|
|
}
|
|
|
|
ret = snew(DirHandle);
|
|
ret->dir = dir;
|
|
return ret;
|
|
}
|
|
|
|
char *read_filename(DirHandle *dir)
|
|
{
|
|
struct dirent *de;
|
|
|
|
do {
|
|
de = readdir(dir->dir);
|
|
if (de == NULL)
|
|
return NULL;
|
|
} while ((de->d_name[0] == '.' &&
|
|
(de->d_name[1] == '\0' ||
|
|
(de->d_name[1] == '.' && de->d_name[2] == '\0'))));
|
|
|
|
return dupstr(de->d_name);
|
|
}
|
|
|
|
void close_directory(DirHandle *dir)
|
|
{
|
|
closedir(dir->dir);
|
|
sfree(dir);
|
|
}
|
|
|
|
int test_wildcard(const char *name, bool cmdline)
|
|
{
|
|
struct stat statbuf;
|
|
|
|
if (stat(name, &statbuf) == 0) {
|
|
return WCTYPE_FILENAME;
|
|
} else if (cmdline) {
|
|
/*
|
|
* On Unix, we never need to parse wildcards coming from
|
|
* the command line, because the shell will have expanded
|
|
* them into a filename list already.
|
|
*/
|
|
return WCTYPE_NONEXISTENT;
|
|
} else {
|
|
#if HAVE_GLOB_H
|
|
glob_t globbed;
|
|
int ret = WCTYPE_NONEXISTENT;
|
|
|
|
if (glob(name, GLOB_ERR, NULL, &globbed) == 0) {
|
|
if (globbed.gl_pathc > 0)
|
|
ret = WCTYPE_WILDCARD;
|
|
globfree(&globbed);
|
|
}
|
|
|
|
return ret;
|
|
#else
|
|
/* On a system without glob.h, we just have to return a
|
|
* failure code */
|
|
return WCTYPE_NONEXISTENT;
|
|
#endif
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Actually return matching file names for a local wildcard.
|
|
*/
|
|
#if HAVE_GLOB_H
|
|
struct WildcardMatcher {
|
|
glob_t globbed;
|
|
int i;
|
|
};
|
|
WildcardMatcher *begin_wildcard_matching(const char *name) {
|
|
WildcardMatcher *ret = snew(WildcardMatcher);
|
|
|
|
if (glob(name, 0, NULL, &ret->globbed) < 0) {
|
|
sfree(ret);
|
|
return NULL;
|
|
}
|
|
|
|
ret->i = 0;
|
|
|
|
return ret;
|
|
}
|
|
char *wildcard_get_filename(WildcardMatcher *dir) {
|
|
if (dir->i < dir->globbed.gl_pathc) {
|
|
return dupstr(dir->globbed.gl_pathv[dir->i++]);
|
|
} else
|
|
return NULL;
|
|
}
|
|
void finish_wildcard_matching(WildcardMatcher *dir) {
|
|
globfree(&dir->globbed);
|
|
sfree(dir);
|
|
}
|
|
#else
|
|
WildcardMatcher *begin_wildcard_matching(const char *name)
|
|
{
|
|
return NULL;
|
|
}
|
|
char *wildcard_get_filename(WildcardMatcher *dir)
|
|
{
|
|
unreachable("Can't construct a valid WildcardMatcher without <glob.h>");
|
|
}
|
|
void finish_wildcard_matching(WildcardMatcher *dir)
|
|
{
|
|
unreachable("Can't construct a valid WildcardMatcher without <glob.h>");
|
|
}
|
|
#endif
|
|
|
|
char *stripslashes(const char *str, bool local)
|
|
{
|
|
char *p;
|
|
|
|
/*
|
|
* On Unix, we do the same thing regardless of the 'local'
|
|
* parameter.
|
|
*/
|
|
p = strrchr(str, '/');
|
|
if (p) str = p+1;
|
|
|
|
return (char *)str;
|
|
}
|
|
|
|
bool vet_filename(const char *name)
|
|
{
|
|
if (strchr(name, '/'))
|
|
return false;
|
|
|
|
if (name[0] == '.' && (!name[1] || (name[1] == '.' && !name[2])))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
bool create_directory(const char *name)
|
|
{
|
|
return mkdir(name, 0777) == 0;
|
|
}
|
|
|
|
char *dir_file_cat(const char *dir, const char *file)
|
|
{
|
|
ptrlen dir_pl = ptrlen_from_asciz(dir);
|
|
return dupcat(
|
|
dir, ptrlen_endswith(dir_pl, PTRLEN_LITERAL("/"), NULL) ? "" : "/",
|
|
file);
|
|
}
|
|
|
|
/*
|
|
* Do a select() between all currently active network fds and
|
|
* optionally stdin.
|
|
*/
|
|
static int ssh_sftp_do_select(bool include_stdin, bool no_fds_ok)
|
|
{
|
|
int i, *fdlist;
|
|
size_t fdsize;
|
|
int fd, fdcount, fdstate, rwx, ret;
|
|
unsigned long now = GETTICKCOUNT();
|
|
unsigned long next;
|
|
bool done_something = false;
|
|
|
|
fdlist = NULL;
|
|
fdsize = 0;
|
|
|
|
pollwrapper *pw = pollwrap_new();
|
|
|
|
do {
|
|
|
|
/* Count the currently active fds. */
|
|
i = 0;
|
|
for (fd = first_fd(&fdstate, &rwx); fd >= 0;
|
|
fd = next_fd(&fdstate, &rwx)) i++;
|
|
|
|
if (i < 1 && !no_fds_ok && !toplevel_callback_pending()) {
|
|
pollwrap_free(pw);
|
|
return -1; /* doom */
|
|
}
|
|
|
|
/* Expand the fdlist buffer if necessary. */
|
|
sgrowarray(fdlist, fdsize, i);
|
|
|
|
pollwrap_clear(pw);
|
|
|
|
/*
|
|
* Add all currently open fds to the select sets, and store
|
|
* them in fdlist as well.
|
|
*/
|
|
fdcount = 0;
|
|
for (fd = first_fd(&fdstate, &rwx); fd >= 0;
|
|
fd = next_fd(&fdstate, &rwx)) {
|
|
fdlist[fdcount++] = fd;
|
|
pollwrap_add_fd_rwx(pw, fd, rwx);
|
|
}
|
|
|
|
if (include_stdin)
|
|
pollwrap_add_fd_rwx(pw, 0, SELECT_R);
|
|
|
|
if (toplevel_callback_pending()) {
|
|
ret = pollwrap_poll_instant(pw);
|
|
if (ret == 0)
|
|
done_something |= run_toplevel_callbacks();
|
|
} else if (run_timers(now, &next)) {
|
|
do {
|
|
unsigned long then;
|
|
long ticks;
|
|
|
|
then = now;
|
|
now = GETTICKCOUNT();
|
|
if (now - then > next - then)
|
|
ticks = 0;
|
|
else
|
|
ticks = next - now;
|
|
|
|
bool overflow = false;
|
|
if (ticks > INT_MAX) {
|
|
ticks = INT_MAX;
|
|
overflow = true;
|
|
}
|
|
|
|
ret = pollwrap_poll_timeout(pw, ticks);
|
|
if (ret == 0 && !overflow)
|
|
now = next;
|
|
else
|
|
now = GETTICKCOUNT();
|
|
} while (ret < 0 && errno == EINTR);
|
|
} else {
|
|
do {
|
|
ret = pollwrap_poll_endless(pw);
|
|
} while (ret < 0 && errno == EINTR);
|
|
}
|
|
} while (ret == 0 && !done_something);
|
|
|
|
if (ret < 0) {
|
|
perror("poll");
|
|
exit(1);
|
|
}
|
|
|
|
for (i = 0; i < fdcount; i++) {
|
|
fd = fdlist[i];
|
|
int rwx = pollwrap_get_fd_rwx(pw, fd);
|
|
/*
|
|
* We must process exceptional notifications before
|
|
* ordinary readability ones, or we may go straight
|
|
* past the urgent marker.
|
|
*/
|
|
if (rwx & SELECT_X)
|
|
select_result(fd, SELECT_X);
|
|
if (rwx & SELECT_R)
|
|
select_result(fd, SELECT_R);
|
|
if (rwx & SELECT_W)
|
|
select_result(fd, SELECT_W);
|
|
}
|
|
|
|
sfree(fdlist);
|
|
|
|
run_toplevel_callbacks();
|
|
|
|
int toret = pollwrap_check_fd_rwx(pw, 0, SELECT_R) ? 1 : 0;
|
|
pollwrap_free(pw);
|
|
return toret;
|
|
}
|
|
|
|
/*
|
|
* Wait for some network data and process it.
|
|
*/
|
|
int ssh_sftp_loop_iteration(void)
|
|
{
|
|
return ssh_sftp_do_select(false, false);
|
|
}
|
|
|
|
/*
|
|
* Read a PSFTP command line from stdin.
|
|
*/
|
|
char *ssh_sftp_get_cmdline(const char *prompt, bool no_fds_ok)
|
|
{
|
|
char *buf;
|
|
size_t buflen, bufsize;
|
|
int ret;
|
|
|
|
fputs(prompt, stdout);
|
|
fflush(stdout);
|
|
|
|
buf = NULL;
|
|
buflen = bufsize = 0;
|
|
|
|
while (1) {
|
|
ret = ssh_sftp_do_select(true, no_fds_ok);
|
|
if (ret < 0) {
|
|
printf("connection died\n");
|
|
sfree(buf);
|
|
return NULL; /* woop woop */
|
|
}
|
|
if (ret > 0) {
|
|
sgrowarray(buf, bufsize, buflen);
|
|
ret = read(0, buf+buflen, 1);
|
|
if (ret < 0) {
|
|
perror("read");
|
|
sfree(buf);
|
|
return NULL;
|
|
}
|
|
if (ret == 0) {
|
|
/* eof on stdin; no error, but no answer either */
|
|
sfree(buf);
|
|
return NULL;
|
|
}
|
|
|
|
if (buf[buflen++] == '\n') {
|
|
/* we have a full line */
|
|
return buf;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void frontend_net_error_pending(void) {}
|
|
|
|
void platform_psftp_pre_conn_setup(LogPolicy *lp) {}
|
|
|
|
const bool buildinfo_gtk_relevant = false;
|
|
|
|
/*
|
|
* Main program: do platform-specific initialisation and then call
|
|
* psftp_main().
|
|
*/
|
|
int main(int argc, char *argv[])
|
|
{
|
|
uxsel_init();
|
|
return psftp_main(argc, argv);
|
|
}
|