Add new -S option to sleep while the command was suspended.

The default behavior is now to not consider the time the command
was suspended as part of the normal inter-event delay.

diff --git a/doc/sudoreplay.cat b/doc/sudoreplay.cat
index 00d8ea70b46db27efcdb3ff22d675871d3869ee2..f09b64d2dc39227686dea5808844237f59b204cb 100644 (file)
--- a/doc/sudoreplay.cat
+++ b/doc/sudoreplay.cat
@@ -4,7 +4,7 @@ N\bNA\bAM\bME\bE
      s\bsu\bud\bdo\bor\bre\bep\bpl\bla\bay\by - replay sudo session logs
 
 S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS
-     s\bsu\bud\bdo\bor\bre\bep\bpl\bla\bay\by [-\b-h\bhn\bnR\bR] [-\b-d\bd _\bd_\bi_\br] [-\b-f\bf _\bf_\bi_\bl_\bt_\be_\br] [-\b-m\bm _\bn_\bu_\bm] [-\b-s\bs _\bn_\bu_\bm] ID
+     s\bsu\bud\bdo\bor\bre\bep\bpl\bla\bay\by [-\b-h\bhn\bnR\bRS\bS] [-\b-d\bd _\bd_\bi_\br] [-\b-f\bf _\bf_\bi_\bl_\bt_\be_\br] [-\b-m\bm _\bn_\bu_\bm] [-\b-s\bs _\bn_\bu_\bm] ID
 
      s\bsu\bud\bdo\bor\bre\bep\bpl\bla\bay\by [-\b-h\bh] [-\b-d\bd _\bd_\bi_\br] -\b-l\bl [search expression]
 
@@ -132,6 +132,12 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
                  Do not attempt to re-size the terminal to match the terminal
                  size of the session.
 
+     -\b-S\bS, -\b--\b-s\bsu\bus\bsp\bpe\ben\bnd\bd-\b-w\bwa\bai\bit\bt
+                 Wait while the command was suspended.  By default, s\bsu\bud\bdo\bor\bre\bep\bpl\bla\bay\by
+                 will ignore the time interval between when the command was
+                 suspended and when it was resumed.  If the -\b-S\bS option is
+                 specified, s\bsu\bud\bdo\bor\bre\bep\bpl\bla\bay\by will wait instead.
+
      -\b-s\bs, -\b--\b-s\bsp\bpe\bee\bed\bd _\bs_\bp_\be_\be_\bd_\b__\bf_\ba_\bc_\bt_\bo_\br
                  This option causes s\bsu\bud\bdo\bor\bre\bep\bpl\bla\bay\by to adjust the number of seconds
                  it will wait between key presses or program output.  This can
@@ -294,4 +300,4 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
      file distributed with s\bsu\bud\bdo\bo or https://www.sudo.ws/license.html for
      complete details.
 
-Sudo 1.8.25                      March 8, 2018                     Sudo 1.8.25
+Sudo 1.8.26                     October 5, 2018                    Sudo 1.8.26

diff --git a/doc/sudoreplay.man.in b/doc/sudoreplay.man.in
index 71203ee03afdd2494f72a9b0d3e36ef75245313c..2cb41cbc20fb07e9eca6b8b0b1786690079d28e5 100644 (file)
--- a/doc/sudoreplay.man.in
+++ b/doc/sudoreplay.man.in
@@ -15,7 +15,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.TH "SUDOREPLAY" "8" "March 8, 2018" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
+.TH "SUDOREPLAY" "8" "October 5, 2018" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -24,7 +24,7 @@
 .SH "SYNOPSIS"
 .HP 11n
 \fBsudoreplay\fR
-[\fB\-hnR\fR]
+[\fB\-hnRS\fR]
 [\fB\-d\fR\ \fIdir\fR]
 [\fB\-f\fR\ \fIfilter\fR]
 [\fB\-m\fR\ \fInum\fR]
@@ -252,6 +252,18 @@ the user's terminal.
 Do not attempt to re-size the terminal to match the terminal size
 of the session.
 .TP 12n
+\fB\-S\fR, \fB\--suspend-wait\fR
+Wait while the command was suspended.
+By default,
+\fBsudoreplay\fR
+will ignore the time interval between when the command was suspended
+and when it was resumed.
+If the
+\fB\-S\fR
+option is specified,
+\fBsudoreplay\fR
+will wait instead.
+.TP 12n
 \fB\-s\fR, \fB\--speed\fR \fIspeed_factor\fR
 This option causes
 \fBsudoreplay\fR

diff --git a/doc/sudoreplay.mdoc.in b/doc/sudoreplay.mdoc.in
index fdd5f72afbbfc5140dd5fecbe98b431b0092106c..c5ff96e470e209a3ced6295c657df0a2ffc25b93 100644 (file)
--- a/doc/sudoreplay.mdoc.in
+++ b/doc/sudoreplay.mdoc.in
@@ -14,7 +14,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 8, 2018
+.Dd October 5, 2018
 .Dt SUDOREPLAY @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -22,7 +22,7 @@
 .Nd replay sudo session logs
 .Sh SYNOPSIS
 .Nm sudoreplay
-.Op Fl hnR
+.Op Fl hnRS
 .Op Fl d Ar dir
 .Op Fl f Ar filter
 .Op Fl m Ar num
@@ -230,6 +230,17 @@ the user's terminal.
 .It Fl R , -no-resize
 Do not attempt to re-size the terminal to match the terminal size
 of the session.
+.It Fl S , -suspend-wait
+Wait while the command was suspended.
+By default,
+.Nm
+will ignore the time interval between when the command was suspended
+and when it was resumed.
+If the
+.Fl S
+option is specified,
+.Nm
+will wait instead.
 .It Fl s , -speed Ar speed_factor
 This option causes
 .Nm

diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index e3ef614fd13b2a29a66fa9a6900eaf6cf74ad6e8..9ca08ececdb291159e1d16ce4da6c96be60c9db6 100644 (file)
--- a/plugins/sudoers/sudoreplay.c
+++ b/plugins/sudoers/sudoreplay.c
@@ -84,6 +84,7 @@ struct replay_closure {
     struct sudo_event *sigtstp_ev;
     struct timing_closure timing;
     bool interactive;
+    bool suspend_wait;
     struct io_buffer {
        unsigned int len; /* buffer length (how much produced) */
        unsigned int off; /* write position (how much already consumed) */
@@ -137,7 +138,7 @@ static int terminal_rows, terminal_cols;
 
 static int ttyfd = -1;
 
-static const char short_opts[] =  "d:f:hlm:nRs:V";
+static const char short_opts[] =  "d:f:hlm:nRSs:V";
 static struct option long_opts[] = {
     { "directory",     required_argument,      NULL,   'd' },
     { "filter",                required_argument,      NULL,   'f' },
@@ -146,6 +147,7 @@ static struct option long_opts[] = {
     { "max-wait",      required_argument,      NULL,   'm' },
     { "non-interactive", no_argument,          NULL,   'n' },
     { "no-resize",     no_argument,            NULL,   'R' },
+    { "suspend-wait",  no_argument,            NULL,   'S' },
     { "speed",         required_argument,      NULL,   's' },
     { "version",       no_argument,            NULL,   'V' },
     { NULL,            no_argument,            NULL,   '\0' },
@@ -160,7 +162,7 @@ static int open_io_fd(char *path, int len, struct io_log_file *iol);
 static int parse_expr(struct search_node_list *, char **, bool);
 static void read_keyboard(int fd, int what, void *v);
 static void help(void) __attribute__((__noreturn__));
-static int replay_session(struct timespec *max_wait, const char *decimal, bool interactive);
+static int replay_session(struct timespec *max_wait, const char *decimal, bool interactive, bool suspend_wait);
 static void sudoreplay_cleanup(void);
 static void usage(int);
 static void write_output(int fd, int what, void *v);
@@ -188,7 +190,7 @@ main(int argc, char *argv[])
 {
     int ch, i, plen, exitcode = 0;
     bool def_filter = true, listonly = false;
-    bool interactive = true, resize = true;
+    bool interactive = true, suspend_wait = false, resize = true;
     const char *decimal, *id, *user = NULL, *pattern = NULL, *tty = NULL;
     char *cp, *ep, path[PATH_MAX];
     struct log_info *li;
@@ -267,6 +269,9 @@ main(int argc, char *argv[])
        case 'R':
            resize = false;
            break;
+       case 'S':
+           suspend_wait = true;
+           break;
        case 's':
            errno = 0;
            speed_factor = strtod(optarg, &ep);
@@ -342,7 +347,7 @@ main(int argc, char *argv[])
     li = NULL;
 
     /* Replay session corresponding to io_log_files[]. */
-    exitcode = replay_session(max_delay, decimal, interactive);
+    exitcode = replay_session(max_delay, decimal, interactive, suspend_wait);
 
     restore_terminal_size();
     sudo_term_restore(ttyfd, true);
@@ -784,9 +789,15 @@ next_timing_record(struct replay_closure *closure)
 {
     debug_decl(next_timing_record, SUDO_DEBUG_UTIL)
 
+again:
     switch (read_timing_record(closure)) {
     case 0:
        /* success */
+       if (closure->timing.event == IO_EVENT_SUSPEND &&
+           closure->timing.u.signo == SIGCONT && !closure->suspend_wait) {
+           /* Ignore time spent suspended. */
+           goto again;
+       }
        break;
     case 1:
        /* EOF */
@@ -927,7 +938,8 @@ signal_cb(int signo, int what, void *v)
 }
 
 static struct replay_closure *
-replay_closure_alloc(struct timespec *max_delay, const char *decimal, bool interactive)
+replay_closure_alloc(struct timespec *max_delay, const char *decimal,
+    bool interactive, bool suspend_wait)
 {
     struct replay_closure *closure;
     debug_decl(replay_closure_alloc, SUDO_DEBUG_UTIL)
@@ -936,6 +948,7 @@ replay_closure_alloc(struct timespec *max_delay, const char *decimal, bool inter
        debug_return_ptr(NULL);
 
     closure->interactive = interactive;
+    closure->suspend_wait = suspend_wait;
     closure->timing.max_delay = max_delay;
     closure->timing.decimal = decimal;
 
@@ -1008,14 +1021,16 @@ bad:
 }
 
 static int
-replay_session(struct timespec *max_delay, const char *decimal, bool interactive)
+replay_session(struct timespec *max_delay, const char *decimal,
+    bool interactive, bool suspend_wait)
 {
     struct replay_closure *closure;
     int ret = 0;
     debug_decl(replay_session, SUDO_DEBUG_UTIL)
 
     /* Allocate the delay closure and read the first timing record. */
-    closure = replay_closure_alloc(max_delay, decimal, interactive);
+    closure = replay_closure_alloc(max_delay, decimal, interactive,
+       suspend_wait);
     if (read_timing_record(closure) != 0) {
        ret = 1;
        goto done;
@@ -1582,7 +1597,7 @@ static void
 usage(int fatal)
 {
     fprintf(fatal ? stderr : stdout,
-       _("usage: %s [-hnR] [-d dir] [-m num] [-s num] ID\n"),
+       _("usage: %s [-hnRS] [-d dir] [-m num] [-s num] ID\n"),
        getprogname());
     fprintf(fatal ? stderr : stdout,
        _("usage: %s [-h] [-d dir] -l [search expression]\n"),
@@ -1602,6 +1617,7 @@ help(void)
        "  -h, --help           display help message and exit\n"
        "  -l, --list           list available session IDs, with optional expression\n"
        "  -m, --max-wait=num   max number of seconds to wait between events\n"
+       "  -S, --suspend-wait   wait while the command was suspended\n"
        "  -s, --speed=num      speed up or slow down output\n"
        "  -V, --version        display version information and exit"));
     exit(0);