Skip to content

chmod temp files using umask from ServerOptions #1075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chmod temp files using umask from ServerOptions #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20f5c4b
chmod temp files using umask from ServerOptions
ericatkin Mar 10, 2018
7ba85cf
Make test work with python<3.5
ericatkin Mar 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions supervisor/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,6 +1495,7 @@ def mktempfile(self, suffix, prefix, dir):
os._urandomfd = None
fd, filename = tempfile.mkstemp(suffix, prefix, dir)
os.close(fd)
os.chmod(filename, 0o666 ^ self.configroot.supervisord.umask)
return filename

def remove(self, path):
Expand Down
19 changes: 18 additions & 1 deletion supervisor/tests/test_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,22 @@ def test_version(self):
self.assertRaises(SystemExit, options.version, None)
self.assertEqual(options.stdout.getvalue(), VERSION + '\n')

def test_mktempfile(self):
text = lstrip("""
[supervisord]
identifier=foo ;comment should not be in identifier
""")
instance = self._makeOne()
instance.configfile = StringIO(text)
instance.realize(args=[])
options = instance.configroot.supervisord
filename = instance.mktempfile('', 'tmp', None)
try:
mode = os.stat(filename).st_mode & 0o777
self.assertEqual(oct(mode), oct(0o666 ^ options.umask))
finally:
os.remove(filename)

def test_options(self):
s = lstrip("""[inet_http_server]
port=127.0.0.1:8999
Expand Down Expand Up @@ -2908,10 +2924,11 @@ def test_clear_autochildlogdir(self):
dn = tempfile.mkdtemp()
try:
instance = self._makeOne()
instance.configroot.supervisord.umask = 0o022
instance.childlogdir = dn
sid = 'supervisor'
instance.identifier = sid
logfn = instance.get_autochildlog_name('foo', sid,'stdout')
logfn = instance.get_autochildlog_name('foo', sid, 'stdout')
first = logfn + '.1'
second = logfn + '.2'
f1 = open(first, 'w')
Expand Down