nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Privileged Actions can take option lists again.

Browse Source
This commit is contained in:
Nick Daly 2013-11-17 16:01:12 -06:00
parent 7f3b1a62c8
commit 0539dfb28a
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
privilegedactions.py
View File

@ -50,6 +50,10 @@ Privileged actions run commands with this contract (version 1.0):
ValueError. They don't because sanitizing this case is significantly ValueError. They don't because sanitizing this case is significantly
easier than detecting if it occurs. easier than detecting if it occurs.
The options list is coerced into a space-separated string before being
shell-escaped. Option lists including shell escape characters may need to
be unescaped on the receiving end.
E. Actions must exist in the actions directory. E. Actions must exist in the actions directory.
4. (promise) Options are appended to the action. 4. (promise) Options are appended to the action.
@ -86,12 +90,6 @@ def privilegedaction_run(action, options = None):
# contract 3A and 3B: don't call anything outside of the actions directory. # contract 3A and 3B: don't call anything outside of the actions directory.
if os.sep in action: if os.sep in action:
raise ValueError("Action can't contain:" + os.sep) raise ValueError("Action can't contain:" + os.sep)
if not isinstance(options, str):
raise ValueError("Options must be a string and cannot be a list.")
# contract: 3C, 3D: don't allow users to insert escape characters.
action = pipes.quote(action)
options = pipes.quote(options)
cmd = DIRECTORY + os.sep + action cmd = DIRECTORY + os.sep + action
@ -100,11 +98,11 @@ def privilegedaction_run(action, options = None):
if not os.access(cmd, os.F_OK): if not os.access(cmd, os.F_OK):
raise ValueError("Action must exist in action directory.") raise ValueError("Action must exist in action directory.")
cmd = ["sudo", "-n", cmd] if hasattr(options, "__iter__"):
options = " ".join(options)
# contract 4. # contract: 3C, 3D: don't allow users to insert escape characters
if options: cmd = ["sudo", "-n", cmd, pipes.quote(options)]
cmd.extend(shlex.split(options))
# contract 3C: don't interpret shell escape sequences. # contract 3C: don't interpret shell escape sequences.
# contract 5 (and 6-ish). # contract 5 (and 6-ish).
@ -113,4 +111,5 @@ def privilegedaction_run(action, options = None):
stdout = subprocess.PIPE, stdout = subprocess.PIPE,
stderr= subprocess.PIPE, stderr= subprocess.PIPE,
shell=False).communicate() shell=False).communicate()
return output, error return output, error

7
tests/privelegedactions_test.py
View File

@ -109,11 +109,10 @@ class TestPrivileged(unittest.TestCase):
# counting is safer than actual badness. # counting is safer than actual badness.
options = ["good", ";", "echo $((1+1))"] options = ["good", ";", "echo $((1+1))"]
with self.assertRaises(ValueError): output, error = privilegedaction_run(action, options)
output, error = privilegedaction_run(action, options)
# if it somehow doesn't error, we'd better not evaluate the data. # we'd better not evaluate the data.
self.assertFalse("2" in output) self.assertFalse("2" in output)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()