diff --git a/iiFolderStatusTransitions.r b/iiFolderStatusTransitions.r index bb7f0bf12..adccc1360 100644 --- a/iiFolderStatusTransitions.r +++ b/iiFolderStatusTransitions.r @@ -18,13 +18,6 @@ iiFolderStatus(*folder, *folderStatus) { } } -# \brief Schedule copy-to-vault (asynchronously). -# -iiScheduleCopyToVault() { - delay ("irods_rule_engine_plugin-irods_rule_language-instance1s") { - msiExecCmd("scheduled-copytovault.sh", "", "", "", 0, *out); - } -} # \brief Schedule copy-to-vault for just one coll (asynchronously). # @@ -32,7 +25,7 @@ iiScheduleCopyToVault() { # iiScheduleCollCopyToVault(*coll) { delay ("irods_rule_engine_plugin-irods_rule_language-instance1s") { - msiExecCmd("scheduled-copytovault.sh", "'*coll'", "", "", 0, *out); + msiExecCmd("admin-scheduled-copytovault.sh", "'*coll'", "", "", 0, *out); } } @@ -332,7 +325,7 @@ iiCanTransitionFolderStatus(*folder, *transitionFrom, *transitionTo, *actor, *al } # Note: The folders will not transition to SECURED status. - if (*transitionFrom == ACCEPTED && *transitionTo == FOLDER) { + if (*transitionFrom == ACCEPTED && *transitionTo == FOLDER) { *allowed = false; *reason = "Only a rodsadmin is allowed to secure a folder to the vault"; succeed; diff --git a/policies.py b/policies.py index b02f39056..0935f8abd 100644 --- a/policies.py +++ b/policies.py @@ -503,17 +503,17 @@ def py_acPreProcForExecCmd(ctx, cmd, args, addr, hint): if not (hint == addr == ''): return policy.fail('Disallowed hint/addr in execcmd') - # allow 'admin-*' scripts, if first arg is the actor username&zone. + # Allow scheduled admin scripts. + if cmd.startswith('admin-scheduled-'): + return policy.succeed() + + # Allow 'admin-*' scripts, if first arg is the actor username&zone. if cmd.startswith('admin-'): if args == str(actor) or args.startswith(str(actor) + ' '): return policy.succeed() else: return policy.fail('Actor not given as first arg to admin- execcmd') - # Allow scheduled scripts. - if cmd.startswith('scheduled-'): - return policy.succeed() - return policy.fail('No execcmd privileges for this command')