Skip to content

Commit

Permalink
Merge pull request #1172 from benoitc/fix/1171
Browse files Browse the repository at this point in the history
don't check if a file is writable using os.stat
  • Loading branch information
benoitc committed Dec 29, 2015
2 parents cfabfc8 + 6439c3b commit f6b172d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
8 changes: 6 additions & 2 deletions gunicorn/glogging.py
Expand Up @@ -338,9 +338,13 @@ def _set_handler(self, log, output, fmt):
util.check_is_writeable(output)
h = logging.FileHandler(output)
# make sure the user can reopen the file
if not util.is_writable(h.baseFilename, self.cfg.user,
self.cfg.group):
try:
os.chown(h.baseFilename, self.cfg.user, self.cfg.group)
except OSError:
# it's probably OK there, we assume the user has given
# /dev/null as a parameter.
pass

h.setFormatter(fmt)
h._gunicorn = True
log.addHandler(h)
Expand Down
15 changes: 0 additions & 15 deletions gunicorn/util.py
Expand Up @@ -162,21 +162,6 @@ def chown(path, uid, gid):
gid = abs(gid) & 0x7FFFFFFF # see note above.
os.chown(path, uid, gid)

def is_writable(path, uid, gid):
gid = abs(gid) & 0x7FFFFFFF
st = os.stat(path)

if st.st_uid == uid:
return st.st_mode & st.S_IWUSR != 0

user = pwd.getpwuid(uid)[0]
groups = [g.gr_gid for g in grp.getgrall() if user in g.gr_mem]
groups.append(gid)

if st.st_gid in groups:
return st.st_mode & stat.S_IWGRP != 0

return st.st_mode & stat.S_IWOTH != 0

if sys.platform.startswith("win"):
def _waitfor(func, pathname, waitall=False):
Expand Down

0 comments on commit f6b172d

Please sign in to comment.