kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00
Code Activity

Only warn about config.py perms if there's sensitive info

Browse Source
This commit is contained in:
Daniel Martí 2013-12-06 17:20:03 +01:00
parent 3825e5aebe
commit f0b66cee92
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdroidserver/common.py
View File

@ -47,10 +47,6 @@ def read_config(opts, config_file='config.py'):
print "Missing config file - is this a repo directory?" print "Missing config file - is this a repo directory?"
sys.exit(2) sys.exit(2)
st = os.stat(config_file)
if st.st_mode & stat.S_IRWXG or st.st_mode & stat.S_IRWXO:
print "WARNING: unsafe permissions on {0} (should be 0600)!".format(config_file)
options = opts options = opts
if not hasattr(options, 'verbose'): if not hasattr(options, 'verbose'):
options.verbose = False options.verbose = False
@ -72,6 +68,11 @@ def read_config(opts, config_file='config.py'):
print "Reading %s..." % config_file print "Reading %s..." % config_file
execfile(config_file, config) execfile(config_file, config)
if any(k in config for k in ["keystore", "keystorepass", "keypass"]):
st = os.stat(config_file)
if st.st_mode & stat.S_IRWXG or st.st_mode & stat.S_IRWXO:
print "WARNING: unsafe permissions on {0} (should be 0600)!".format(config_file)
# Expand environment variables # Expand environment variables
for k, v in config.items(): for k, v in config.items():
if type(v) != str: if type(v) != str: