summaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorAlan D. Salewski <salewski@att.net>2020-04-15 07:29:16 -0400
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-05-23 23:16:28 +0900
commitc15cddd1d515c5bd8dfe8fb2725e3f723aec63b8 (patch)
treea4131f0d04e7dcb93f27513409ee8ff89e177a8f /internal
parent39cb19303c9f9dbd0bdd67d266bfbbe076c6ebc5 (diff)
Allow Dir.home to work for non-login procs when $HOME not set
Allow the 'Dir.home' method to reliably locate the user's home directory when all three of the following are true at the same time: 1. Ruby is running on a Unix-like OS 2. The $HOME environment variable is not set 3. The process is not a descendant of login(1) (or a work-alike) The prior behavior was that the lookup could only work for login-descended processes. This is accomplished by looking up the user's record in the password database by uid (getpwuid_r(3)) as a fallback to the lookup by name (getpwname_r(3)) which is still attempted first (based on the name, if any, returned by getlogin_r(3)). If getlogin_r(3), getpwnam_r(3), and/or getpwuid_r(3) is not available at compile time, will fallback on using their respective non-*_r() variants: getlogin(3), getpwnam(3), and/or getpwuid(3). The rationale for attempting to do the lookup by name prior to doing it by uid is to accommodate the possibility of multiple login names (each with its own record in the password database, so each with a potentially different home directory) being mapped to the same uid (as is explicitly allowed for by POSIX; see getlogin(3posix)). Preserves the existing behavior for login-descended processes, and adds the new capability of having Dir.home being able to find the user's home directory for non-login-descended processes. Fixes [Bug #16787] Related discussion: https://bugs.ruby-lang.org/issues/16787 https://github.com/ruby/ruby/pull/3034
Diffstat (limited to 'internal')
-rw-r--r--internal/process.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/internal/process.h b/internal/process.h
index 5983204d1e..904c9a5cea 100644
--- a/internal/process.h
+++ b/internal/process.h
@@ -79,6 +79,12 @@ void rb_last_status_clear(void);
static inline char **ARGVSTR2ARGV(VALUE argv_str);
static inline size_t ARGVSTR2ARGC(VALUE argv_str);
+#ifdef HAVE_PWD_H
+VALUE rb_getlogin(void);
+VALUE rb_getpwdirnam_for_login(VALUE login); /* read as: "get pwd db home dir by username for login" */
+VALUE rb_getpwdiruid(void); /* read as: "get pwd db home dir for getuid()" */
+#endif
+
RUBY_SYMBOL_EXPORT_BEGIN
/* process.c (export) */
int rb_exec_async_signal_safe(const struct rb_execarg *e, char *errmsg, size_t errmsg_buflen);