#include <stdlib.h>
#include <stdarg.h>
#include <assert.h>
+
#include <termios.h>
#include <unistd.h>
+#include <fcntl.h>
#include "putty.h"
#include "storage.h"
static void *console_logctx = NULL;
+static struct termios orig_termios_stderr;
+static int stderr_is_a_tty;
+
+void stderr_tty_init()
+{
+ /* Ensure that if stderr is a tty, we can get it back to a sane state. */
+ if ((flags & FLAG_STDERR_TTY) && isatty(STDERR_FILENO)) {
+ stderr_is_a_tty = TRUE;
+ tcgetattr(STDERR_FILENO, &orig_termios_stderr);
+ }
+}
+
+void premsg(struct termios *cf)
+{
+ if (stderr_is_a_tty) {
+ tcgetattr(STDERR_FILENO, cf);
+ tcsetattr(STDERR_FILENO, TCSADRAIN, &orig_termios_stderr);
+ }
+}
+void postmsg(struct termios *cf)
+{
+ if (stderr_is_a_tty)
+ tcsetattr(STDERR_FILENO, TCSADRAIN, cf);
+}
+
/*
* Clean up and exit.
*/
exit(code);
}
+void set_busy_status(void *frontend, int status)
+{
+}
+
void update_specials_menu(void *frontend)
{
}
-void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
- char *keystr, char *fingerprint)
+void notify_remote_exit(void *frontend)
+{
+}
+
+void timer_change_notify(unsigned long next)
+{
+}
+
+int verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
+ char *keystr, char *fingerprint,
+ void (*callback)(void *ctx, int result), void *ctx)
{
int ret;
static const char abandoned[] = "Connection abandoned.\n";
char line[32];
+ struct termios cf;
/*
* Verify the key.
ret = verify_host_key(host, port, keytype, keystr);
if (ret == 0) /* success - key matched OK */
- return;
+ return 1;
+ premsg(&cf);
if (ret == 2) { /* key was different */
if (console_batch_mode) {
fprintf(stderr, wrongmsg_batch, keytype, fingerprint);
- cleanup_exit(1);
+ return 0;
}
fprintf(stderr, wrongmsg, keytype, fingerprint);
fflush(stderr);
if (ret == 1) { /* key was absent */
if (console_batch_mode) {
fprintf(stderr, absentmsg_batch, keytype, fingerprint);
- cleanup_exit(1);
+ return 0;
}
fprintf(stderr, absentmsg, keytype, fingerprint);
fflush(stderr);
newmode.c_lflag |= ECHO | ISIG | ICANON;
tcsetattr(0, TCSANOW, &newmode);
line[0] = '\0';
- read(0, line, sizeof(line) - 1);
+ if (read(0, line, sizeof(line) - 1) <= 0)
+ /* handled below */;
tcsetattr(0, TCSANOW, &oldmode);
}
if (line[0] != '\0' && line[0] != '\r' && line[0] != '\n') {
if (line[0] == 'y' || line[0] == 'Y')
store_host_key(host, port, keytype, keystr);
+ postmsg(&cf);
+ return 1;
} else {
fprintf(stderr, abandoned);
- cleanup_exit(0);
+ postmsg(&cf);
+ return 0;
}
}
/*
- * Ask whether the selected cipher is acceptable (since it was
+ * Ask whether the selected algorithm is acceptable (since it was
* below the configured 'warn' threshold).
- * cs: 0 = both ways, 1 = client->server, 2 = server->client
*/
-void askcipher(void *frontend, char *ciphername, int cs)
+int askalg(void *frontend, const char *algtype, const char *algname,
+ void (*callback)(void *ctx, int result), void *ctx)
{
static const char msg[] =
- "The first %scipher supported by the server is\n"
+ "The first %s supported by the server is\n"
"%s, which is below the configured warning threshold.\n"
"Continue with connection? (y/n) ";
static const char msg_batch[] =
- "The first %scipher supported by the server is\n"
+ "The first %s supported by the server is\n"
"%s, which is below the configured warning threshold.\n"
"Connection abandoned.\n";
static const char abandoned[] = "Connection abandoned.\n";
char line[32];
+ struct termios cf;
+ premsg(&cf);
if (console_batch_mode) {
- fprintf(stderr, msg_batch,
- (cs == 0) ? "" :
- (cs == 1) ? "client-to-server " : "server-to-client ",
- ciphername);
- cleanup_exit(1);
+ fprintf(stderr, msg_batch, algtype, algname);
+ return 0;
}
- fprintf(stderr, msg,
- (cs == 0) ? "" :
- (cs == 1) ? "client-to-server " : "server-to-client ",
- ciphername);
+ fprintf(stderr, msg, algtype, algname);
fflush(stderr);
{
newmode.c_lflag |= ECHO | ISIG | ICANON;
tcsetattr(0, TCSANOW, &newmode);
line[0] = '\0';
- read(0, line, sizeof(line) - 1);
+ if (read(0, line, sizeof(line) - 1) <= 0)
+ /* handled below */;
tcsetattr(0, TCSANOW, &oldmode);
}
if (line[0] == 'y' || line[0] == 'Y') {
- return;
+ postmsg(&cf);
+ return 1;
} else {
fprintf(stderr, abandoned);
- cleanup_exit(0);
+ postmsg(&cf);
+ return 0;
}
}
* Ask whether to wipe a session log file before writing to it.
* Returns 2 for wipe, 1 for append, 0 for cancel (don't log).
*/
-int askappend(void *frontend, Filename filename)
+int askappend(void *frontend, Filename *filename,
+ void (*callback)(void *ctx, int result), void *ctx)
{
static const char msgtemplate[] =
"The session log file \"%.*s\" already exists.\n"
"Logging will not be enabled.\n";
char line[32];
+ struct termios cf;
+ premsg(&cf);
if (console_batch_mode) {
- fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename.path);
+ fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename->path);
fflush(stderr);
return 0;
}
- fprintf(stderr, msgtemplate, FILENAME_MAX, filename.path);
+ fprintf(stderr, msgtemplate, FILENAME_MAX, filename->path);
fflush(stderr);
{
newmode.c_lflag |= ECHO | ISIG | ICANON;
tcsetattr(0, TCSANOW, &newmode);
line[0] = '\0';
- read(0, line, sizeof(line) - 1);
+ if (read(0, line, sizeof(line) - 1) <= 0)
+ /* handled below */;
tcsetattr(0, TCSANOW, &oldmode);
}
+ postmsg(&cf);
if (line[0] == 'y' || line[0] == 'Y')
return 2;
else if (line[0] == 'n' || line[0] == 'N')
void old_keyfile_warning(void)
{
static const char message[] =
- "You are loading an SSH 2 private key which has an\n"
+ "You are loading an SSH-2 private key which has an\n"
"old version of the file format. This means your key\n"
"file is not fully tamperproof. Future versions of\n"
"PuTTY may stop supporting this private key format,\n"
"Once the key is loaded into PuTTYgen, you can perform\n"
"this conversion simply by saving it again.\n";
+ struct termios cf;
+ premsg(&cf);
fputs(message, stderr);
+ postmsg(&cf);
}
void console_provide_logctx(void *logctx)
void logevent(void *frontend, const char *string)
{
+ struct termios cf;
+ if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE))
+ premsg(&cf);
if (console_logctx)
log_eventlog(console_logctx, string);
+ if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE))
+ postmsg(&cf);
+}
+
+/*
+ * Special functions to read and print to the console for password
+ * prompts and the like. Uses /dev/tty or stdin/stderr, in that order
+ * of preference; also sanitises escape sequences out of the text, on
+ * the basis that it might have been sent by a hostile SSH server
+ * doing malicious keyboard-interactive.
+ */
+static void console_open(FILE **outfp, int *infd)
+{
+ int fd;
+
+ if ((fd = open("/dev/tty", O_RDWR)) >= 0) {
+ *infd = fd;
+ *outfp = fdopen(*infd, "w");
+ } else {
+ *infd = 0;
+ *outfp = stderr;
+ }
+}
+static void console_close(FILE *outfp, int infd)
+{
+ if (outfp != stderr)
+ fclose(outfp); /* will automatically close infd too */
}
-int console_get_line(const char *prompt, char *str,
- int maxlen, int is_pw)
+static void console_prompt_text(FILE *outfp, const char *data, int len)
{
- struct termios oldmode, newmode;
int i;
- if (console_batch_mode) {
- if (maxlen > 0)
- str[0] = '\0';
+ for (i = 0; i < len; i++)
+ if ((data[i] & 0x60) || (data[i] == '\n'))
+ fputc(data[i], outfp);
+ fflush(outfp);
+}
+
+int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
+{
+ size_t curr_prompt;
+ FILE *outfp = NULL;
+ int infd;
+
+ /*
+ * Zero all the results, in case we abort half-way through.
+ */
+ {
+ int i;
+ for (i = 0; i < p->n_prompts; i++)
+ prompt_set_result(p->prompts[i], "");
+ }
+
+ if (p->n_prompts && console_batch_mode)
return 0;
- } else {
- tcgetattr(0, &oldmode);
+
+ console_open(&outfp, &infd);
+
+ /*
+ * Preamble.
+ */
+ /* We only print the `name' caption if we have to... */
+ if (p->name_reqd && p->name) {
+ size_t l = strlen(p->name);
+ console_prompt_text(outfp, p->name, l);
+ if (p->name[l-1] != '\n')
+ console_prompt_text(outfp, "\n", 1);
+ }
+ /* ...but we always print any `instruction'. */
+ if (p->instruction) {
+ size_t l = strlen(p->instruction);
+ console_prompt_text(outfp, p->instruction, l);
+ if (p->instruction[l-1] != '\n')
+ console_prompt_text(outfp, "\n", 1);
+ }
+
+ for (curr_prompt = 0; curr_prompt < p->n_prompts; curr_prompt++) {
+
+ struct termios oldmode, newmode;
+ int len;
+ prompt_t *pr = p->prompts[curr_prompt];
+
+ tcgetattr(infd, &oldmode);
newmode = oldmode;
newmode.c_lflag |= ISIG | ICANON;
- if (is_pw)
+ if (!pr->echo)
newmode.c_lflag &= ~ECHO;
else
newmode.c_lflag |= ECHO;
- tcsetattr(0, TCSANOW, &newmode);
-
- fputs(prompt, stdout);
- fflush(stdout);
- i = read(0, str, maxlen - 1);
-
- tcsetattr(0, TCSANOW, &oldmode);
-
- if (i > 0 && str[i-1] == '\n')
- i--;
- str[i] = '\0';
+ tcsetattr(infd, TCSANOW, &newmode);
+
+ console_prompt_text(outfp, pr->prompt, strlen(pr->prompt));
+
+ len = 0;
+ while (1) {
+ int ret;
+
+ prompt_ensure_result_size(pr, len * 5 / 4 + 512);
+ ret = read(infd, pr->result + len, pr->resultsize - len - 1);
+ if (ret <= 0) {
+ len = -1;
+ break;
+ }
+ len += ret;
+ if (pr->result[len - 1] == '\n') {
+ len--;
+ break;
+ }
+ }
+
+ tcsetattr(infd, TCSANOW, &oldmode);
+
+ if (!pr->echo)
+ console_prompt_text(outfp, "\n", 1);
+
+ if (len < 0) {
+ console_close(outfp, infd);
+ return 0; /* failure due to read error */
+ }
+
+ pr->result[len] = '\0';
+ }
- if (is_pw)
- fputs("\n", stdout);
+ console_close(outfp, infd);
- return 1;
- }
+ return 1; /* success */
}
void frontend_keypress(void *handle)
* X11-forwarding-related things suitable for console.
*/
-const char platform_x11_best_transport[] = "unix";
-
char *platform_get_x_display(void) {
return dupstr(getenv("DISPLAY"));
}
projects / u / mdw / putty / blobdiff