Skip to content

Fix leak of the ARGS XML parser context on malformed documents #3633

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

Open
tomsommer wants to merge 1 commit into
base: v3/master
Choose a base branch
from
+108 −0
Open

Fix leak of the ARGS XML parser context on malformed documents #3633

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
10 changes: 10 additions & 0 deletions src/request_body_processor/xml.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,21 @@ XML::~XML() {
xmlFreeParserCtxt(m_data.parsing_ctx);
m_data.parsing_ctx = NULL;
}
freeArgsParserCtx();
if (m_data.doc != NULL) {
xmlFreeDoc(m_data.doc);
m_data.doc = NULL;
}
}


void XML::freeArgsParserCtx() {
if (m_data.parsing_ctx_arg != nullptr) {
xmlFreeParserCtxt(m_data.parsing_ctx_arg);
m_data.parsing_ctx_arg = nullptr;
}
}

bool XML::init() {
//xmlParserInputBufferCreateFilenameFunc entity;
if (m_transaction->m_rules->m_secXMLExternalEntity
Expand Down Expand Up @@ -329,6 +338,7 @@ bool XML::complete(std::string *error) {
if (m_data.well_formed != 1) {
error->assign("XML: Failed to parse document.");
ms_dbg_a(m_transaction, 4, "XML: Failed to parse document.");
freeArgsParserCtx();
return false;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/request_body_processor/xml.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class XML {
xml_data m_data;

private:
void freeArgsParserCtx();
Transaction *m_transaction;
std::string m_header;
};
Expand Down
96 changes: 96 additions & 0 deletions test/test-cases/regression/request-body-parser-xml-into-args.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
[
{
"enabled": 1,
"version_min": 300000,
"title": "XML request body parser with SecParseXmlIntoArgs (mismatched end tag)",
"resource": "libxml2",
"client": {
"ip": "200.249.12.31",
"port": 123
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "localhost",
"User-Agent": "curl/7.38.0",
"Accept": "*/*",
"Content-Type": "text/xml",
"Content-Length": "10"
},
"uri": "/",
"method": "POST",
"body": [
"<a><b></a>"
]
},
"response": {
"headers": {
"Content-Length": "0"
},
"body": [
""
]
},
"expected": {
"debug_log": "XML: Failed to parse document",
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRequestBodyAccess On",
"SecParseXmlIntoArgs On",
"SecRule REQUEST_HEADERS:Content-Type \"^text/xml$\" \"id:500080,phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML\"",
"SecRule REQBODY_ERROR \"!@eq 0\" \"id:500081,phase:2,pass,log\""
]
},
{
"enabled": 1,
"version_min": 300000,
"title": "XML request body parser with SecParseXmlIntoArgs (truncated document)",
"resource": "libxml2",
"client": {
"ip": "200.249.12.31",
"port": 123
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "localhost",
"User-Agent": "curl/7.38.0",
"Accept": "*/*",
"Content-Type": "text/xml",
"Content-Length": "6"
},
"uri": "/",
"method": "POST",
"body": [
"<a><b>"
]
},
"response": {
"headers": {
"Content-Length": "0"
},
"body": [
""
]
},
"expected": {
"debug_log": "XML: Failed to parse document",
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRequestBodyAccess On",
"SecParseXmlIntoArgs On",
"SecRule REQUEST_HEADERS:Content-Type \"^text/xml$\" \"id:500080,phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML\"",
"SecRule REQBODY_ERROR \"!@eq 0\" \"id:500081,phase:2,pass,log\""
]
}
]
1 change: 1 addition & 0 deletions test/test-suite.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ TESTS+=test/test-cases/regression/request-body-parser-json.json
TESTS+=test/test-cases/regression/request-body-parser-multipart-crlf.json
TESTS+=test/test-cases/regression/request-body-parser-multipart.json
TESTS+=test/test-cases/regression/request-body-parser-xml.json
TESTS+=test/test-cases/regression/request-body-parser-xml-into-args.json
TESTS+=test/test-cases/regression/request-body-parser-xml-validade-dtd.json
TESTS+=test/test-cases/regression/rule-920120.json
TESTS+=test/test-cases/regression/rule-920200.json
Expand Down
Loading