openstack/swift
Code Issues Proposed changes

drop_privileges should also set HOME

Browse Source 
E.g. if HOME is not set, swift-proxy will create the
keystone_signing file not in HOME but in /root.
This is because the swift user doesn't have a shell
in /etc/passwd and so it doesn't set environment variables
when impersonating.

Change-Id: I3013007e0dadf6ddccc176e142b7c78c5d63a351
This commit is contained in:
Eugene Kirpichov
2012-11-30 16:08:17 +00:00
parent 8a6922b73e
commit 772da0a004
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
swift/common/utils.py
View File

@@ -756,6 +756,7 @@ def drop_privileges(user):
os.setgroups([]) os.setgroups([])
os.setgid(user[3]) os.setgid(user[3])
os.setuid(user[2]) os.setuid(user[2])
os.environ['HOME'] = user[5]
try: try:
os.setsid() os.setsid()
except OSError: except OSError:

2
test/unit/common/test_utils.py
View File

@@ -632,6 +632,8 @@ log_name = %(yarr)s'''
utils.drop_privileges(user) utils.drop_privileges(user)
for func in required_func_calls: for func in required_func_calls:
self.assert_(utils.os.called_funcs[func]) self.assert_(utils.os.called_funcs[func])
import pwd
self.assertEquals(pwd.getpwnam(user)[5], utils.os.environ['HOME'])
# reset; test same args, OSError trying to get session leader # reset; test same args, OSError trying to get session leader
utils.os = MockOs(called_funcs=required_func_calls, utils.os = MockOs(called_funcs=required_func_calls,