Merge pull request #564 from BlBana/origin/develop

FeeiCN · web-flow · commit 6bdafa2e1846 · 2017-09-07T14:37:33.000+08:00
fixed #551 like function(print,echo,include)
diff --git a/cobra/const.py b/cobra/const.py
@@ -31,7 +31,7 @@
 # eval ($test + $test2);
 # call_function ($exp);
 #
-fpc = '\s*\((.*)(?:\))'
+fpc = '(\s*\((.*)(?:\))|\s*(.*\.)*\$.+)'
 fpc_single = '[f]{fpc}'.format(fpc=fpc)
 fpc_multi = '(?:[f]){fpc}'.format(fpc=fpc)
 
diff --git a/tests/examples/v_parser.php b/tests/examples/v_parser.php
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -16,7 +16,7 @@
 from cobra.config import project_directory
 
 
-target_projects = project_directory + '/tests/vulnerabilities/v_parser.php'
+target_projects = project_directory + '/tests/examples/v_parser.php'
 with open(target_projects, 'r') as fi:
     code_contents = fi.read()
 
diff --git a/tests/vulnerabilities/v.php b/tests/vulnerabilities/v.php
@@ -99,4 +99,3 @@ function curl($url){
 if (!empty($file)){
     unlink($file);
 }
-

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`# eval ($test + $test2);`
`32`	`32`	`# call_function ($exp);`
`33`	`33`	`#`
`34`		`-fpc = '\s\((.)(?:\))'`
	`34`	`+fpc = '(\s\((.)(?:\))\|\s(.\.)*\$.+)'`
`35`	`35`	`fpc_single = '[f]{fpc}'.format(fpc=fpc)`
`36`	`36`	`fpc_multi = '(?:[f]){fpc}'.format(fpc=fpc)`
`37`	`37`