mirror of
https://github.com/elicpeter/nyx.git
synced 2026-06-12 19:55:14 +02:00
[pitboss/grind] deferred session-0007 (20260520T233019Z-6958)
This commit is contained in:
parent
9a0529e8f8
commit
bb8484bb28
19 changed files with 934 additions and 0 deletions
|
|
@ -47,6 +47,29 @@ fn source_imports_xml(file_bytes: &[u8]) -> bool {
|
|||
.any(|n| file_bytes.windows(n.len()).any(|w| w == *n))
|
||||
}
|
||||
|
||||
/// Returns `true` when the surrounding source visibly hardens the
|
||||
/// XML parser against external-entity expansion. Conservative: only
|
||||
/// recognises canonical lxml `resolve_entities=False` /
|
||||
/// `no_network=True` parser flags and the `defusedxml` package
|
||||
/// (whose parsers are safe-by-default).
|
||||
fn parser_is_hardened(file_bytes: &[u8]) -> bool {
|
||||
const HARDENING_NEEDLES: &[&[u8]] = &[
|
||||
b"resolve_entities=False",
|
||||
b"resolve_entities =False",
|
||||
b"resolve_entities= False",
|
||||
b"resolve_entities = False",
|
||||
b"no_network=True",
|
||||
b"no_network =True",
|
||||
b"no_network= True",
|
||||
b"no_network = True",
|
||||
b"from defusedxml",
|
||||
b"import defusedxml",
|
||||
];
|
||||
HARDENING_NEEDLES
|
||||
.iter()
|
||||
.any(|n| file_bytes.windows(n.len()).any(|w| w == *n))
|
||||
}
|
||||
|
||||
impl FrameworkAdapter for XxePythonAdapter {
|
||||
fn name(&self) -> &'static str {
|
||||
ADAPTER_NAME
|
||||
|
|
@ -62,6 +85,9 @@ impl FrameworkAdapter for XxePythonAdapter {
|
|||
_ast: tree_sitter::Node<'_>,
|
||||
file_bytes: &[u8],
|
||||
) -> Option<FrameworkBinding> {
|
||||
if parser_is_hardened(file_bytes) {
|
||||
return None;
|
||||
}
|
||||
let matches_call = super::any_callee_matches(summary, callee_is_xml_parser);
|
||||
let matches_source = source_imports_xml(file_bytes);
|
||||
if matches_call && matches_source {
|
||||
|
|
@ -117,4 +143,36 @@ mod tests {
|
|||
.detect(&summary, tree.root_node(), src)
|
||||
.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn skips_when_resolve_entities_false() {
|
||||
let src: &[u8] = b"from lxml import etree\n\
|
||||
def run(body):\n\
|
||||
parser = etree.XMLParser(resolve_entities=False, no_network=True)\n\
|
||||
return etree.fromstring(body, parser)\n";
|
||||
let tree = parse_python(src);
|
||||
let summary = FuncSummary {
|
||||
name: "run".into(),
|
||||
callees: vec![crate::summary::CalleeSite::bare("fromstring")],
|
||||
..Default::default()
|
||||
};
|
||||
assert!(XxePythonAdapter
|
||||
.detect(&summary, tree.root_node(), src)
|
||||
.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn skips_when_defusedxml_imported() {
|
||||
let src: &[u8] = b"from defusedxml import ElementTree\n\
|
||||
def run(body):\n return ElementTree.fromstring(body)\n";
|
||||
let tree = parse_python(src);
|
||||
let summary = FuncSummary {
|
||||
name: "run".into(),
|
||||
callees: vec![crate::summary::CalleeSite::bare("fromstring")],
|
||||
..Default::default()
|
||||
};
|
||||
assert!(XxePythonAdapter
|
||||
.detect(&summary, tree.root_node(), src)
|
||||
.is_none());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue