Merge pull request #6676 from virusdave/dnicponski/scratch/swap_homedir_check_master

Verify this if `$HOME` exists, it is owned by current user in `getHome()`

1 files changed, 14 insertions, 0 deletions

diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 1c19938a8..a368ac844 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -574,6 +574,20 @@ Path getHome()
     static Path homeDir = []()
     {
         auto homeDir = getEnv("HOME");
+        if (homeDir) {
+            // Only use $HOME if doesn't exist or is owned by the current user.
+            struct stat st;
+            int result = stat(homeDir->c_str(), &st);
+            if (result != 0) {
+                if (errno != ENOENT) {
+                    warn("Couldn't stat $HOME ('%s') for reason other than not existing ('%d'), falling back to the one defined in the 'passwd' file", *homeDir, errno);
+                    homeDir.reset();
+                }
+            } else if (st.st_uid != geteuid()) {
+                warn("$HOME ('%s') is not owned by you, falling back to the one defined in the 'passwd' file", *homeDir);
+                homeDir.reset();
+            }
+        }
         if (!homeDir) {
             std::vector<char> buf(16384);
             struct passwd pwbuf;