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

Move config.py keystore checks to after vars have been expanded

Browse Source
This commit is contained in:
Daniel Martí 2014-02-17 20:04:39 +01:00
parent 263731e9bc
commit 15f2eada8e
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fdroidserver/common.py
View File

@ -49,6 +49,11 @@ def read_config(opts, config_file='config.py'):
options = opts options = opts
config = {}
logging.info("Reading %s" % config_file)
execfile(config_file, config)
defconfig = { defconfig = {
'sdk_path': "$ANDROID_HOME", 'sdk_path': "$ANDROID_HOME",
'ndk_path': "$ANDROID_NDK", 'ndk_path': "$ANDROID_NDK",
@ -66,16 +71,6 @@ def read_config(opts, config_file='config.py'):
'Description' : 1500 'Description' : 1500
} }
} }
config = {}
logging.info("Reading %s" % config_file)
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:
logging.warn("unsafe permissions on {0} (should be 0600)!".format(config_file))
for k, v in defconfig.items(): for k, v in defconfig.items():
if k not in config: if k not in config:
config[k] = v config[k] = v
@ -87,6 +82,18 @@ def read_config(opts, config_file='config.py'):
v = os.path.expanduser(v) v = os.path.expanduser(v)
config[k] = os.path.expandvars(v) config[k] = os.path.expandvars(v)
if not config['sdk_path']:
logging.critical("$ANDROID_HOME is not set!")
sys.exit(3)
if not os.path.isdir(config['sdk_path']):
logging.critical("$ANDROID_HOME points to a non-existing directory!")
sys.exit(3)
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:
logging.warn("unsafe permissions on {0} (should be 0600)!".format(config_file))
return config return config
# Given the arguments in the form of multiple appid:[vc] strings, this returns # Given the arguments in the form of multiple appid:[vc] strings, this returns