#include <h/utils.h>
#include <h/netsec.h>
#include <stdarg.h>
+#include <sys/time.h>
#include "h/done.h"
#include "sbr/base64.h"
DEFINE_SWITCH_ARRAY(IMAPTEST, switches);
#undef X
+struct imap_msg;
+
+struct imap_msg {
+ char *command; /* Command to send */
+ bool queue; /* If true, queue for later delivery */
+ struct imap_msg *next; /* Next pointer */
+};
+
+struct imap_msg *msgqueue_head = NULL;
+struct imap_msg *msgqueue_tail = NULL;
+
struct imap_cmd;
struct imap_cmd {
char tag[16]; /* Command tag */
+ struct timeval start; /* Time command was sent */
+ char prefix[64]; /* Command prefix */
struct imap_cmd *next; /* Next pointer */
};
static struct imap_cmd *cmdqueue = NULL;
+
static char *saslmechs = NULL;
svector_t imap_capabilities = NULL;
static int capability_set(const char *);
static void clear_capability(void);
static int have_capability(void);
-static int send_imap_command(netsec_context *, int noflush, char **errstr,
- const char *fmt, ...);
+static int send_imap_command(netsec_context *, bool noflush, char **errstr,
+ const char *fmt, ...) CHECK_PRINTF(4, 5);
static int get_imap_response(netsec_context *, const char *token,
char **tokenresp, char **status, int failerr,
char **errstr);
+static void ts_report(struct timeval *tv, const char *fmt, ...)
+ CHECK_PRINTF(2, 3);
+
+static void add_msg(bool queue, const char *fmt, ...) CHECK_PRINTF(2, 3);
+
+static bool timestamp = false;
+
int
main (int argc, char **argv)
{
- bool timestamp = false, sasl = false, tls = false, initialtls = false;
+ bool sasl = false, tls = false, initialtls = false;
bool snoop = false;
int fd;
char *saslmech = NULL, *host = NULL, *port = "143", *user = NULL;
char *cp, **argp, buf[BUFSIZ], *oauth_svc = NULL, *errstr, **arguments, *p;
netsec_context *nsc = NULL;
+ struct imap_msg *imsg;
size_t len;
+ struct timeval tv_start, tv_connect, tv_auth;
- if (nmh_init(argv[0], 1)) { return 1; }
+ if (nmh_init(argv[0], true, true)) { return 1; }
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
ambigsw (cp, switches);
done (1);
case UNKWNSW:
- adios (NULL, "-%s unknown", cp);
+ die("-%s unknown", cp);
case HELPSW:
snprintf (buf, sizeof(buf), "%s [switches] +folder command "
case HOSTSW:
if (!(host = *argp++) || *host == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case PORTSW:
if (!(port = *argp++) || *port == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case USERSW:
if (!(user = *argp++) || *user == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case SNOOPSW:
continue;
case SASLMECHSW:
if (!(saslmech = *argp++) || *saslmech == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case AUTHSERVICESW:
if (!(oauth_svc = *argp++) || *oauth_svc == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case TLSSW:
tls = true;
timestamp = false;
continue;
}
+ } else if (*cp == '+') {
+ if (*(cp + 1) == '\0')
+ die("Invalid null folder name");
+ add_msg(0, "SELECT \"%s\"", cp + 1);
+ } else {
+ add_msg(0, "%s", cp);
}
}
if (! host)
- adios(NULL, "A hostname must be given with -host");
+ die("A hostname must be given with -host");
nsc = netsec_init();
if (oauth_svc) {
if (netsec_set_oauth_service(nsc, oauth_svc) != OK) {
- adios(NULL, "OAuth2 not supported");
+ die("OAuth2 not supported");
}
}
+ if (timestamp)
+ gettimeofday(&tv_start, NULL);
+
if ((fd = client(host, port, buf, sizeof(buf), snoop)) == NOTOK)
- adios(NULL, "Connect failed: %s", buf);
+ die("Connect failed: %s", buf);
+
+ if (timestamp) {
+ ts_report(&tv_start, "Connect time");
+ gettimeofday(&tv_connect, NULL);
+ }
netsec_set_fd(nsc, fd, fd);
netsec_set_snoop(nsc, snoop);
if (initialtls || tls) {
if (netsec_set_tls(nsc, 1, 0, &errstr) != OK)
- adios(NULL, errstr);
+ die("%s", errstr);
if (initialtls && netsec_negotiate_tls(nsc, &errstr) != OK)
- adios(NULL, errstr);
+ die("%s", errstr);
}
if (sasl) {
if (netsec_set_sasl_params(nsc, "imap", saslmech, imap_sasl_callback,
nsc, &errstr) != OK)
- adios(NULL, errstr);
+ die("%s", errstr);
}
if ((cp = netsec_readline(nsc, &len, &errstr)) == NULL) {
- adios(NULL, errstr);
+ die("%s", errstr);
}
if (has_prefix(cp, "* BYE")) {
} else {
char *capstring;
- if (send_imap_command(nsc, 0, &errstr, "CAPABILITY") != OK) {
+ if (send_imap_command(nsc, false, &errstr, "CAPABILITY") != OK) {
fprintf(stderr, "Unable to send CAPABILITY command: %s\n", errstr);
goto finish;
}
"has no support for STARTTLS\n");
goto finish;
}
- if (send_imap_command(nsc, 0, &errstr, "STARTTLS") != OK) {
+ if (send_imap_command(nsc, false, &errstr, "STARTTLS") != OK) {
fprintf(stderr, "Unable to issue STARTTLS: %s\n", errstr);
goto finish;
}
goto finish;
}
if (netsec_negotiate_tls(nsc, &errstr) != OK) {
- adios(NULL, errstr);
+ die("%s", errstr);
}
}
fprintf(stderr, "SASL negotiation failed: %s\n", errstr);
goto finish;
}
+ /*
+ * Sigh. If we negotiated a SSF AND we got a capability response
+ * as part of the AUTHENTICATE OK message, we can't actually trust
+ * it because it's not protected at that point. So discard the
+ * capability list and we will generate a fresh CAPABILITY command
+ * later.
+ */
+ if (netsec_get_sasl_ssf(nsc) > 0) {
+ clear_capability();
+ }
} else {
if (capability_set("LOGINDISABLED")) {
fprintf(stderr, "User did not request SASL, but LOGIN "
}
}
+ if (!have_capability()) {
+ char *capstring;
+
+ if (send_imap_command(nsc, false, &errstr, "CAPABILITY") != OK) {
+ fprintf(stderr, "Unable to send CAPABILITY command: %s\n", errstr);
+ goto finish;
+ }
+
+ if (get_imap_response(nsc, "CAPABILITY", &capstring, NULL, 1,
+ &errstr) != OK) {
+ fprintf(stderr, "Cannot get CAPABILITY response: %s\n", errstr);
+ goto finish;
+ }
+
+ if (! capstring) {
+ fprintf(stderr, "No CAPABILITY response seen\n");
+ goto finish;
+ }
+
+ parse_capability(capstring, strlen(capstring));
+ free(capstring);
+ }
+
+ if (timestamp) {
+ ts_report(&tv_connect, "Authentication time");
+ gettimeofday(&tv_auth, NULL);
+ }
+
+ while (msgqueue_head != NULL) {
+ imsg = msgqueue_head;
+
+ if (send_imap_command(nsc, imsg->queue, &errstr, "%s",
+ imsg->command) != OK) {
+ fprintf(stderr, "Cannot send command \"%s\": %s\n", imsg->command,
+ errstr);
+ free(errstr);
+ goto finish;
+ }
+
+ if (! imsg->queue) {
+ if (get_imap_response(nsc, NULL, NULL, NULL, 0, &errstr) != OK) {
+ fprintf(stderr, "Unable to get response for command "
+ "\"%s\": %s\n", imsg->command, errstr);
+ goto finish;
+ }
+ }
+
+ msgqueue_head = imsg->next;
+
+ free(imsg->command);
+ free(imsg);
+ }
+
+ if (timestamp)
+ ts_report(&tv_auth, "Total command execution time");
+
send_imap_command(nsc, 0, NULL, "LOGOUT");
get_imap_response(nsc, NULL, NULL, NULL, 0, NULL);
finish:
netsec_shutdown(nsc);
+ if (timestamp)
+ ts_report(&tv_start, "Total elapsed time");
+
exit(0);
}
}
for (i = 0; caplist[i] != NULL; i++) {
- if (has_prefix(caplist[i], "AUTH=") && caplist[i] + 5 != '\0') {
+ if (has_prefix(caplist[i], "AUTH=") && *(caplist[i] + 5) != '\0') {
if (saslmechs) {
saslmechs = add(" ", saslmechs);
}
}
}
- free(caplist);
free(str);
}
*/
static void
-capability_clear(void)
+clear_capability(void)
{
svector_free(imap_capabilities);
imap_capabilities = NULL;
*/
case NETSEC_SASL_FINISH:
+ line = NULL;
if (get_imap_response(nsc, NULL, NULL, &line, 1, errstr) != OK)
return NOTOK;
/*
* parse it.
*/
- if (has_prefix(line, "OK [CAPABILITY ")) {
+ if (line && has_prefix(line, "OK [CAPABILITY ")) {
char *p = line + 15, *q;
q = strchr(p, ']');
*/
static int
-send_imap_command(netsec_context *nsc, int noflush, char **errstr,
+send_imap_command(netsec_context *nsc, bool noflush, char **errstr,
const char *fmt, ...)
{
static unsigned int seq = 0; /* Tag sequence number */
snprintf(cmd->tag, sizeof(cmd->tag), "A%u ", seq++);
+ if (timestamp) {
+ char *p;
+ va_start(ap, fmt);
+ vsnprintf(cmd->prefix, sizeof(cmd->prefix), fmt, ap);
+ va_end(ap);
+
+ p = strchr(cmd->prefix, ' ');
+
+ if (p)
+ *p = '\0';
+
+ gettimeofday(&cmd->start, NULL);
+ }
+
if (netsec_write(nsc, cmd->tag, strlen(cmd->tag), errstr) != OK) {
free(cmd);
return NOTOK;
{
char *line;
struct imap_cmd *cmd;
- int numerrs = 0;
+ bool numerrs = false;
if (tokenresponse)
*tokenresponse = NULL;
if (has_prefix(line, cmdqueue->tag)) {
cmd = cmdqueue;
+ if (timestamp)
+ ts_report(&cmd->start, "Command (%s) execution time",
+ cmd->prefix);
cmdqueue = cmd->next;
free(cmd);
} else {
cmd->next = cmd->next->next;
if (failerr && strncmp(line + strlen(cmd2->tag),
"OK ", 3) != 0) {
- numerrs++;
+ numerrs = true;
netsec_err(errstr, "%s", line + strlen(cmd2->tag));
}
free(cmd2);
}
}
- return numerrs == 0 ? OK : NOTOK;
+ return numerrs ? NOTOK : OK;
+}
+
+/*
+ * Add an IMAP command to the msg queue
+ */
+
+static void
+add_msg(bool queue, const char *fmt, ...)
+{
+ struct imap_msg *imsg;
+ va_list ap;
+ size_t msgbufsize;
+ char *msg = NULL;
+ int rc = 63;
+
+ do {
+ msgbufsize = rc + 1;
+ msg = mh_xrealloc(msg, msgbufsize);
+ va_start(ap, fmt);
+ rc = vsnprintf(msg, msgbufsize, fmt, ap);
+ va_end(ap);
+ } while (rc >= (int) msgbufsize);
+
+ imsg = mh_xmalloc(sizeof(*imsg));
+
+ imsg->command = msg;
+ imsg->queue = queue;
+ imsg->next = NULL;
+
+ if (msgqueue_head == NULL) {
+ msgqueue_head = imsg;
+ msgqueue_tail = imsg;
+ } else {
+ msgqueue_tail->next = imsg;
+ msgqueue_tail = imsg;
+ }
+}
+
+/*
+ * Give a timestamp report.
+ */
+
+static void
+ts_report(struct timeval *tv, const char *fmt, ...)
+{
+ struct timeval now;
+ double delta;
+ va_list ap;
+
+ gettimeofday(&now, NULL);
+
+ delta = ((double) now.tv_sec) - ((double) tv->tv_sec) +
+ (now.tv_usec / 1E6 - tv->tv_usec / 1E6);
+
+ va_start(ap, fmt);
+ vfprintf(stdout, fmt, ap);
+ va_end(ap);
+
+ printf(": %f sec\n", delta);
}
projects / nmh / blobdiff