Skip to content

Python: Fix experimental tests #3917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tausbn merged 1 commit into from
Jul 7, 2020
Merged

Python: Fix experimental tests #3917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions python/ql/src/experimental/CWE-643/xpath.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import python
import semmle.python.security.Paths
import semmle.python.security.strings.Untrusted
/* Sources */
import semmle.python.web.HttpRequest
/* Sinks */
Expand Down
4 changes: 2 additions & 2 deletions python/ql/src/experimental/semmle/python/security/injection/Xpath.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ module XpathInjection {
abstract class XpathInjectionSink extends TaintSink { }

/**
* A Sink representing an argument to the `etree.Xpath` call.
* A Sink representing an argument to the `etree.XPath` call.
*
* from lxml import etree
* root = etree.XML("<xmlContent>")
* find_text = etree.XPath("`sink`")
*/
private class EtreeXpathArgument extends XpathInjectionSink {
override string toString() { result = "lxml.etree.Xpath" }
override string toString() { result = "lxml.etree.XPath" }

EtreeXpathArgument() {
exists(CallNode call | call.getFunction().(AttrNode).getObject("XPath").pointsTo(etree()) |
Expand Down
2 changes: 1 addition & 1 deletion python/ql/test/experimental/CWE-091/Xslt.qlref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
experimental/CWE-643/Xslt.ql
experimental/CWE-091/Xslt.ql
2 changes: 1 addition & 1 deletion python/ql/test/experimental/CWE-643/xpath.qlref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
experimental/CWE-643/xpath.ql
experimental/CWE-643/xpath.ql
8 changes: 4 additions & 4 deletions python/ql/test/experimental/CWE-643/xpathSinks.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
| xpath.py:8:20:8:29 | lxml.etree.parse.xpath | externally controlled string |
| xpath.py:13:29:13:38 | lxml.etree.Xpath | externally controlled string |
| xpath.py:19:29:19:38 | lxml.etree.Xpath | externally controlled string |
| xpath.py:13:29:13:38 | lxml.etree.XPath | externally controlled string |
| xpath.py:19:29:19:38 | lxml.etree.XPath | externally controlled string |
| xpath.py:25:38:25:46 | lxml.etree.ETXpath | externally controlled string |
| xpath.py:32:29:32:34 | libxml2.parseFile.xpathEval | externally controlled string |
| xpathBad.py:13:20:13:43 | lxml.etree.parse.xpath | externally controlled string |
| xpathFlow.py:14:20:14:29 | lxml.etree.parse.xpath | externally controlled string |
| xpathFlow.py:23:29:23:38 | lxml.etree.Xpath | externally controlled string |
| xpathFlow.py:32:29:32:38 | lxml.etree.Xpath | externally controlled string |
| xpathFlow.py:23:29:23:38 | lxml.etree.XPath | externally controlled string |
| xpathFlow.py:32:29:32:38 | lxml.etree.XPath | externally controlled string |
| xpathFlow.py:41:31:41:40 | lxml.etree.ETXpath | externally controlled string |
| xpathFlow.py:49:29:49:38 | libxml2.parseFile.xpathEval | externally controlled string |
| xpathGood.py:13:20:13:37 | lxml.etree.parse.xpath | externally controlled string |
1 change: 1 addition & 0 deletions python/ql/test/experimental/CWE-643/xpathSinks.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import python
import experimental.semmle.python.security.injection.Xpath
import semmle.python.security.strings.Untrusted

from XpathInjection::XpathInjectionSink sink, TaintKind kind
where sink.sinks(kind)
Expand Down