Skip to content

Fix file permissions #470

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

Merged
HelloZeroNet merged 2 commits into from
May 27, 2016
Merged

Fix file permissions #470

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
a10e803
atomicWrite function now preserve file permissions
May 26, 2016
9e9832a
Set permission to 600 for some files
May 26, 2016
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
3 changes: 3 additions & 0 deletions src/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Included modules
import os
import sys
import stat
import time
import logging

Expand Down Expand Up @@ -33,8 +34,10 @@
os.mkdir(config.data_dir)
if not os.path.isfile("%s/sites.json" % config.data_dir):
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):
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
if config.action == "main":
Expand Down
3 changes: 3 additions & 0 deletions src/util/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import stat
import socket
import struct
import re
Expand All @@ -10,6 +11,7 @@

def atomicWrite(dest, content, mode="w"):
try:
permissions = stat.S_IMODE(os.lstat(dest).st_mode)
with open(dest + "-new", mode) as f:
f.write(content)
f.flush()
Expand All @@ -18,6 +20,7 @@ def atomicWrite(dest, content, mode="w"):
os.rename(dest + "-old", dest + "-old-%s" % time.time())
os.rename(dest, dest + "-old")
os.rename(dest + "-new", dest)
os.chmod(dest, permissions)
os.unlink(dest + "-old")
return True
except Exception, err:
Expand Down