[src/trunk]: src/usr.sbin/veriexecgen Add an option to read entries from a file.

[alnsn <alnsn%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d0f077363a52
branches:  trunk
changeset: 453022:d0f077363a52
user:      alnsn <alnsn%NetBSD.org@localhost>
date:      Wed Jul 31 15:02:39 2019 +0000

description:
Add an option to read entries from a file.

diffstat:

 usr.sbin/veriexecgen/veriexecgen.8 |   12 +++-
 usr.sbin/veriexecgen/veriexecgen.c |  106 +++++++++++++++++++++++++++++++++---
 2 files changed, 107 insertions(+), 11 deletions(-)

diffs (233 lines):

diff -r e960365d48ba -r d0f077363a52 usr.sbin/veriexecgen/veriexecgen.8
--- a/usr.sbin/veriexecgen/veriexecgen.8        Wed Jul 31 14:35:25 2019 +0000
+++ b/usr.sbin/veriexecgen/veriexecgen.8        Wed Jul 31 15:02:39 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: veriexecgen.8,v 1.20 2019/01/08 01:31:49 gutteridge Exp $
+.\" $NetBSD: veriexecgen.8,v 1.21 2019/07/31 15:02:39 alnsn Exp $
 .\"
 .\" Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 8, 2019
+.Dd July 31, 2019
 .Dt VERIEXECGEN 8
 .Os
 .Sh NAME
@@ -37,6 +37,7 @@
 .Nm
 .Op Fl AaDrSTvW
 .Op Fl d Pa dir
+.Op Fl f Pa file
 .Op Fl o Pa fingerprintdb
 .Op Fl p Pa prefix
 .Op Fl t Ar algorithm
@@ -81,6 +82,13 @@
 Multiple uses of this flag can specify more than one directory.
 .\" .It Fl F
 .\" Try to guess the correct flags for every file.
+.It Fl f Ar file
+Read files from
+.Ar file,
+or if
+.Ar file
+is "-" read from
+.Ar stdin.
 .It Fl h
 Display the help screen.
 .It Fl o Ar fingerprintdb
diff -r e960365d48ba -r d0f077363a52 usr.sbin/veriexecgen/veriexecgen.c
--- a/usr.sbin/veriexecgen/veriexecgen.c        Wed Jul 31 14:35:25 2019 +0000
+++ b/usr.sbin/veriexecgen/veriexecgen.c        Wed Jul 31 15:02:39 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: veriexecgen.c,v 1.19 2019/04/23 22:35:42 sevan Exp $ */
+/* $NetBSD: veriexecgen.c,v 1.20 2019/07/31 15:02:39 alnsn Exp $ */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 
 #ifndef lint
 #ifdef __RCSID
-__RCSID("$NetBSD: veriexecgen.c,v 1.19 2019/04/23 22:35:42 sevan Exp $");
+__RCSID("$NetBSD: veriexecgen.c,v 1.20 2019/07/31 15:02:39 alnsn Exp $");
 #endif
 #endif /* not lint */
 
@@ -84,6 +84,8 @@
        int      scan_system_dirs;      /* just scan system directories */
        int      verbose;       /* verbosity level */
        int      stamp;         /* put a timestamp */
+       FILE    *from_file;     /* read from a file or stdin */
+       char    *from_filename;
 } veriexecgen_t;
 
 /* this struct describes a directory entry to generate a hash for */
@@ -123,7 +125,7 @@
 usage(void)
 {
        (void)fprintf(stderr,
-           "usage:  %s [-AaDrSTvW] [-d dir] [-o fingerprintdb] [-p prefix]\n"
+           "usage:  %s [-AaDrSTvW] [-d dir] [-f file] [-o fingerprintdb] [-p prefix]\n"
            "\t\t    [-t algorithm]\n"
            "\t%s [-h]\n", getprogname(), getprogname());
 }
@@ -136,8 +138,15 @@
 
        (void)printf("Fingerprinting ");
 
-       for (j = 0; search_path[j] != NULL; j++)
-               (void)printf("%s ", search_path[j]);
+       if (search_path) {
+               for (j = 0; search_path[j] != NULL; j++)
+                       (void)printf("%s ", search_path[j]);
+       } else if (vp->from_file == stdin) {
+               (void)printf("files from stdin ");
+       } else {
+               (void)printf("files from %s ",
+                       vp->from_filename ? vp->from_filename : "???");
+       }
 
        (void)printf("(%s) (%s) using %s\n",
            vp->all_files ? "all files" : "executables only",
@@ -194,7 +203,41 @@
 
 /* add a new entry to the list for `file' */
 static void
-add_new_entry(veriexecgen_t *vp, FTSENT *file, hash_t *hash)
+add_new_path_entry(veriexecgen_t *vp, const char *file, hash_t *hash)
+{
+       struct stat sb;
+       struct fentry *e;
+
+       if (stat(file, &sb) == -1) {
+               gripe(vp, "Cannot stat file `%s'", file);
+               return;
+       }
+
+       if (!vp->all_files && !IS_EXEC(sb.st_mode))
+               return;
+
+       e = ecalloc(1UL, sizeof(*e));
+
+       if (realpath(file, e->filename) == NULL) {
+               gripe(vp, "Cannot find absolute path `%s'", file);
+               return;
+       }
+       if (check_dup(e->filename)) {
+               free(e);
+               return;
+       }
+       if ((e->hash_val = do_hash(e->filename, hash)) == NULL) {
+               gripe(vp, "Cannot calculate hash `%s'", e->filename);
+               return;
+       }
+       e->flags = figure_flags(e->filename, sb.st_mode);
+
+       TAILQ_INSERT_TAIL(&fehead, e, f);
+}
+
+/* add a new entry to the list for `file' */
+static void
+add_new_ftsent_entry(veriexecgen_t *vp, FTSENT *file, hash_t *hash)
 {
        struct fentry *e;
        struct stat sb;
@@ -263,13 +306,33 @@
                                    strerror(file->fts_errno));
                        }
                } else {
-                       add_new_entry(vp, file, hash);
+                       add_new_ftsent_entry(vp, file, hash);
                }
        }
 
        fts_close(fh);
 }
 
+/* read files from `file' */
+static void
+read_from_file(veriexecgen_t *vp, hash_t *hash, FILE *file)
+{
+       char *line = NULL;
+       size_t linesize = 0;
+       ssize_t linelen;
+
+       while ((linelen = getline(&line, &linesize, file)) != -1) {
+               if (linelen > 0 && line[linelen - 1] == '\n')
+                       line[linelen - 1] = '\0';
+               add_new_path_entry(vp, line, hash);
+       }
+
+       if (ferror(stdin)) {
+               gripe(vp, "Error reading from stdin `%s'", strerror(errno));
+               return;
+       }
+}
+
 /* return a string representation of the flags */
 static char *
 flags2str(int flags)
@@ -383,7 +446,7 @@
        /* error out if we have a dangling symlink or other fs problem */
        v.exit_on_error = 1;
 
-       while ((ch = getopt(argc, argv, "AaDd:ho:p:rSTt:vW")) != -1) {
+       while ((ch = getopt(argc, argv, "AaDd:f:ho:p:rSTt:vW")) != -1) {
                switch (ch) {
                case 'A':
                        v.append_output = 1;
@@ -408,6 +471,20 @@
                case 'h':
                        usage();
                        return EXIT_SUCCESS;
+               case 'f':
+                       if (strcmp(optarg, "-") == 0) {
+                               v.from_file = stdin;
+                               v.from_filename = NULL;
+                       } else {
+                               v.from_file = fopen(optarg, "r");
+                               if (v.from_file == NULL) {
+                                       errx(EXIT_FAILURE,
+                                               "Error opening file %s",
+                                               optarg);
+                               }
+                               v.from_filename = strdup(optarg);
+                       }
+                       break;
                case 'o':
                        v.dbfile = optarg;
                        break;
@@ -452,7 +529,7 @@
 
        TAILQ_INIT(&fehead);
 
-       if (search_path == NULL)
+       if (search_path == NULL && !v.from_file)
                v.scan_system_dirs = 1;
 
        if (v.scan_system_dirs) {
@@ -469,10 +546,21 @@
                walk_dir(&v, search_path, hash);
        }
 
+       if (v.from_file) {
+               if (v.verbose)
+                       banner(&v, hash, NULL);
+               read_from_file(&v, hash, v.from_file);
+       }
+
        store_entries(&v, hash);
 
        if (make_immutable && chflags(v.dbfile, SF_IMMUTABLE) != 0)
                err(EXIT_FAILURE, "Can't set immutable flag");
 
+       if (v.from_file && v.from_file != stdin) {
+               fclose(v.from_file);
+               free(v.from_filename);
+       }
+
        return EXIT_SUCCESS;
 }