/* -*-c-*-
*
- * $Id: pixie.c,v 1.4 2000/06/17 11:50:53 mdw Exp $
+ * $Id$
*
* Passphrase pixie for Catacomb
*
* (c) 1999 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of Catacomb.
*
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
- *
+ *
* Catacomb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with Catacomb; if not, write to the Free
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: pixie.c,v $
- * Revision 1.4 2000/06/17 11:50:53 mdw
- * New pixie protocol allowing application to request passphrases and send
- * them to the pixie. Use the secure arena interface for the input
- * buffer. Extend the input buffer. Other minor fixes.
- *
- * Revision 1.3 1999/12/22 22:14:40 mdw
- * Only produce initialization message if verbose.
- *
- * Revision 1.2 1999/12/22 22:13:42 mdw
- * Fix bug in passphrase flushing loop.
- *
- * Revision 1.1 1999/12/22 15:58:41 mdw
- * Passphrase pixie support.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include "config.h"
/*----- Static variables --------------------------------------------------*/
-static unsigned long timeout = 300;
+static unsigned long timeout = 900;
static sel_state sel;
static unsigned verbose = 1;
static const char *command = 0;
static lmem lm;
static unsigned flags = 0;
-enum {
- F_SYSLOG = 1,
- F_FETCH = 2
-};
+#define F_SYSLOG 1u
+#define F_FETCH 2u
/*----- Event logging -----------------------------------------------------*/
d.len += strftime(d.buf, d.sz, "%Y-%m-%d %H:%M:%S ", tm);
}
va_start(ap, p);
- dstr_vputf(&d, p, ap);
+ dstr_vputf(&d, p, &ap);
va_end(ap);
if (flags & F_SYSLOG)
{
if (p->t)
sel_rmtimer(&p->timer);
- free(p->tag);
+ xfree(p->tag);
l_free(&lm, p->p);
p->next->prev = p->prev;
p->prev->next = p->next;
return (p);
if (P_ROOT->next == P_ROOT)
return (0);
- if (verbose) {
+ if (verbose) {
log("flushing passphrase `%s' to free up needed space",
P_ROOT->next->tag);
}
int fd[2];
pid_t kid;
int r;
+ int rc;
/* --- Substitute the prompt string into the command --- */
if (dup2(fd[1], STDOUT_FILENO) < 0)
_exit(127);
close(fd[0]);
- execl("/bin/sh", "sh", "-c", d.buf, (void *)0);
+ execl("/bin/sh", "sh", "-c", d.buf, (char *)0);
_exit(127);
}
*q = 0;
}
close(fd[0]);
- waitpid(kid, 0, 0);
+ waitpid(kid, &rc, 0);
dstr_destroy(&d);
- if (r < 0)
+ if (r < 0 || rc != 0)
goto fail_0;
goto ok;
memset(pp, 0, LBUFSZ);
l_free(&lm, pp);
}
- return (0);
+ return (-1);
#undef LBUFSZ
}
unsigned f;
} pixserv;
-enum { px_stdin = 1 };
+#define px_stdin 1u
#define PIXSERV_TIMEOUT 30
va_list ap;
va_start(ap, p);
- dstr_vputf(&d, p, ap);
+ dstr_vputf(&d, p, &ap);
write(px->fd, d.buf, d.len);
va_end(ap);
dstr_destroy(&d);
case 'h': t *= 60;
case 'm': t *= 60;
case 's': if (q[1] != 0)
- default: t = 0;
+ default: t = 0;
case 0: break;
}
return (t);
/* --- @pixserv_line@ --- *
*
* Arguments: @char *s@ = pointer to the line read
+ * @size_t len@ = length of the line
* @void *p@ = pointer to server block
*
* Returns: ---
* Use: Handles a line read from the client.
*/
-static void pixserv_line(char *s, void *p)
+static void pixserv_line(char *s, size_t len, void *p)
{
pixserv *px = p;
char *q, *qq;
{
int nfd;
struct sockaddr_un sun;
- int sunsz = sizeof(sun);
+ size_t sunsz = sizeof(sun);
if (mode != SEL_READ)
return;
if ((nfd = accept(fd, (struct sockaddr *)&sun, &sunsz)) < 0) {
- if (verbose)
+ if (verbose && errno != EAGAIN && errno != EWOULDBLOCK &&
+ errno != ECONNABORTED && errno != EPROTO && errno != EINTR)
log("new connection failed: %s", strerror(errno));
return;
}
/* --- Set up the parent directory --- */
{
- dstr d = DSTR_INIT;
char *p = sun->sun_path;
char *q = strrchr(p, '/');
if (q) {
+ dstr d = DSTR_INIT;
struct stat st;
DPUTM(&d, p, q - p);
mkdir(d.buf, 0700);
if (stat(d.buf, &st))
die(1, "couldn't stat `%s': %s", d.buf, strerror(errno));
+ if (!S_ISDIR(st.st_mode))
+ die(1, "object `%s' isn't a directory", d.buf);
if (st.st_mode & 0077)
die(1, "parent directory `%s' has group or world access", d.buf);
+ dstr_destroy(&d);
}
}
die(1, "too many retries; giving up");
n--;
if (connect(fd, (struct sockaddr *)sun, sz)) {
+ struct stat st;
if (errno != ECONNREFUSED)
die(1, "couldn't bind to address: %s", strerror(e));
+ if (stat(sun->sun_path, &st))
+ die(1, "couldn't stat `%s': %s", sun->sun_path, strerror(errno));
+ if (!S_ISSOCK(st.st_mode))
+ die(1, "object `%s' isn't a socket", sun->sun_path);
if (verbose)
log("stale socket found; removing it");
unlink(sun->sun_path);
/* --- Variables --- */
static selbuf c_server, c_client;
-static c_flags = 0;
-enum { cf_uclose = 1, cf_sclose = 2 };
+static unsigned c_flags = 0;
+
+#define cf_uclose 1u
+#define cf_sclose 2u
+#define cf_cooked 4u
/* --- Line handler functions --- */
-static void c_uline(char *s, void *p)
+static void c_uline(char *s, size_t len, void *p)
{
- size_t sz;
if (!s) {
selbuf_destroy(&c_client);
shutdown(c_server.reader.fd, 1);
c_flags |= cf_uclose;
} else {
- sz = strlen(s);
- s[sz++] = '\n';
- write(c_server.reader.fd, s, sz);
+ s[len++] = '\n';
+ write(c_server.reader.fd, s, len);
}
}
-static void c_sline(char *s, void *p)
+static void c_sline(char *s, size_t len, void *p)
{
if (!s) {
selbuf_destroy(&c_server);
selbuf_destroy(&c_client);
}
exit(0);
- } else
+ }
+ if (!(c_flags & cf_cooked))
puts(s);
+ else {
+ char *q = str_getword(&s);
+ if (strcmp(q, "FAIL") == 0)
+ die(1, "%s", s);
+ else if (strcmp(q, "INFO") == 0 ||
+ strcmp(q, "ITEM") == 0)
+ puts(s);
+ else if (strcmp(q, "OK") == 0) {
+ if (s && *s) puts(s);
+ } else if (strcmp(q, "MISSING") == 0)
+ ;
+ else
+ moan("unexpected output: %s %s", q, s);
+ }
}
/* --- @pix_client@ --- *
{
int fd;
+ /* --- Dispose of locked memory --- */
+
+ l_destroy(&lm);
+
/* --- Open the socket --- */
if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
DPUTC(&d, '\n');
write(fd, d.buf, d.len);
shutdown(fd, 1);
+ c_flags |= cf_uclose | cf_cooked;
dstr_destroy(&d);
- }
+ }
/* --- And repeat --- */
- for (;;)
- sel_select(&sel);
+ for (;;) {
+ if (sel_select(&sel))
+ die(EXIT_FAILURE, "select error: %s", strerror(errno));
+ }
}
/*----- Main code ---------------------------------------------------------*/
{
pquis(fp, "\
Usage:\n\
- $ [-qvidl] [-c command] [-t timeout] [-s socket]\n\
- $ [-s socket] -C [command args...]\n\
+ $ [-qvfidl] [-c COMMAND] [-t TIMEOUT] [-s SOCKET]\n\
+ $ [-s SOCKET] -C [COMMAND ARGS...]\n\
+ $ [-s SOCKET] -P[P] TAG\n\
");
}
-u, --usage Show a (very) terse usage summary.\n\
\n\
-C, --client Connect to a running pixie as a client.\n\
+-P, --passphrase Request passphrase TAG and print to stdout.\n\
+-PP, --verify-passphrase\n\
+ Verify passphrase TAG and print to stdout.\n\
\n\
-q, --quiet Emit fewer log messages.\n\
-v, --version Emit more log messages.\n\
size_t sz;
unsigned f = 0;
- enum {
- f_bogus = 1,
- f_client = 2,
- f_stdin = 4,
- f_daemon = 8,
- f_syslog = 16
- };
+#define f_bogus 1u
+#define f_client 2u
+#define f_stdin 4u
+#define f_daemon 8u
+#define f_syslog 16u
+#define f_fetch 32u
+#define f_verify 64u
/* --- Initialize libraries --- */
{ "quiet", 0, 0, 'q' },
{ "verbose", 0, 0, 'v' },
{ "client", 0, 0, 'C' },
+ { "passphrase", 0, 0, 'P' },
+ { "verify-passphrase", 0, 0, '+' },
{ "socket", OPTF_ARGREQ, 0, 's' },
{ "command", OPTF_ARGREQ, 0, 'c' },
{ "fetch", 0, 0, 'f' },
/* --- Magic terminator --- */
- { 0, 0, 0, 0 }
+ { 0, 0, 0, 0 }
};
- int i = mdwopt(argc, argv, "hVuqvCs:c:ft:idl", opts, 0, 0, 0);
+ int i = mdwopt(argc, argv, "hVuqvCPs:c:ft:idl", opts, 0, 0, 0);
if (i < 0)
break;
break;
case 'C':
f |= f_client;
+ f &= ~f_fetch;
+ break;
+ case 'P':
+ if (!(f & f_fetch))
+ f |= f_fetch;
+ else
+ f |= f_verify;
+ break;
+ case '+':
+ f |= f_fetch | f_verify;
+ f &= ~f_client;
break;
case 's':
path = optarg;
}
}
- if (f & f_bogus || (optind < argc && !(f & f_client))) {
+ if (f & f_bogus ||
+ (optind < argc && !(f & (f_client|f_fetch))) ||
+ ((f & f_fetch) && optind != argc - 1)) {
usage(stderr);
exit(1);
}
+ /* --- Handle request for a passphrase --- */
+
+ if (f & f_fetch) {
+ char *buf = l_alloc(&lm, 1024);
+ passphrase_connect(path);
+ if (passphrase_read(argv[optind],
+ (f & f_verify) ? PMODE_VERIFY : PMODE_READ,
+ buf, 1024))
+ die(1, "failed to read passphrase: %s", strerror(errno));
+ puts(buf);
+ return (0);
+ }
+
/* --- Set up the socket address --- */
sun = pixie_address(path, &sz);
{
static sig sigint, sigterm, sigquit, sighup;
+ struct sigaction sa;
sig_init(&sel);
- sig_add(&sigint, SIGINT, pix_sigdie, 0);
+ sigaction(SIGINT, 0, &sa);
+ if (sa.sa_handler != SIG_IGN)
+ sig_add(&sigint, SIGINT, pix_sigdie, 0);
sig_add(&sigterm, SIGTERM, pix_sigdie, 0);
sig_add(&sigquit, SIGQUIT, pix_sigflush, 0);
sig_add(&sighup, SIGHUP, pix_sigflush, 0);
/* --- Fork into the background if requested --- */
- if (f & f_daemon) {
+ if (f & f_daemon) {
pid_t kid;
if (((f & f_stdin) &&
}
}
#endif
+ chdir("/");
setsid();
- if (fork() > 0)
+ if (fork() != 0)
_exit(0);
}
if (verbose)
log("initialized ok");
- for (;;)
- sel_select(&sel);
+
+ {
+ int selerr = 0;
+ for (;;) {
+ if (!sel_select(&sel))
+ selerr = 0;
+ else if (errno != EINTR && errno != EAGAIN) {
+ log("error from select: %s", strerror(errno));
+ selerr++;
+ if (selerr > 8) {
+ log("too many consecutive select errors: bailing out");
+ exit(EXIT_FAILURE);
+ }
+ }
+ }
+ }
return (0);
}
projects / u / mdw / catacomb / blobdiff