mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-13 21:54:40 +00:00
226cfa0378
Linux and works. So that is at least a good sign. =) 20010122 - (bal) OpenBSD Resync - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus [servconf.c ssh.h sshd.c] only auth-chall.c needs #ifdef SKEY - markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus [auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c packet.c pathname.h readconf.c scp.c servconf.c serverloop.c session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h ssh1.h sshconnect1.c sshd.c ttymodes.c] move ssh1 definitions to ssh1.h, pathnames to pathnames.h - markus@cvs.openbsd.org 2001/01/19 16:48:14 [sshd.8] fix typo; from stevesk@ - markus@cvs.openbsd.org 2001/01/19 16:50:58 [ssh-dss.c] clear and free digest, make consistent with other code (use dlen); from stevesk@ - markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus [auth-options.c auth-options.h auth-rsa.c auth2.c] pass the filename to auth_parse_options() - markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001 [readconf.c] fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com - stevesk@cvs.openbsd.org 2001/01/20 18:20:29 [sshconnect2.c] dh_new_group() does not return NULL. ok markus@ - markus@cvs.openbsd.org 2001/01/20 21:33:42 [ssh-add.c] do not loop forever if askpass does not exist; from andrew@pimlott.ne.mediaone.net - djm@cvs.openbsd.org 2001/01/20 23:00:56 [servconf.c] Check for NULL return from strdelim; ok markus - djm@cvs.openbsd.org 2001/01/20 23:02:07 [readconf.c] KNF; ok markus - jakob@cvs.openbsd.org 2001/01/21 9:00:33 [ssh-keygen.1] remove -R flag; ok markus@ - markus@cvs.openbsd.org 2001/01/21 19:05:40 [atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c cipher.c cli.c clientloop.c clientloop.h compat.c compress.c deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c key.c key.h log-client.c log-server.c log.c log.h login.c login.h match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h ttysmodes.c uidswap.c xmalloc.c] split ssh.h and try to cleanup the #include mess. remove unnecessary #includes. rename util.[ch] -> misc.[ch] - (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree - (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve conflict when compiling for non-kerb install - (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes on 1/19.
199 lines
3.6 KiB
C
199 lines
3.6 KiB
C
#include "includes.h"
|
|
RCSID("$OpenBSD: cli.c,v 1.6 2001/01/21 19:05:47 markus Exp $");
|
|
|
|
#include "xmalloc.h"
|
|
#include "log.h"
|
|
|
|
static int cli_input = -1;
|
|
static int cli_output = -1;
|
|
static int cli_from_stdin = 0;
|
|
|
|
sigset_t oset;
|
|
sigset_t nset;
|
|
struct sigaction nsa;
|
|
struct sigaction osa;
|
|
struct termios ntio;
|
|
struct termios otio;
|
|
int echo_modified;
|
|
|
|
volatile int intr;
|
|
|
|
static int
|
|
cli_open(int from_stdin)
|
|
{
|
|
if (cli_input >= 0 && cli_output >= 0 && cli_from_stdin == from_stdin)
|
|
return 1;
|
|
|
|
if (from_stdin) {
|
|
if (!cli_from_stdin && cli_input >= 0) {
|
|
(void)close(cli_input);
|
|
}
|
|
cli_input = STDIN_FILENO;
|
|
cli_output = STDERR_FILENO;
|
|
} else {
|
|
cli_input = cli_output = open("/dev/tty", O_RDWR);
|
|
if (cli_input < 0)
|
|
fatal("You have no controlling tty. Cannot read passphrase.");
|
|
}
|
|
|
|
cli_from_stdin = from_stdin;
|
|
|
|
return cli_input >= 0 && cli_output >= 0 && cli_from_stdin == from_stdin;
|
|
}
|
|
|
|
static void
|
|
cli_close()
|
|
{
|
|
if (!cli_from_stdin && cli_input >= 0)
|
|
close(cli_input);
|
|
cli_input = -1;
|
|
cli_output = -1;
|
|
cli_from_stdin = 0;
|
|
return;
|
|
}
|
|
|
|
void
|
|
intrcatch()
|
|
{
|
|
intr = 1;
|
|
}
|
|
|
|
static void
|
|
cli_echo_disable()
|
|
{
|
|
sigemptyset(&nset);
|
|
sigaddset(&nset, SIGTSTP);
|
|
(void) sigprocmask(SIG_BLOCK, &nset, &oset);
|
|
|
|
intr = 0;
|
|
|
|
memset(&nsa, 0, sizeof(nsa));
|
|
nsa.sa_handler = intrcatch;
|
|
(void) sigaction(SIGINT, &nsa, &osa);
|
|
|
|
echo_modified = 0;
|
|
if (tcgetattr(cli_input, &otio) == 0 && (otio.c_lflag & ECHO)) {
|
|
echo_modified = 1;
|
|
ntio = otio;
|
|
ntio.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL);
|
|
(void) tcsetattr(cli_input, TCSANOW, &ntio);
|
|
}
|
|
return;
|
|
}
|
|
|
|
static void
|
|
cli_echo_restore()
|
|
{
|
|
if (echo_modified != 0) {
|
|
tcsetattr(cli_input, TCSANOW, &otio);
|
|
echo_modified = 0;
|
|
}
|
|
|
|
(void) sigprocmask(SIG_SETMASK, &oset, NULL);
|
|
(void) sigaction(SIGINT, &osa, NULL);
|
|
|
|
if (intr != 0) {
|
|
kill(getpid(), SIGINT);
|
|
sigemptyset(&nset);
|
|
/* XXX tty has not neccessarily drained by now? */
|
|
sigsuspend(&nset);
|
|
intr = 0;
|
|
}
|
|
return;
|
|
}
|
|
|
|
static int
|
|
cli_read(char* buf, int size, int echo)
|
|
{
|
|
char ch = 0;
|
|
int i = 0;
|
|
|
|
if (!echo)
|
|
cli_echo_disable();
|
|
|
|
while (ch != '\n') {
|
|
if (read(cli_input, &ch, 1) != 1)
|
|
break;
|
|
if (ch == '\n' || intr != 0)
|
|
break;
|
|
if (i < size)
|
|
buf[i++] = ch;
|
|
}
|
|
buf[i] = '\0';
|
|
|
|
if (!echo)
|
|
cli_echo_restore();
|
|
if (!intr && !echo)
|
|
(void) write(cli_output, "\n", 1);
|
|
return i;
|
|
}
|
|
|
|
static int
|
|
cli_write(const char* buf, int size)
|
|
{
|
|
int i, len, pos, ret = 0;
|
|
char *output, *p;
|
|
|
|
output = xmalloc(4*size);
|
|
for (p = output, i = 0; i < size; i++) {
|
|
if (buf[i] == '\n')
|
|
*p++ = buf[i];
|
|
else
|
|
p = vis(p, buf[i], 0, 0);
|
|
}
|
|
len = p - output;
|
|
|
|
for (pos = 0; pos < len; pos += ret) {
|
|
ret = write(cli_output, output + pos, len - pos);
|
|
if (ret == -1) {
|
|
xfree(output);
|
|
return -1;
|
|
}
|
|
}
|
|
xfree(output);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Presents a prompt and returns the response allocated with xmalloc().
|
|
* Uses /dev/tty or stdin/out depending on arg. Optionally disables echo
|
|
* of response depending on arg. Tries to ensure that no other userland
|
|
* buffer is storing the response.
|
|
*/
|
|
char*
|
|
cli_read_passphrase(const char* prompt, int from_stdin, int echo_enable)
|
|
{
|
|
char buf[BUFSIZ];
|
|
char* p;
|
|
|
|
if (!cli_open(from_stdin))
|
|
fatal("Cannot read passphrase.");
|
|
|
|
fflush(stdout);
|
|
|
|
cli_write(prompt, strlen(prompt));
|
|
cli_read(buf, sizeof buf, echo_enable);
|
|
|
|
cli_close();
|
|
|
|
p = xstrdup(buf);
|
|
memset(buf, 0, sizeof(buf));
|
|
return (p);
|
|
}
|
|
|
|
char*
|
|
cli_prompt(char* prompt, int echo_enable)
|
|
{
|
|
return cli_read_passphrase(prompt, 0, echo_enable);
|
|
}
|
|
|
|
void
|
|
cli_mesg(char* mesg)
|
|
{
|
|
cli_open(0);
|
|
cli_write(mesg, strlen(mesg));
|
|
cli_write("\n", strlen("\n"));
|
|
cli_close();
|
|
return;
|
|
}
|