YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Do not pass app args to the command line, they're already provided in the env...

Browse source
This commit is contained in:
Alexandre Aubin 2020-12-05 20:35:53 +01:00
parent d6d45cf7a6
commit 2428f01521
2 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/yunohost/app.py
View file

@ -356,8 +356,6 @@ def app_change_url(operation_logger, app, domain, path):
# Retrieve arguments list for change_url script # Retrieve arguments list for change_url script
# TODO: Allow to specify arguments # TODO: Allow to specify arguments
args_odict = _parse_args_from_manifest(manifest, 'change_url') args_odict = _parse_args_from_manifest(manifest, 'change_url')
args_list = [value[0] for value in args_odict.values()]
args_list.append(app)
# Prepare env. var. to pass to script # Prepare env. var. to pass to script
env_dict = _make_environment_for_app_script(app, args=args_odict) env_dict = _make_environment_for_app_script(app, args=args_odict)
@ -389,7 +387,7 @@ def app_change_url(operation_logger, app, domain, path):
os.system('chmod +x %s' % os.path.join(os.path.join(APP_TMP_FOLDER, "scripts", "change_url"))) os.system('chmod +x %s' % os.path.join(os.path.join(APP_TMP_FOLDER, "scripts", "change_url")))
if hook_exec(os.path.join(APP_TMP_FOLDER, 'scripts/change_url'), if hook_exec(os.path.join(APP_TMP_FOLDER, 'scripts/change_url'),
args=args_list, env=env_dict)[0] != 0: env=env_dict)[0] != 0:
msg = "Failed to change '%s' url." % app msg = "Failed to change '%s' url." % app
logger.error(msg) logger.error(msg)
operation_logger.error(msg) operation_logger.error(msg)
@ -420,7 +418,7 @@ def app_change_url(operation_logger, app, domain, path):
logger.success(m18n.n("app_change_url_success", logger.success(m18n.n("app_change_url_success",
app=app, domain=domain, path=path)) app=app, domain=domain, path=path))
hook_callback('post_app_change_url', args=args_list, env=env_dict) hook_callback('post_app_change_url', env=env_dict)
def app_upgrade(app=[], url=None, file=None, force=False): def app_upgrade(app=[], url=None, file=None, force=False):
@ -518,8 +516,6 @@ def app_upgrade(app=[], url=None, file=None, force=False):
# Retrieve arguments list for upgrade script # Retrieve arguments list for upgrade script
# TODO: Allow to specify arguments # TODO: Allow to specify arguments
args_odict = _parse_args_from_manifest(manifest, 'upgrade') args_odict = _parse_args_from_manifest(manifest, 'upgrade')
args_list = [value[0] for value in args_odict.values()]
args_list.append(app_instance_name)
# Prepare env. var. to pass to script # Prepare env. var. to pass to script
env_dict = _make_environment_for_app_script(app_instance_name, args=args_odict) env_dict = _make_environment_for_app_script(app_instance_name, args=args_odict)
@ -548,7 +544,7 @@ def app_upgrade(app=[], url=None, file=None, force=False):
upgrade_failed = True upgrade_failed = True
try: try:
upgrade_retcode = hook_exec(extracted_app_folder + '/scripts/upgrade', upgrade_retcode = hook_exec(extracted_app_folder + '/scripts/upgrade',
args=args_list, env=env_dict)[0] env=env_dict)[0]
upgrade_failed = True if upgrade_retcode != 0 else False upgrade_failed = True if upgrade_retcode != 0 else False
if upgrade_failed: if upgrade_failed:
@ -625,7 +621,7 @@ def app_upgrade(app=[], url=None, file=None, force=False):
# So much win # So much win
logger.success(m18n.n('app_upgraded', app=app_instance_name)) logger.success(m18n.n('app_upgraded', app=app_instance_name))
hook_callback('post_app_upgrade', args=args_list, env=env_dict) hook_callback('post_app_upgrade', env=env_dict)
operation_logger.success() operation_logger.success()
permission_sync_to_user() permission_sync_to_user()
@ -742,10 +738,6 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
# Validate domain / path availability for webapps # Validate domain / path availability for webapps
_validate_and_normalize_webpath(manifest, args_odict, extracted_app_folder) _validate_and_normalize_webpath(manifest, args_odict, extracted_app_folder)
# build arg list tq
args_list = [value[0] for value in args_odict.values()]
args_list.append(app_instance_name)
# Attempt to patch legacy helpers ... # Attempt to patch legacy helpers ...
_patch_legacy_helpers(extracted_app_folder) _patch_legacy_helpers(extracted_app_folder)
@ -818,7 +810,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
try: try:
install_retcode = hook_exec( install_retcode = hook_exec(
os.path.join(extracted_app_folder, 'scripts/install'), os.path.join(extracted_app_folder, 'scripts/install'),
args=args_list, env=env_dict env=env_dict
)[0] )[0]
# "Common" app install failure : the script failed and returned exit code != 0 # "Common" app install failure : the script failed and returned exit code != 0
install_failed = True if install_retcode != 0 else False install_failed = True if install_retcode != 0 else False
@ -934,7 +926,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
logger.success(m18n.n('installation_complete')) logger.success(m18n.n('installation_complete'))
hook_callback('post_app_install', args=args_list, env=env_dict) hook_callback('post_app_install', env=env_dict)
def dump_app_log_extract_for_debugging(operation_logger): def dump_app_log_extract_for_debugging(operation_logger):
@ -1021,8 +1013,6 @@ def app_remove(operation_logger, app):
os.system('chown -R admin: /tmp/yunohost_remove') os.system('chown -R admin: /tmp/yunohost_remove')
os.system('chmod -R u+rX /tmp/yunohost_remove') os.system('chmod -R u+rX /tmp/yunohost_remove')
args_list = [app]
env_dict = {} env_dict = {}
app_id, app_instance_nb = _parse_app_instance_name(app) app_id, app_instance_nb = _parse_app_instance_name(app)
env_dict["YNH_APP_ID"] = app_id env_dict["YNH_APP_ID"] = app_id
@ -1034,7 +1024,6 @@ def app_remove(operation_logger, app):
try: try:
ret = hook_exec('/tmp/yunohost_remove/scripts/remove', ret = hook_exec('/tmp/yunohost_remove/scripts/remove',
args=args_list,
env=env_dict)[0] env=env_dict)[0]
# Here again, calling hook_exec could fail miserably, or get # Here again, calling hook_exec could fail miserably, or get
# manually interrupted (by mistake or because script was stuck) # manually interrupted (by mistake or because script was stuck)
@ -1047,7 +1036,7 @@ def app_remove(operation_logger, app):
if ret == 0: if ret == 0:
logger.success(m18n.n('app_removed', app=app)) logger.success(m18n.n('app_removed', app=app))
hook_callback('post_app_remove', args=args_list, env=env_dict) hook_callback('post_app_remove', env=env_dict)
else: else:
logger.warning(m18n.n('app_not_properly_removed', app=app)) logger.warning(m18n.n('app_not_properly_removed', app=app))
@ -1460,7 +1449,6 @@ def app_action_run(operation_logger, app, action, args=None):
# Retrieve arguments list for install script # Retrieve arguments list for install script
args_dict = dict(urlparse.parse_qsl(args, keep_blank_values=True)) if args else {} args_dict = dict(urlparse.parse_qsl(args, keep_blank_values=True)) if args else {}
args_odict = _parse_args_for_action(actions[action], args=args_dict) args_odict = _parse_args_for_action(actions[action], args=args_dict)
args_list = [value[0] for value in args_odict.values()]
env_dict = _make_environment_for_app_script(app, args=args_odict, args_prefix="ACTION_") env_dict = _make_environment_for_app_script(app, args=args_odict, args_prefix="ACTION_")
env_dict["YNH_ACTION"] = action env_dict["YNH_ACTION"] = action
@ -1479,7 +1467,6 @@ def app_action_run(operation_logger, app, action, args=None):
retcode = hook_exec( retcode = hook_exec(
path, path,
args=args_list,
env=env_dict, env=env_dict,
chdir=cwd, chdir=cwd,
user=action_declaration.get("user", "root"), user=action_declaration.get("user", "root"),

9
src/yunohost/backup.py
View file

@ -685,8 +685,10 @@ class BackupManager():
app_script = os.path.join(app_setting_path, 'scripts/backup') app_script = os.path.join(app_setting_path, 'scripts/backup')
subprocess.call(['install', '-Dm555', app_script, tmp_script]) subprocess.call(['install', '-Dm555', app_script, tmp_script])
hook_exec(tmp_script, args=[tmp_app_bkp_dir, app], hook_exec(tmp_script,
raise_on_error=True, chdir=tmp_app_bkp_dir, env=env_dict)[0] raise_on_error=True,
chdir=tmp_app_bkp_dir,
env=env_dict)[0]
self._import_to_list_to_backup(env_dict["YNH_BACKUP_CSV"]) self._import_to_list_to_backup(env_dict["YNH_BACKUP_CSV"])
@ -1382,7 +1384,6 @@ class RestoreManager():
# Execute app restore script # Execute app restore script
hook_exec(restore_script, hook_exec(restore_script,
args=[app_backup_in_archive, app_instance_name],
chdir=app_backup_in_archive, chdir=app_backup_in_archive,
raise_on_error=True, raise_on_error=True,
env=env_dict)[0] env=env_dict)[0]
@ -1407,7 +1408,7 @@ class RestoreManager():
operation_logger.start() operation_logger.start()
# Execute remove script # Execute remove script
if hook_exec(remove_script, args=[app_instance_name], if hook_exec(remove_script,
env=env_dict_remove)[0] != 0: env=env_dict_remove)[0] != 0:
msg = m18n.n('app_not_properly_removed', app=app_instance_name) msg = m18n.n('app_not_properly_removed', app=app_instance_name)
logger.warning(msg) logger.warning(msg)