opensourcemirror
/
fdroid-server
mirror of https://gitlab.com/fdroid/fdroidserver.git
1
0
Fork 0
Code Issues Releases Wiki Activity

replace unneeded eval() call and support negative versionCodes

This commit is contained in:
Hans-Christoph Steiner 2018-08-29 16:07:02 +02:00
parent f0d27e1fa5
commit 4503e7a92a
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdroidserver/common.py
View File

@ -3275,8 +3275,12 @@ def get_git_describe_link():
def calculate_math_string(expr):
ops = {ast.Add: operator.add, ast.Sub: operator.sub,
ast.Mult: operator.mul}
ops = {
ast.Add: operator.add,
ast.Mult: operator.mul,
ast.Sub: operator.sub,
ast.USub: operator.neg,
}
def execute_ast(node):
if isinstance(node, ast.Num): # <number>
@ -3285,7 +3289,7 @@ def calculate_math_string(expr):
return ops[type(node.op)](execute_ast(node.left),
execute_ast(node.right))
elif isinstance(node, ast.UnaryOp): # <operator> <operand> e.g., -1
return ops[type(node.op)](eval(node.operand))
return ops[type(node.op)](ast.literal_eval(node.operand))
else:
raise SyntaxError(node)

19
tests/common.TestCase
View File

@ -800,13 +800,26 @@ class CommonTest(unittest.TestCase):
fdroidserver.common.parse_androidmanifests(paths, app))
def test_calculate_math_string(self):
self.assertEqual(1234, fdroidserver.common.calculate_math_string('1234'))
self.assertEqual(4, fdroidserver.common.calculate_math_string('(1+1)*2'))
self.assertEqual(2, fdroidserver.common.calculate_math_string('(1-1)*2+3*1-1'))
self.assertEqual(1234,
fdroidserver.common.calculate_math_string('1234'))
self.assertEqual((1 + 1) * 2,
fdroidserver.common.calculate_math_string('(1 + 1) * 2'))
self.assertEqual((1 - 1) * 2 + 3 * 1 - 1,
fdroidserver.common.calculate_math_string('(1 - 1) * 2 + 3 * 1 - 1'))
self.assertEqual(0 - 12345,
fdroidserver.common.calculate_math_string('0 - 12345'))
self.assertEqual(0xffff,
fdroidserver.common.calculate_math_string('0xffff'))
self.assertEqual(0xcafe * 123,
fdroidserver.common.calculate_math_string('0xcafe * 123'))
self.assertEqual(-1,
fdroidserver.common.calculate_math_string('-1'))
with self.assertRaises(SyntaxError):
fdroidserver.common.calculate_math_string('__import__("urllib")')
with self.assertRaises(SyntaxError):
fdroidserver.common.calculate_math_string('self')
with self.assertRaises(SyntaxError):
fdroidserver.common.calculate_math_string('Ox9()')
with self.assertRaises(SyntaxError):
fdroidserver.common.calculate_math_string('1+1; print(1)')
with self.assertRaises(SyntaxError):