]> git.sesse.net Git - plocate/blobdiff - plocate.cpp
Release plocate 1.1.7.
[plocate] / plocate.cpp
index e08c019b84d58f7b74054533010cfb61adfe4c16..9606d2f49db1892be4a145e752262bffaac77e0b 100644 (file)
@@ -1,4 +1,5 @@
 #include "access_rx_cache.h"
+#include "complete_pread.h"
 #include "db.h"
 #include "dprintf.h"
 #include "io_uring_engine.h"
@@ -30,6 +31,8 @@
 #include <string.h>
 #include <string>
 #include <string_view>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <thread>
 #include <tuple>
 #include <unistd.h>
@@ -42,9 +45,6 @@
 using namespace std;
 using namespace std::chrono;
 
-#define DEFAULT_DBPATH "/var/lib/mlocate/plocate.db"
-
-const char *dbpath = DEFAULT_DBPATH;
 bool ignore_case = false;
 bool only_count = false;
 bool print_nul = false;
@@ -52,8 +52,11 @@ bool use_debug = false;
 bool flush_cache = false;
 bool patterns_are_regex = false;
 bool use_extended_regex = false;
+bool match_basename = false;
 int64_t limit_matches = numeric_limits<int64_t>::max();
 int64_t limit_left = numeric_limits<int64_t>::max();
+bool stdout_is_tty = false;
+static bool in_forked_child = false;
 
 steady_clock::time_point start;
 ZSTD_DDict *ddict = nullptr;
@@ -104,6 +107,10 @@ Corpus::Corpus(int fd, IOUringEngine *engine)
                hdr.zstd_dictionary_offset_bytes = 0;
                hdr.zstd_dictionary_length_bytes = 0;
        }
+       if (hdr.max_version < 2) {
+               // This too. (We ignore the other max_version 2 fields.)
+               hdr.check_visibility = true;
+       }
 }
 
 Corpus::~Corpus()
@@ -194,9 +201,19 @@ void scan_file_block(const vector<Needle> &needles, string_view compressed,
        for (const char *filename = block.data();
             filename != block.data() + block.size();
             filename += strlen(filename) + 1) {
+               const char *haystack = filename;
+               if (match_basename) {
+                       haystack = strrchr(filename, '/');
+                       if (haystack == nullptr) {
+                               haystack = filename;
+                       } else {
+                               ++haystack;
+                       }
+               }
+
                bool found = true;
                for (const Needle &needle : needles) {
-                       if (!matches(needle, filename)) {
+                       if (!matches(needle, haystack)) {
                                found = false;
                                break;
                        }
@@ -219,7 +236,7 @@ void scan_file_block(const vector<Needle> &needles, string_view compressed,
 size_t scan_docids(const vector<Needle> &needles, const vector<uint32_t> &docids, const Corpus &corpus, IOUringEngine *engine)
 {
        Serializer docids_in_order;
-       AccessRXCache access_rx_cache(engine);
+       AccessRXCache access_rx_cache(engine, corpus.get_hdr().check_visibility);
        atomic<uint64_t> matched{ 0 };
        for (size_t i = 0; i < docids.size(); ++i) {
                uint32_t docid = docids[i];
@@ -295,7 +312,7 @@ uint64_t scan_all_docids(const vector<Needle> &needles, int fd, const Corpus &co
                }
        }
 
-       AccessRXCache access_rx_cache(nullptr);
+       AccessRXCache access_rx_cache(nullptr, corpus.get_hdr().check_visibility);
        Serializer serializer;
        uint32_t num_blocks = corpus.get_num_filename_blocks();
        unique_ptr<uint64_t[]> offsets(new uint64_t[num_blocks + 1]);
@@ -429,11 +446,11 @@ bool new_posting_list_read(TrigramDisjunction *td, vector<uint32_t> decoded, vec
        return false;
 }
 
-void do_search_file(const vector<Needle> &needles, const char *filename)
+uint64_t do_search_file(const vector<Needle> &needles, const std::string &filename)
 {
-       int fd = open(filename, O_RDONLY);
+       int fd = open(filename.c_str(), O_RDONLY);
        if (fd == -1) {
-               perror(filename);
+               perror(filename.c_str());
                exit(1);
        }
 
@@ -446,7 +463,7 @@ void do_search_file(const vector<Needle> &needles, const char *filename)
        start = steady_clock::now();
        if (access("/", R_OK | X_OK)) {
                // We can't find anything, no need to bother...
-               return;
+               return 0;
        }
 
        IOUringEngine engine(/*slop_bytes=*/16);  // 16 slop bytes as described in turbopfor.h.
@@ -489,10 +506,9 @@ void do_search_file(const vector<Needle> &needles, const char *filename)
                // the pattern and done a union of them, but that's a lot of
                // work for fairly unclear gain.)
                uint64_t matched = scan_all_docids(needles, fd, corpus);
-               if (only_count) {
-                       printf("%" PRId64 "\n", matched);
-               }
-               return;
+               dprintf("Done in %.1f ms, found %" PRId64 " matches.\n",
+                       1e3 * duration<float>(steady_clock::now() - start).count(), matched);
+               return matched;
        }
 
        // Sneak in fetching the dictionary, if present. It's not necessarily clear
@@ -511,18 +527,30 @@ void do_search_file(const vector<Needle> &needles, const char *filename)
        }
 
        // Look them all up on disk.
+       bool should_early_exit = false;
        for (auto &[trgm, trigram_groups] : trigrams_to_lookup) {
-               corpus.find_trigram(trgm, [trgm{ trgm }, trigram_groups{ &trigram_groups }](const Trigram *trgmptr, size_t len) {
+               corpus.find_trigram(trgm, [trgm{ trgm }, trigram_groups{ &trigram_groups }, &should_early_exit](const Trigram *trgmptr, size_t len) {
                        if (trgmptr == nullptr) {
                                dprintf("trigram %s isn't found\n", print_trigram(trgm).c_str());
                                for (TrigramDisjunction *td : *trigram_groups) {
                                        --td->remaining_trigrams_to_read;
+
+                                       // If we now know this trigram group doesn't match anything at all,
+                                       // we can do early exit; however, if we're in a forked child,
+                                       // that would confuse the parent process (since we don't write
+                                       // our count to the pipe), so we wait until we're back in to the
+                                       // regular (non-async) context. This is a fairly rare case anyway,
+                                       // and the gains from dropping the remaining trigram reads are limited.
                                        if (td->remaining_trigrams_to_read == 0 && td->read_trigrams.empty()) {
-                                               dprintf("zero matches in %s, so we are done\n", print_td(*td).c_str());
-                                               if (only_count) {
-                                                       printf("0\n");
+                                               if (in_forked_child) {
+                                                       should_early_exit = true;
+                                               } else {
+                                                       dprintf("zero matches in %s, so we are done\n", print_td(*td).c_str());
+                                                       if (only_count) {
+                                                               printf("0\n");
+                                                       }
+                                                       exit(0);
                                                }
-                                               exit(0);
                                        }
                                }
                                return;
@@ -537,6 +565,10 @@ void do_search_file(const vector<Needle> &needles, const char *filename)
        engine.finish();
        dprintf("Hashtable lookups done after %.1f ms.\n", 1e3 * duration<float>(steady_clock::now() - start).count());
 
+       if (should_early_exit) {
+               return 0;
+       }
+
        for (TrigramDisjunction &td : trigram_groups) {
                // Reset for reads.
                td.remaining_trigrams_to_read = td.read_trigrams.size();
@@ -588,7 +620,7 @@ void do_search_file(const vector<Needle> &needles, const char *filename)
                                if (done)
                                        return;
 
-                               uint32_t trgm __attribute__((unused)) = trgmptr.trgm;
+                               uint32_t trgm = trgmptr.trgm;
                                const unsigned char *pldata = reinterpret_cast<const unsigned char *>(s.data());
                                size_t num = trgmptr.num_docids;
                                decoded.resize(num);
@@ -619,7 +651,7 @@ void do_search_file(const vector<Needle> &needles, const char *filename)
        }
        engine.finish();
        if (done) {
-               return;
+               return 0;
        }
        dprintf("Intersection done after %.1f ms. Doing final verification and printing:\n",
                1e3 * duration<float>(steady_clock::now() - start).count());
@@ -627,10 +659,120 @@ void do_search_file(const vector<Needle> &needles, const char *filename)
        uint64_t matched = scan_docids(needles, cur_candidates, corpus, &engine);
        dprintf("Done in %.1f ms, found %" PRId64 " matches.\n",
                1e3 * duration<float>(steady_clock::now() - start).count(), matched);
+       return matched;
+}
 
-       if (only_count) {
-               printf("%" PRId64 "\n", matched);
+// Run do_search_file() in a child process.
+//
+// The reason for this is that we're not robust against malicious input, so we need
+// to drop privileges after opening the file. (Otherwise, we could fall prey to an attack
+// where a user does locate -d badfile.db:/var/lib/plocate/plocate.db, badfile.db contains
+// a buffer overflow that takes over the process, and then uses the elevated privileges
+// to print out otherwise inaccessible paths.) We solve this by forking and treating the
+// child process as untrusted after it has dropped its privileges (which it does before
+// reading any data from the file); it returns a single 64-bit number over a pipe,
+// and that's it. The parent keeps its privileges, and can then fork out new children
+// without fear of being taken over. (The child keeps stdout for outputting results.)
+//
+// The count is returned over the pipe, because it's needed both for --limit and --count.
+uint64_t do_search_file_in_child(const vector<Needle> &needles, const std::string &filename)
+{
+       int pipefd[2];
+       if (pipe(pipefd) == -1) {
+               perror("pipe");
+               exit(EXIT_FAILURE);
+       }
+
+       pid_t child_pid = fork();
+       switch (child_pid) {
+       case 0: {
+               // Child.
+               close(pipefd[0]);
+               in_forked_child = true;
+               uint64_t matched = do_search_file(needles, filename);
+               int ret;
+               do {
+                       ret = write(pipefd[1], &matched, sizeof(matched));
+               } while (ret == -1 && errno == EINTR);
+               if (ret != sizeof(matched)) {
+                       perror("write");
+                       _exit(EXIT_FAILURE);
+               }
+               _exit(EXIT_SUCCESS);
        }
+       case -1:
+               // Error.
+               perror("fork");
+               exit(EXIT_FAILURE);
+       default:
+               // Parent.
+               close(pipefd[1]);
+               break;
+       }
+
+       // Wait for the child to finish.
+       int wstatus;
+       pid_t err;
+       do {
+               err = waitpid(child_pid, &wstatus, 0);
+       } while (err == -1 && errno == EINTR);
+       if (err == -1) {
+               perror("waitpid");
+               exit(EXIT_FAILURE);
+       }
+       if (WIFEXITED(wstatus)) {
+               if (WEXITSTATUS(wstatus) != 0) {
+                       // The child has probably already printed out its error, so just propagate the exit status.
+                       exit(WEXITSTATUS(wstatus));
+               }
+               // Success!
+       } else if (!WIFEXITED(wstatus)) {
+               fprintf(stderr, "FATAL: Child died unexpectedly while processing %s\n", filename.c_str());
+               exit(1);
+       }
+
+       // Now get the number of matches from the child.
+       uint64_t matched;
+       int ret;
+       do {
+               ret = read(pipefd[0], &matched, sizeof(matched));
+       } while (ret == -1 && errno == EINTR);
+       if (ret == -1) {
+               perror("read");
+               exit(EXIT_FAILURE);
+       } else if (ret != sizeof(matched)) {
+               fprintf(stderr, "FATAL: Short read through pipe (got %d bytes)\n", ret);
+               exit(EXIT_FAILURE);
+       }
+       close(pipefd[0]);
+       return matched;
+}
+
+// Parses a colon-separated list of strings and appends them onto the given vector.
+// Backslash escapes whatever comes after it.
+void parse_dbpaths(const char *ptr, vector<string> *output)
+{
+       string str;
+       while (*ptr != '\0') {
+               if (*ptr == '\\') {
+                       if (ptr[1] == '\0') {
+                               fprintf(stderr, "ERROR: Escape character at the end of string\n");
+                               exit(EXIT_FAILURE);
+                       }
+                       // Escape.
+                       str.push_back(ptr[1]);
+                       ptr += 2;
+                       continue;
+               }
+               if (*ptr == ':') {
+                       // Separator.
+                       output->push_back(move(str));
+                       ++ptr;
+                       continue;
+               }
+               str.push_back(*ptr++);
+       }
+       output->push_back(move(str));
 }
 
 void usage()
@@ -638,21 +780,23 @@ void usage()
        printf(
                "Usage: plocate [OPTION]... PATTERN...\n"
                "\n"
+               "  -b, --basename         search only the file name portion of path names\n"
                "  -c, --count            print number of matches instead of the matches\n"
                "  -d, --database DBPATH  search for files in DBPATH\n"
-               "                         (default is " DEFAULT_DBPATH ")\n"
+               "                         (default is " DBFILE ")\n"
                "  -i, --ignore-case      search case-insensitively\n"
                "  -l, --limit LIMIT      stop after LIMIT matches\n"
                "  -0, --null             delimit matches by NUL instead of newline\n"
                "  -r, --regexp           interpret patterns as basic regexps (slow)\n"
                "      --regex            interpret patterns as extended regexps (slow)\n"
+               "  -w, --wholename        search the entire path name (default; see -b)\n"
                "      --help             print this help\n"
                "      --version          print version information\n");
 }
 
 void version()
 {
-       printf("plocate %s\n", PLOCATE_VERSION);
+       printf("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION);
        printf("Copyright 2020 Steinar H. Gunderson\n");
        printf("License GPLv2+: GNU GPL version 2 or later <https://gnu.org/licenses/gpl.html>.\n");
        printf("This is free software: you are free to change and redistribute it.\n");
@@ -662,11 +806,14 @@ void version()
 
 int main(int argc, char **argv)
 {
+       vector<string> dbpaths;
+
        constexpr int EXTENDED_REGEX = 1000;
        constexpr int FLUSH_CACHE = 1001;
        static const struct option long_options[] = {
                { "help", no_argument, 0, 'h' },
                { "count", no_argument, 0, 'c' },
+               { "basename", no_argument, 0, 'b' },
                { "database", required_argument, 0, 'd' },
                { "ignore-case", no_argument, 0, 'i' },
                { "limit", required_argument, 0, 'l' },
@@ -674,6 +821,7 @@ int main(int argc, char **argv)
                { "version", no_argument, 0, 'V' },
                { "regexp", no_argument, 0, 'r' },
                { "regex", no_argument, 0, EXTENDED_REGEX },
+               { "wholename", no_argument, 0, 'w' },
                { "debug", no_argument, 0, 'D' },  // Not documented.
                // Enable to test cold-cache behavior (except for access()). Not documented.
                { "flush-cache", no_argument, 0, FLUSH_CACHE },
@@ -683,16 +831,19 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        for (;;) {
                int option_index = 0;
-               int c = getopt_long(argc, argv, "cd:hil:n:0VD", long_options, &option_index);
+               int c = getopt_long(argc, argv, "bcd:hil:n:0rwVD", long_options, &option_index);
                if (c == -1) {
                        break;
                }
                switch (c) {
+               case 'b':
+                       match_basename = true;
+                       break;
                case 'c':
                        only_count = true;
                        break;
                case 'd':
-                       dbpath = strdup(optarg);
+                       parse_dbpaths(optarg, &dbpaths);
                        break;
                case 'h':
                        usage();
@@ -718,6 +869,9 @@ int main(int argc, char **argv)
                        patterns_are_regex = true;
                        use_extended_regex = true;
                        break;
+               case 'w':
+                       match_basename = false;  // No-op unless -b is given first.
+                       break;
                case 'D':
                        use_debug = true;
                        break;
@@ -744,6 +898,10 @@ int main(int argc, char **argv)
                }
        }
 
+       if (!print_nul) {
+               stdout_is_tty = isatty(1);
+       }
+
        vector<Needle> needles;
        for (int i = optind; i < argc; ++i) {
                Needle needle;
@@ -780,5 +938,30 @@ int main(int argc, char **argv)
                fprintf(stderr, "plocate: no pattern to search for specified\n");
                exit(0);
        }
-       do_search_file(needles, dbpath);
+
+       if (dbpaths.empty()) {
+               // No -d given, so use our default. Note that this happens
+               // even if LOCATE_PATH exists, to match mlocate behavior.
+               dbpaths.push_back(DBFILE);
+       }
+
+       const char *locate_path = getenv("LOCATE_PATH");
+       if (locate_path != nullptr) {
+               parse_dbpaths(locate_path, &dbpaths);
+       }
+
+       uint64_t matched = 0;
+       for (size_t i = 0; i < dbpaths.size(); ++i) {
+               uint64_t this_matched;
+               if (i != dbpaths.size() - 1) {
+                       this_matched = do_search_file_in_child(needles, dbpaths[i]);
+               } else {
+                       this_matched = do_search_file(needles, dbpaths[i]);
+               }
+               matched += this_matched;
+               limit_left -= this_matched;
+       }
+       if (only_count) {
+               printf("%" PRId64 "\n", matched);
+       }
 }