Compare commits
No commits in common. "createdirs-uid" and "master" have entirely different histories.
createdirs
...
master
|
@ -4,6 +4,8 @@ Create required Onionr directories
|
||||||
"""
|
"""
|
||||||
import os
|
import os
|
||||||
import stat
|
import stat
|
||||||
|
from pwd import getpwuid
|
||||||
|
from getpass import getuser
|
||||||
|
|
||||||
from . import identifyhome
|
from . import identifyhome
|
||||||
import filepaths
|
import filepaths
|
||||||
|
@ -25,6 +27,10 @@ import onionrexceptions
|
||||||
home = identifyhome.identify_home()
|
home = identifyhome.identify_home()
|
||||||
|
|
||||||
|
|
||||||
|
def find_owner(filename):
|
||||||
|
return getpwuid(os.stat(filename).st_uid).pw_name
|
||||||
|
|
||||||
|
|
||||||
def create_dirs():
|
def create_dirs():
|
||||||
"""Create onionr data-related directories in
|
"""Create onionr data-related directories in
|
||||||
order of the hardcoded list below,
|
order of the hardcoded list below,
|
||||||
|
@ -35,7 +41,7 @@ def create_dirs():
|
||||||
if not os.path.exists(path):
|
if not os.path.exists(path):
|
||||||
os.makedirs(path)
|
os.makedirs(path)
|
||||||
else:
|
else:
|
||||||
if os.getuid() != os.stat(path).st_uid:
|
if getuser() != find_owner(path):
|
||||||
raise onionrexceptions.InsecureDirectoryUsage(
|
raise onionrexceptions.InsecureDirectoryUsage(
|
||||||
"Directory " + path +
|
"Directory " + path +
|
||||||
" already exists and is not owned by the same user")
|
" already exists and is not owned by the same user")
|
||||||
|
@ -48,4 +54,4 @@ def create_dirs():
|
||||||
try:
|
try:
|
||||||
db()
|
db()
|
||||||
except FileExistsError:
|
except FileExistsError:
|
||||||
pass
|
pass
|
Loading…
Reference in New Issue