oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev1818, Set user-only permissions on directories instead of files

Browse source
This commit is contained in:
shortcutme 2017-01-15 13:19:34 +01:00
parent 0a3a71f634
commit 8c9457d636
No known key found for this signature in database
GPG key ID: 9557210F5E536D3D
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -9,7 +9,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.5.1" self.version = "0.5.1"
self.rev = 1817 self.rev = 1818
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"

12
src/main.py
View file

@ -30,14 +30,22 @@ if not config.arguments: # Config parse failed, show the help screen and exit
# Create necessary files and dirs # Create necessary files and dirs
if not os.path.isdir(config.log_dir): if not os.path.isdir(config.log_dir):
os.mkdir(config.log_dir) os.mkdir(config.log_dir)
try:
os.chmod(config.log_dir, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
except Exception, err:
print "Can't change permission of %s: %s" % (config.log_dir, err)
if not os.path.isdir(config.data_dir): if not os.path.isdir(config.data_dir):
os.mkdir(config.data_dir) os.mkdir(config.data_dir)
try:
os.chmod(config.data_dir, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
except Exception, err:
print "Can't change permission of %s: %s" % (config.data_dir, err)
if not os.path.isfile("%s/sites.json" % config.data_dir): if not os.path.isfile("%s/sites.json" % config.data_dir):
open("%s/sites.json" % config.data_dir, "w").write("{}") open("%s/sites.json" % config.data_dir, "w").write("{}")
os.chmod("%s/sites.json" % config.data_dir, stat.S_IRUSR | stat.S_IWUSR)
if not os.path.isfile("%s/users.json" % config.data_dir): if not os.path.isfile("%s/users.json" % config.data_dir):
open("%s/users.json" % config.data_dir, "w").write("{}") open("%s/users.json" % config.data_dir, "w").write("{}")
os.chmod("%s/users.json" % config.data_dir, stat.S_IRUSR | stat.S_IWUSR)
# Setup logging # Setup logging
if config.action == "main": if config.action == "main":

2
src/util/helper.py
View file

@ -14,7 +14,6 @@ from Config import config
def atomicWrite(dest, content, mode="w"): def atomicWrite(dest, content, mode="w"):
try: try:
permissions = stat.S_IMODE(os.lstat(dest).st_mode)
with open(dest + "-tmpnew", mode) as f: with open(dest + "-tmpnew", mode) as f:
f.write(content) f.write(content)
f.flush() f.flush()
@ -23,7 +22,6 @@ def atomicWrite(dest, content, mode="w"):
os.rename(dest + "-tmpold", dest + "-tmpold-%s" % time.time()) os.rename(dest + "-tmpold", dest + "-tmpold-%s" % time.time())
os.rename(dest, dest + "-tmpold") os.rename(dest, dest + "-tmpold")
os.rename(dest + "-tmpnew", dest) os.rename(dest + "-tmpnew", dest)
os.chmod(dest, permissions)
os.unlink(dest + "-tmpold") os.unlink(dest + "-tmpold")
return True return True
except Exception, err: except Exception, err: