2020-04-24 08:55:38 +02:00
|
|
|
#define _GNU_SOURCE
|
|
|
|
|
2020-04-25 15:00:35 +02:00
|
|
|
#include <errno.h>
|
|
|
|
#include <fcntl.h>
|
2020-04-27 19:10:55 +02:00
|
|
|
#include <inttypes.h>
|
2020-04-25 13:40:13 +02:00
|
|
|
#include <poll.h>
|
|
|
|
#include <signal.h>
|
2020-04-24 08:55:38 +02:00
|
|
|
#include <stdarg.h>
|
2020-04-25 15:00:35 +02:00
|
|
|
#include <stdint.h>
|
2020-04-24 08:55:38 +02:00
|
|
|
#include <stdio.h>
|
2020-04-25 15:00:35 +02:00
|
|
|
#include <stdlib.h>
|
2020-04-24 08:55:38 +02:00
|
|
|
#include <string.h>
|
|
|
|
#include <sys/uio.h>
|
|
|
|
#include <sys/wait.h>
|
|
|
|
#include <termios.h>
|
2020-04-25 13:40:13 +02:00
|
|
|
#include <unistd.h>
|
2020-04-24 08:55:38 +02:00
|
|
|
|
|
|
|
#include "argz/argz.c"
|
|
|
|
#include "libhydrogen/hydrogen.c"
|
|
|
|
|
2020-04-25 18:55:33 +02:00
|
|
|
#define S_COUNT(x) (sizeof(x) / sizeof((x)[0]))
|
2020-04-27 19:10:55 +02:00
|
|
|
#define S_VER_MAJOR 0U
|
|
|
|
#define S_VER_MINOR 0U
|
|
|
|
#define S_ENTRYSIZE 512U
|
2020-04-25 18:55:33 +02:00
|
|
|
#define S_ENV_AGENT "SECRET_AGENT"
|
2020-04-26 10:30:22 +02:00
|
|
|
#define S_ENV_STORE "SECRET_STORE"
|
2020-04-24 08:55:38 +02:00
|
|
|
|
|
|
|
struct {
|
|
|
|
char path[1024];
|
|
|
|
int pipe[2];
|
2020-04-26 22:44:54 +02:00
|
|
|
union {
|
|
|
|
struct {
|
|
|
|
uint8_t version;
|
|
|
|
uint8_t master[hydro_pwhash_MASTERKEYBYTES];
|
|
|
|
uint8_t opslimit[8];
|
|
|
|
// reserved
|
|
|
|
};
|
|
|
|
uint8_t buf[S_ENTRYSIZE];
|
|
|
|
} hdr;
|
2020-04-24 08:55:38 +02:00
|
|
|
struct {
|
|
|
|
uint8_t key[hydro_secretbox_KEYBYTES];
|
2020-04-26 14:48:24 +02:00
|
|
|
char msg[S_ENTRYSIZE - hydro_secretbox_HEADERBYTES];
|
2020-04-24 08:55:38 +02:00
|
|
|
} x;
|
2020-04-26 14:48:24 +02:00
|
|
|
uint8_t enc[S_ENTRYSIZE];
|
2020-04-25 18:55:33 +02:00
|
|
|
char ctx_master[hydro_pwhash_CONTEXTBYTES];
|
|
|
|
char ctx_secret[hydro_secretbox_CONTEXTBYTES];
|
2020-04-24 08:55:38 +02:00
|
|
|
} s = {
|
|
|
|
.pipe = {-1, -1},
|
2020-04-25 18:55:33 +02:00
|
|
|
.ctx_master = "MASTER",
|
|
|
|
.ctx_secret = "SECRET",
|
2020-04-24 08:55:38 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
_Noreturn static void
|
|
|
|
s_exit(int code)
|
|
|
|
{
|
|
|
|
hydro_memzero(&s.x, sizeof(s.x));
|
|
|
|
exit(code);
|
|
|
|
}
|
|
|
|
|
|
|
|
_Noreturn static void
|
|
|
|
s_fatal(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
char buf[256];
|
|
|
|
size_t size = sizeof(buf);
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
int ret = vsnprintf(buf, size, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
if (ret <= 0) {
|
|
|
|
buf[0] = '?';
|
|
|
|
size = 1;
|
|
|
|
}
|
|
|
|
if (size > (size_t)ret)
|
|
|
|
size = (size_t)ret;
|
|
|
|
|
|
|
|
char hdr[] = "Fatal: ";
|
|
|
|
struct iovec iov[] = {
|
|
|
|
{hdr, sizeof(hdr) - 1},
|
|
|
|
{buf, size}, {"\n", 1},
|
|
|
|
};
|
|
|
|
|
|
|
|
writev(2, iov, 3);
|
|
|
|
s_exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
s_read(int fd, void *data, size_t size)
|
|
|
|
{
|
|
|
|
size_t done = 0;
|
2020-04-24 23:24:04 +02:00
|
|
|
struct pollfd pfd = {.fd = fd, .events = POLLIN};
|
2020-04-24 08:55:38 +02:00
|
|
|
|
|
|
|
while (done < size) {
|
|
|
|
ssize_t r = read(fd, (char *)data + done, size - done);
|
|
|
|
if (r == 0)
|
|
|
|
break;
|
|
|
|
if (r == (ssize_t)-1) switch (errno) {
|
2020-04-24 23:24:04 +02:00
|
|
|
case EAGAIN: if (!poll(&pfd, 1, 200)) return 1; /* FALLTHRU */
|
|
|
|
case EINTR: continue;
|
2020-04-24 08:55:38 +02:00
|
|
|
default: s_fatal("read: %s", strerror(errno));
|
|
|
|
}
|
|
|
|
done += r;
|
|
|
|
}
|
|
|
|
return done != size;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
s_write(int fd, const void *data, size_t size)
|
|
|
|
{
|
|
|
|
size_t done = 0;
|
2020-04-24 23:24:04 +02:00
|
|
|
struct pollfd pfd = {.fd = fd, .events = POLLOUT};
|
2020-04-24 08:55:38 +02:00
|
|
|
|
|
|
|
while (done < size) {
|
|
|
|
ssize_t r = write(fd, (const char *)data + done, size - done);
|
|
|
|
if (r == 0)
|
|
|
|
break;
|
|
|
|
if (r == (ssize_t)-1) switch (errno) {
|
2020-04-24 23:24:04 +02:00
|
|
|
case EAGAIN: if (!poll(&pfd, 1, 200)) return 1; /* FALLTHRU */
|
|
|
|
case EINTR: continue;
|
2020-04-24 08:55:38 +02:00
|
|
|
default: s_fatal("write: %s", strerror(errno));
|
|
|
|
}
|
|
|
|
done += r;
|
|
|
|
}
|
|
|
|
return done != size;
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
s_input(unsigned char *buf, size_t size, const char *prompt)
|
|
|
|
{
|
|
|
|
const char *tty = "/dev/tty";
|
|
|
|
int fd = open(tty, O_RDWR | O_NOCTTY);
|
|
|
|
|
|
|
|
if (fd == -1)
|
|
|
|
s_fatal("%s: %s", tty, strerror(errno));
|
|
|
|
|
|
|
|
if (prompt)
|
|
|
|
s_write(fd, prompt, strlen(prompt));
|
|
|
|
|
|
|
|
struct termios old;
|
|
|
|
tcgetattr(fd, &old);
|
|
|
|
|
2020-04-25 13:40:13 +02:00
|
|
|
struct termios new = old;
|
2020-04-24 08:55:38 +02:00
|
|
|
new.c_lflag &= ~(ECHO | ECHONL);
|
2020-04-26 13:00:07 +02:00
|
|
|
new.c_lflag |= ICANON;
|
|
|
|
new.c_iflag &= ~(INLCR | IGNCR);
|
|
|
|
new.c_iflag |= ICRNL;
|
2020-04-24 08:55:38 +02:00
|
|
|
|
|
|
|
tcsetattr(fd, TCSAFLUSH, &new);
|
2020-04-26 14:48:24 +02:00
|
|
|
ssize_t ret = read(fd, buf, size);
|
2020-04-24 08:55:38 +02:00
|
|
|
tcsetattr(fd, TCSAFLUSH, &old);
|
|
|
|
|
|
|
|
s_write(fd, "\n", 1);
|
|
|
|
close(fd);
|
|
|
|
|
|
|
|
if (ret <= 0)
|
|
|
|
s_exit(0);
|
|
|
|
|
2020-04-26 22:44:54 +02:00
|
|
|
size_t len = ret - 1;
|
2020-04-26 14:48:24 +02:00
|
|
|
|
2020-04-26 22:44:54 +02:00
|
|
|
if (buf[len] != '\n') {
|
2020-04-26 14:48:24 +02:00
|
|
|
if (ret == size)
|
|
|
|
s_fatal("Input too long!");
|
|
|
|
s_exit(0);
|
|
|
|
}
|
2020-04-26 22:44:54 +02:00
|
|
|
for (size_t i = 0; i < len; i++) {
|
2020-04-26 14:48:24 +02:00
|
|
|
if (buf[i] < ' ')
|
|
|
|
s_fatal("Invalid input!");
|
|
|
|
}
|
2020-04-24 08:55:38 +02:00
|
|
|
|
2020-04-26 22:44:54 +02:00
|
|
|
memset(buf + len, 0, size - len);
|
|
|
|
return len;
|
2020-04-24 08:55:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
s_open_secret(int use_tty)
|
|
|
|
{
|
|
|
|
int fd = open(s.path, O_RDWR);
|
|
|
|
|
|
|
|
if (fd == -1) switch (errno) {
|
2020-04-26 22:44:54 +02:00
|
|
|
case ENOENT: s_fatal("Secret store %s doesn't exist", s.path);
|
2020-04-24 08:55:38 +02:00
|
|
|
default: s_fatal("%s: %s", s.path, strerror(errno));
|
|
|
|
}
|
|
|
|
|
|
|
|
struct flock fl = {
|
|
|
|
.l_type = F_WRLCK,
|
|
|
|
.l_whence = SEEK_SET,
|
|
|
|
};
|
|
|
|
|
|
|
|
if (fcntl(fd, F_SETLKW, &fl))
|
2020-04-25 13:40:13 +02:00
|
|
|
s_fatal("Unable to lock %s", s.path);
|
2020-04-24 08:55:38 +02:00
|
|
|
|
2020-04-26 22:44:54 +02:00
|
|
|
if (s_read(fd, s.hdr.buf, sizeof(s.hdr.buf)))
|
|
|
|
s_fatal("Unable to read %s", s.path);
|
2020-04-24 08:55:38 +02:00
|
|
|
|
2020-04-27 19:10:55 +02:00
|
|
|
if (s.hdr.version != S_VER_MAJOR)
|
|
|
|
s_fatal("Unkown version %" PRIu8, s.hdr.version);
|
2020-04-24 08:55:38 +02:00
|
|
|
|
2020-04-25 14:19:08 +02:00
|
|
|
const char *agent = getenv(S_ENV_AGENT);
|
|
|
|
int wfd = -1, rfd = -1;
|
2020-04-24 08:55:38 +02:00
|
|
|
|
2020-04-25 14:19:08 +02:00
|
|
|
if (agent && sscanf(agent, "%d.%d", &wfd, &rfd) == 2 &&
|
|
|
|
wfd >= 0 && rfd >= 0 &&
|
2020-04-24 22:36:48 +02:00
|
|
|
!s_write(wfd, "", 1) &&
|
|
|
|
!s_read(rfd, s.x.key, sizeof(s.x.key)))
|
|
|
|
return fd;
|
2020-04-24 08:55:38 +02:00
|
|
|
|
|
|
|
if (!use_tty)
|
|
|
|
s_exit(0);
|
|
|
|
|
|
|
|
unsigned char pass[128];
|
2020-04-26 14:48:24 +02:00
|
|
|
size_t len = s_input(pass, sizeof(pass), "Passphrase: ");
|
2020-04-24 08:55:38 +02:00
|
|
|
|
|
|
|
if (!len)
|
|
|
|
s_exit(0);
|
|
|
|
|
2020-04-27 10:16:00 +02:00
|
|
|
int r = hydro_pwhash_deterministic(
|
|
|
|
s.x.key, sizeof(s.x.key),
|
|
|
|
(char *)pass, len,
|
|
|
|
s.ctx_master, s.hdr.master,
|
|
|
|
load64_le(s.hdr.opslimit), 0, 1);
|
|
|
|
|
|
|
|
hydro_memzero(pass, sizeof(pass));
|
|
|
|
|
|
|
|
if (r)
|
2020-04-24 08:55:38 +02:00
|
|
|
s_fatal("Call of the Jedi...");
|
|
|
|
|
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
s_print_keys(int use_tty)
|
|
|
|
{
|
|
|
|
int fd = s_open_secret(use_tty);
|
|
|
|
|
|
|
|
while (!s_read(fd, s.enc, sizeof(s.enc))) {
|
|
|
|
if (hydro_secretbox_decrypt(s.x.msg,
|
|
|
|
s.enc, sizeof(s.enc), 0,
|
2020-04-26 22:44:54 +02:00
|
|
|
s.ctx_secret, s.x.key))
|
2020-04-24 08:55:38 +02:00
|
|
|
continue;
|
|
|
|
s_write(1, s.x.msg, strnlen(s.x.msg, sizeof(s.x.msg)));
|
|
|
|
s_write(1, "\n", 1);
|
|
|
|
}
|
|
|
|
close(fd);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
s_valid(const char *str)
|
|
|
|
{
|
|
|
|
if (!str)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
for (size_t i = 0; i < 256; i++) {
|
|
|
|
if (!str[i])
|
|
|
|
return i;
|
|
|
|
if (str[i] < '!' || str[i] > '~')
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
s_get_secret(int fd, const char *key, int create)
|
|
|
|
{
|
|
|
|
size_t len = s_valid(key);
|
|
|
|
|
|
|
|
if (!len)
|
|
|
|
s_fatal("Secret %s is malformed", key);
|
|
|
|
|
|
|
|
while (!s_read(fd, s.enc, sizeof(s.enc))) {
|
|
|
|
if (hydro_secretbox_decrypt(s.x.msg,
|
|
|
|
s.enc, sizeof(s.enc), 0,
|
2020-04-25 18:55:33 +02:00
|
|
|
s.ctx_secret, s.x.key))
|
2020-04-24 08:55:38 +02:00
|
|
|
continue;
|
|
|
|
if (hydro_equal(s.x.msg, key, len + 1)) {
|
|
|
|
if (create)
|
|
|
|
s_fatal("Secret %s exists!", key);
|
|
|
|
return &s.x.msg[len + 1];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!create)
|
|
|
|
s_fatal("Secret %s not found", key);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
s_set_secret(int fd, const char *id, const unsigned char *secret)
|
|
|
|
{
|
|
|
|
memset(&s.x.msg, 0, sizeof(s.x.msg));
|
|
|
|
|
|
|
|
int ret = snprintf(s.x.msg, sizeof(s.x.msg), "%s%c%s", id, 0, secret);
|
|
|
|
|
|
|
|
if (ret <= 0 || (size_t)ret >= sizeof(s.x.msg))
|
|
|
|
s_fatal("Entry too big!");
|
|
|
|
|
|
|
|
hydro_secretbox_encrypt(s.enc,
|
|
|
|
s.x.msg, sizeof(s.x.msg), 0,
|
2020-04-25 18:55:33 +02:00
|
|
|
s.ctx_secret, s.x.key);
|
|
|
|
|
2020-04-24 08:55:38 +02:00
|
|
|
s_write(fd, s.enc, sizeof(s.enc));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
s_init(int argc, char **argv, void *data)
|
|
|
|
{
|
|
|
|
if (argz_help(argc, argv))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (argc != 1)
|
|
|
|
return argc;
|
|
|
|
|
|
|
|
int fd = open(s.path, O_RDWR | O_CREAT | O_EXCL, 0600);
|
|
|
|
|
|
|
|
if (fd == -1) switch (errno) {
|
|
|
|
case EEXIST: s_fatal("Secret store %s already exists", s.path);
|
|
|
|
default: s_fatal("%s: %s", s.path, strerror(errno));
|
|
|
|
}
|
|
|
|
|
2020-04-26 22:44:54 +02:00
|
|
|
s.hdr.version = 0;
|
|
|
|
hydro_random_buf(s.hdr.master, sizeof(s.hdr.master));
|
|
|
|
store64_le(s.hdr.opslimit, 10000);
|
|
|
|
s_write(fd, s.hdr.buf, sizeof(s.hdr.buf));
|
2020-04-24 08:55:38 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
s_list(int argc, char **argv, void *data)
|
|
|
|
{
|
|
|
|
if (argz_help(argc, argv))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (argc == 1)
|
|
|
|
return s_print_keys(1);
|
|
|
|
|
|
|
|
return argc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
s_input_secret(unsigned char *buf, size_t size)
|
|
|
|
{
|
|
|
|
if (s_input(buf, size, "Secret [random]: "))
|
|
|
|
return;
|
|
|
|
|
|
|
|
const size_t len = 24;
|
|
|
|
|
|
|
|
memset(buf, 0, size);
|
|
|
|
hydro_random_buf(buf, len);
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < len; i++)
|
|
|
|
buf[i] = '!' + buf[i] % (1U + '~' - '!');
|
|
|
|
|
|
|
|
s_write(1, buf, len);
|
|
|
|
s_write(1, "\n", 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
s_help_keys(int argc, char **argv, int print_keys)
|
|
|
|
{
|
|
|
|
if (!argz_help(argc, argv))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (isatty(1)) {
|
|
|
|
printf("Usage: %s KEY\n", argv[0]);
|
|
|
|
} else if (print_keys) {
|
|
|
|
s_print_keys(0);
|
|
|
|
}
|
|
|
|
s_exit(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
s_add(int argc, char **argv, void *data)
|
|
|
|
{
|
|
|
|
s_help_keys(argc, argv, 0);
|
|
|
|
|
|
|
|
if (argc != 2)
|
|
|
|
return argc;
|
|
|
|
|
|
|
|
int fd = s_open_secret(1);
|
|
|
|
s_get_secret(fd, argv[1], 1);
|
|
|
|
|
2020-04-26 14:48:24 +02:00
|
|
|
unsigned char secret[S_ENTRYSIZE];
|
2020-04-24 08:55:38 +02:00
|
|
|
s_input_secret(secret, sizeof(secret));
|
|
|
|
|
|
|
|
if (lseek(fd, 0, SEEK_END) == (off_t)-1)
|
|
|
|
s_fatal("seek: %s", strerror(errno));
|
|
|
|
|
|
|
|
s_set_secret(fd, argv[1], secret);
|
|
|
|
close(fd);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
s_change(int argc, char **argv, void *data)
|
|
|
|
{
|
|
|
|
s_help_keys(argc, argv, 1);
|
|
|
|
|
|
|
|
if (argc != 2)
|
|
|
|
return argc;
|
|
|
|
|
|
|
|
int fd = s_open_secret(1);
|
|
|
|
s_get_secret(fd, argv[1], 0);
|
|
|
|
|
2020-04-26 14:48:24 +02:00
|
|
|
unsigned char secret[S_ENTRYSIZE];
|
2020-04-24 08:55:38 +02:00
|
|
|
s_input_secret(secret, sizeof(secret));
|
|
|
|
|
|
|
|
if (lseek(fd, -(off_t)sizeof(s.enc), SEEK_CUR) == (off_t)-1)
|
|
|
|
s_fatal("seek: %s", strerror(errno));
|
|
|
|
|
|
|
|
s_set_secret(fd, argv[1], secret);
|
|
|
|
close(fd);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
s_show(int argc, char **argv, void *data)
|
|
|
|
{
|
|
|
|
s_help_keys(argc, argv, 1);
|
|
|
|
|
|
|
|
if (argc != 2)
|
|
|
|
return argc;
|
|
|
|
|
|
|
|
int fd = s_open_secret(1);
|
|
|
|
const char *secret = s_get_secret(fd, argv[1], 0);
|
|
|
|
|
|
|
|
if (secret) {
|
|
|
|
s_write(1, secret, strlen(secret));
|
|
|
|
if (isatty(1)) s_write(1, "\n", 1);
|
|
|
|
}
|
|
|
|
close(fd);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
s_cloexec(int fd)
|
|
|
|
{
|
|
|
|
if (fcntl(fd, F_SETFD, FD_CLOEXEC))
|
|
|
|
s_fatal("cloexec: %s", strerror(errno));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
s_nonblck(int fd)
|
|
|
|
{
|
|
|
|
int flags = fcntl(fd, F_GETFL, 0);
|
|
|
|
|
|
|
|
if (flags == -1)
|
|
|
|
return;
|
|
|
|
|
|
|
|
fcntl(fd, F_SETFL, flags | O_NONBLOCK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
s_agent(int argc, char **argv, void *data)
|
|
|
|
{
|
|
|
|
if (argz_help(argc, argv)) {
|
|
|
|
if (isatty(1)) {
|
|
|
|
printf("Usage: %s CMD [ARG...]\n", argv[0]);
|
|
|
|
} else {
|
|
|
|
printf("CMD\n");
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2020-04-27 11:48:50 +02:00
|
|
|
if (argz_help_asked(argc, argv))
|
|
|
|
return 0;
|
2020-04-24 08:55:38 +02:00
|
|
|
|
|
|
|
if (getenv(S_ENV_AGENT))
|
|
|
|
s_fatal("Already running...");
|
|
|
|
|
|
|
|
close(s_open_secret(1));
|
|
|
|
|
2020-04-24 22:36:48 +02:00
|
|
|
int rfd[2], wfd[2];
|
2020-04-24 08:55:38 +02:00
|
|
|
|
2020-04-24 22:36:48 +02:00
|
|
|
if (pipe(rfd) || pipe(wfd) || pipe(s.pipe))
|
2020-04-24 08:55:38 +02:00
|
|
|
s_fatal("pipe: %s", strerror(errno));
|
|
|
|
|
2020-04-24 22:36:48 +02:00
|
|
|
s_cloexec(s.pipe[0]); s_cloexec(s.pipe[1]);
|
|
|
|
s_nonblck(s.pipe[0]); s_nonblck(s.pipe[1]);
|
|
|
|
|
|
|
|
s_nonblck(rfd[0]); s_nonblck(rfd[1]);
|
|
|
|
s_nonblck(wfd[0]); s_nonblck(wfd[1]);
|
2020-04-24 08:55:38 +02:00
|
|
|
|
|
|
|
pid_t pid = fork();
|
|
|
|
|
|
|
|
if (pid == (pid_t)-1)
|
|
|
|
s_fatal("fork: %s", strerror(errno));
|
|
|
|
|
|
|
|
if (!pid) {
|
2020-04-24 22:36:48 +02:00
|
|
|
close(rfd[0]); close(wfd[1]);
|
2020-04-24 08:55:38 +02:00
|
|
|
hydro_memzero(&s.x, sizeof(s.x));
|
|
|
|
|
|
|
|
char tmp[32];
|
2020-04-25 14:19:08 +02:00
|
|
|
snprintf(tmp, sizeof(tmp), "%d.%d", rfd[1], wfd[0]);
|
2020-04-24 08:55:38 +02:00
|
|
|
setenv(S_ENV_AGENT, tmp, 1);
|
|
|
|
|
2020-04-27 11:48:50 +02:00
|
|
|
if (argv[1]) {
|
|
|
|
execvp(argv[1], argv + 1);
|
|
|
|
} else {
|
|
|
|
char *sh = getenv("SHELL");
|
|
|
|
if (!sh) sh = "/bin/sh";
|
|
|
|
execl(sh, sh, (char *)NULL);
|
|
|
|
}
|
2020-04-24 08:55:38 +02:00
|
|
|
s_fatal("%s: %s", argv[1], strerror(errno));
|
|
|
|
}
|
|
|
|
|
2020-04-24 22:36:48 +02:00
|
|
|
close(rfd[1]); close(wfd[0]);
|
2020-04-24 08:55:38 +02:00
|
|
|
|
|
|
|
struct pollfd fds[] = {
|
|
|
|
{.fd = s.pipe[0], .events = POLLIN},
|
2020-04-24 22:36:48 +02:00
|
|
|
{.fd = rfd[0], .events = POLLIN},
|
2020-04-24 08:55:38 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
while (1) {
|
2020-04-24 22:36:48 +02:00
|
|
|
if (poll(fds, 1 + (fds[1].fd >= 0), -1) == -1) {
|
2020-04-24 08:55:38 +02:00
|
|
|
if (errno == EINTR)
|
|
|
|
continue;
|
|
|
|
s_fatal("poll: %s", strerror(errno));
|
|
|
|
}
|
|
|
|
|
2020-04-24 22:36:48 +02:00
|
|
|
if (fds[0].revents & POLLIN) {
|
2020-04-24 08:55:38 +02:00
|
|
|
char tmp;
|
|
|
|
read(fds[0].fd, &tmp, 1);
|
|
|
|
|
|
|
|
int status;
|
|
|
|
pid_t ret = waitpid(-1, &status, WNOHANG);
|
|
|
|
|
|
|
|
if (ret == (pid_t)-1) switch (errno) {
|
|
|
|
case EINTR: continue;
|
|
|
|
case EAGAIN: continue;
|
|
|
|
case ECHILD: s_exit(0);
|
|
|
|
default: s_fatal("waitpid: %s", strerror(errno));
|
|
|
|
}
|
|
|
|
if ((ret == pid) &&
|
|
|
|
(WIFEXITED(status) || WIFSIGNALED(status)))
|
|
|
|
s_exit(0);
|
|
|
|
}
|
|
|
|
|
2020-04-24 22:36:48 +02:00
|
|
|
if (fds[1].revents & (POLLERR | POLLHUP)) {
|
|
|
|
close(rfd[0]); close(wfd[1]);
|
|
|
|
fds[1].fd = -1;
|
|
|
|
} else if (fds[1].revents & POLLIN) {
|
|
|
|
char tmp;
|
|
|
|
read(fds[1].fd, &tmp, 1);
|
|
|
|
fds[1].fd = wfd[1];
|
|
|
|
fds[1].events = POLLOUT;
|
|
|
|
} else if (fds[1].revents & POLLOUT) {
|
2020-04-24 08:55:38 +02:00
|
|
|
write(fds[1].fd, s.x.key, sizeof(s.x.key));
|
2020-04-24 22:36:48 +02:00
|
|
|
fds[1].fd = rfd[0];
|
|
|
|
fds[1].events = POLLIN;
|
|
|
|
}
|
2020-04-24 08:55:38 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
s_handler(int sig)
|
|
|
|
{
|
|
|
|
int err = errno;
|
|
|
|
|
|
|
|
if (sig == SIGCHLD && s.pipe[1] != -1)
|
|
|
|
write(s.pipe[1], "", 1);
|
|
|
|
|
|
|
|
errno = err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
s_set_signals(void)
|
|
|
|
{
|
|
|
|
int sig[] = {
|
|
|
|
SIGHUP, SIGINT, SIGQUIT,
|
|
|
|
SIGUSR1, SIGUSR2, SIGPIPE,
|
2020-04-25 18:55:33 +02:00
|
|
|
SIGALRM, SIGTERM, SIGTSTP,
|
|
|
|
SIGTTIN, SIGCHLD,
|
2020-04-24 08:55:38 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
struct sigaction sa = {
|
|
|
|
.sa_handler = s_handler,
|
|
|
|
};
|
|
|
|
|
|
|
|
for (size_t i = 0; i < S_COUNT(sig); i++)
|
|
|
|
sigaction(sig[i], &sa, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
s_set_path(void)
|
|
|
|
{
|
2020-04-26 10:30:22 +02:00
|
|
|
struct {
|
|
|
|
const char *fmt, *env;
|
|
|
|
} path[] = {
|
|
|
|
{"%s", getenv(S_ENV_STORE)},
|
|
|
|
{"%s/.secret", getenv("HOME")},
|
|
|
|
};
|
2020-04-24 08:55:38 +02:00
|
|
|
|
2020-04-26 10:30:22 +02:00
|
|
|
for (size_t i = 0; i < S_COUNT(path); i++) {
|
|
|
|
if (!path[i].env)
|
|
|
|
continue;
|
2020-04-24 08:55:38 +02:00
|
|
|
|
2020-04-26 10:30:22 +02:00
|
|
|
int ret = snprintf(s.path, sizeof(s.path), path[i].fmt, path[i].env);
|
2020-04-24 08:55:38 +02:00
|
|
|
|
2020-04-26 10:30:22 +02:00
|
|
|
if (ret <= 0 || (size_t)ret >= sizeof(s.path))
|
|
|
|
s_fatal("Invalid path... Check $HOME or $" S_ENV_STORE);
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
2020-04-24 08:55:38 +02:00
|
|
|
}
|
|
|
|
|
2020-04-27 19:10:55 +02:00
|
|
|
static int
|
|
|
|
s_version(int argc, char **argv, void *data)
|
|
|
|
{
|
|
|
|
if (argz_help(argc, argv))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (argc != 1)
|
|
|
|
return argc;
|
|
|
|
|
|
|
|
printf("%u.%u\n", S_VER_MAJOR, S_VER_MINOR);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-04-24 08:55:38 +02:00
|
|
|
int
|
|
|
|
main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
hydro_init();
|
|
|
|
|
|
|
|
s_set_path();
|
|
|
|
s_set_signals();
|
|
|
|
|
2020-04-24 19:47:09 +02:00
|
|
|
const char *alta[] = {"set", "new", "gen", "insert", NULL};
|
2020-04-24 08:55:38 +02:00
|
|
|
const char *alts[] = {"get", "print", "echo", NULL};
|
2020-04-24 19:47:09 +02:00
|
|
|
const char *altc[] = {"replace", "update", "edit", "regen", NULL};
|
2020-04-24 08:55:38 +02:00
|
|
|
const char *altz[] = {"zone", NULL};
|
|
|
|
|
|
|
|
struct argz mainz[] = {
|
2020-04-27 19:10:55 +02:00
|
|
|
{"init", "Init a secret storage for the user", &s_init, .grp = 1},
|
|
|
|
{"list", "List all secrets for a given passphrase", &s_list, .grp = 1},
|
|
|
|
{"add", "Add a new secret", &s_add, .alt = alta, .grp = 1},
|
|
|
|
{"show", "Show an existing secret", &s_show, .alt = alts, .grp = 1},
|
|
|
|
{"change", "Change an existing secret", &s_change, .alt = altc, .grp = 1},
|
|
|
|
{"agent", "Run a process in a trusted zone", &s_agent, .alt = altz, .grp = 1},
|
|
|
|
{"version", "Show version", &s_version, .grp = 1},
|
2020-04-26 22:44:54 +02:00
|
|
|
{NULL}
|
|
|
|
};
|
2020-04-24 08:55:38 +02:00
|
|
|
|
|
|
|
if (argc == 1) {
|
|
|
|
printf("Available commands:\n");
|
|
|
|
argz_print(mainz);
|
|
|
|
} else {
|
|
|
|
int ret = argz(argc, argv, mainz);
|
|
|
|
hydro_memzero(&s.x, sizeof(s.x));
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|